fix a few GCC12 build issues

acts-project · Aug 19, 2024 · 48a26ee · 48a26ee
1 parent 1e54f9f
commit 48a26ee
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/Core/include/Acts/Definitions/Algebra.hpp b/Core/include/Acts/Definitions/Algebra.hpp
@@ -12,7 +12,7 @@
 #if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmisleading-indentation"
-#if __GNUC__ == 13
+#if __GNUC__ >= 12
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
 #include <Eigen/Core>

diff --git a/Core/include/Acts/Utilities/GridBinFinder.hpp b/Core/include/Acts/Utilities/GridBinFinder.hpp
@@ -29,6 +29,7 @@ namespace Acts {
 template <std::size_t DIM>
 class GridBinFinder {
  public:
+  static constexpr std::size_t dimCubed = Acts::detail::ipow(3, DIM);
   /// @brief Constructor
   /// @tparam args ... Input parameters provided by the user
   ///
@@ -63,9 +64,9 @@ class GridBinFinder {
   ///
   /// @pre The provided local position must be a valid local bins configuration in the grid
   template <typename stored_t, class... Axes>
-  boost::container::small_vector<std::size_t, Acts::detail::ipow(3, DIM)>
-  findBins(const std::array<std::size_t, DIM>& locPosition,
-           const Acts::Grid<stored_t, Axes...>& grid) const;
+  boost::container::small_vector<std::size_t, dimCubed> findBins(
+      const std::array<std::size_t, DIM>& locPosition,
+      const Acts::Grid<stored_t, Axes...>& grid) const;
 
  private:
   /// @brief Store the values provided by the user for each axis in the grid

diff --git a/Core/include/Acts/Utilities/GridBinFinder.ipp b/Core/include/Acts/Utilities/GridBinFinder.ipp
@@ -62,10 +62,10 @@ std::array<std::pair<int, int>, DIM> Acts::GridBinFinder<DIM>::getSizePerAxis(
 
 template <std::size_t DIM>
 template <typename stored_t, class... Axes>
-boost::container::small_vector<std::size_t, Acts::detail::ipow(3, DIM)>
-Acts::GridBinFinder<DIM>::findBins(
+auto Acts::GridBinFinder<DIM>::findBins(
     const std::array<std::size_t, DIM>& locPosition,
-    const Acts::Grid<stored_t, Axes...>& grid) const {
+    const Acts::Grid<stored_t, Axes...>& grid) const
+    -> boost::container::small_vector<std::size_t, dimCubed> {
   static_assert(sizeof...(Axes) == DIM);
   assert(isGridCompatible(grid));
   std::array<std::pair<int, int>, DIM> sizePerAxis =