Merge pull request #510 from jorisv/topic/cxx11-compat

Restore cxx11 compatibility
stack-of-tasks · Sep 30, 2024 · 2caf583 · 2caf583
2 parents 5a73c76 + 2046b4c
commit 2caf583
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/macos-linux-conda.yml b/.github/workflows/macos-linux-conda.yml
@@ -101,7 +101,8 @@ jobs:
           -DPYTHON_EXECUTABLE=$(which python3) \
           -DGENERATE_PYTHON_STUBS=ON \
           -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
-          -DCMAKE_CXX_FLAGS=${{ matrix.cxx_options }}
+          -DCMAKE_CXX_FLAGS=${{ matrix.cxx_options }} \
+          -DCMAKE_CXX_STANDARD=11
         cmake --build . -j3
         ctest --output-on-failure
         cmake --install .

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
+### Fixed
+
+- Don't use C++14 feature ([#510](https://github.com/stack-of-tasks/eigenpy/pull/510))
+
 ## [3.10.0] - 2024-09-26
 
 ### Added

diff --git a/include/eigenpy/deprecation-policy.hpp b/include/eigenpy/deprecation-policy.hpp
@@ -13,7 +13,7 @@ enum class DeprecationType { DEPRECATION, FUTURE };
 
 namespace detail {
 
-constexpr PyObject *deprecationTypeToPyObj(DeprecationType dep) {
+PyObject *deprecationTypeToPyObj(DeprecationType dep) {
   switch (dep) {
     case DeprecationType::DEPRECATION:
       return PyExc_DeprecationWarning;

diff --git a/include/eigenpy/numpy.hpp b/include/eigenpy/numpy.hpp
@@ -150,15 +150,16 @@ struct NumpyEquivalentType<unsigned long> {
 
 template <typename Scalar>
 struct NumpyEquivalentType<
-    Scalar, std::enable_if_t<!std::is_same<int64_t, long long>::value &&
-                             std::is_same<Scalar, long long>::value> > {
+    Scalar,
+    typename std::enable_if<!std::is_same<int64_t, long long>::value &&
+                            std::is_same<Scalar, long long>::value>::type> {
   enum { type_code = NPY_LONGLONG };
 };
 template <typename Scalar>
 struct NumpyEquivalentType<
-    Scalar,
-    std::enable_if_t<!std::is_same<uint64_t, unsigned long long>::value &&
-                     std::is_same<Scalar, unsigned long long>::value> > {
+    Scalar, typename std::enable_if<
+                !std::is_same<uint64_t, unsigned long long>::value &&
+                std::is_same<Scalar, unsigned long long>::value>::type> {
   enum { type_code = NPY_ULONGLONG };
 };