Fix an issue where forced inlining conflicted with constexpr on gcc

JacksonCampolattaro · Jun 16, 2024 · 7f9697c · 7f9697c
1 parent f2928d4
commit 7f9697c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/include/symtensor/SymmetricTensorBase.h b/include/symtensor/SymmetricTensorBase.h
@@ -219,12 +219,12 @@ namespace symtensor {
         ALWAYS_INLINE static constexpr Implementation NullaryExpression(F function = {}) {
             if constexpr (requires { function.template operator()<dimensionalIndices(0)>(); }) {
                 // If a function provides a template parameter for compile-time indexing, prefer that
-                return [&]<std::size_t... i>(std::index_sequence<i...>) LAMBDA_ALWAYS_INLINE constexpr {
+                return [&]<std::size_t... i>(std::index_sequence<i...>) LAMBDA_ALWAYS_INLINE {
                     return Implementation{static_cast<S>(function.template operator()<dimensionalIndices(i)>())...};
                 }(std::make_index_sequence<NumUniqueValues>());
             } else {
                 // Otherwise, the function must take the indices as its only argument
-                return [&]<std::size_t... i>(std::index_sequence<i...>) LAMBDA_ALWAYS_INLINE constexpr {
+                return [&]<std::size_t... i>(std::index_sequence<i...>) LAMBDA_ALWAYS_INLINE {
                     return Implementation{static_cast<S>(function(dimensionalIndices(i)))...};
                 }(std::make_index_sequence<NumUniqueValues>());
             }

diff --git a/include/symtensor/gravity.h b/include/symtensor/gravity.h
@@ -112,10 +112,9 @@ namespace symtensor::gravity {
 
     template<std::size_t N, indexable Vector>
     ALWAYS_INLINE auto derivative(const Vector &R) {
-        return SymmetricTensor3f<N>::NullaryExpression([&]<auto index>()  LAMBDA_ALWAYS_INLINE constexpr {
+        return SymmetricTensor3f<N>::NullaryExpression([&]<auto index>()  LAMBDA_ALWAYS_INLINE {
             return derivative_at<index, N>(R);
         });
-
     };