Skip to content

Commit 2caf583

Browse files
authored
Merge pull request #510 from jorisv/topic/cxx11-compat
Restore cxx11 compatibility
2 parents 5a73c76 + 2046b4c commit 2caf583

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

.github/workflows/macos-linux-conda.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ jobs:
101101
-DPYTHON_EXECUTABLE=$(which python3) \
102102
-DGENERATE_PYTHON_STUBS=ON \
103103
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
104-
-DCMAKE_CXX_FLAGS=${{ matrix.cxx_options }}
104+
-DCMAKE_CXX_FLAGS=${{ matrix.cxx_options }} \
105+
-DCMAKE_CXX_STANDARD=11
105106
cmake --build . -j3
106107
ctest --output-on-failure
107108
cmake --install .

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66

77
## [Unreleased]
88

9+
### Fixed
10+
11+
- Don't use C++14 feature ([#510](https://github.com/stack-of-tasks/eigenpy/pull/510))
12+
913
## [3.10.0] - 2024-09-26
1014

1115
### Added

include/eigenpy/deprecation-policy.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ enum class DeprecationType { DEPRECATION, FUTURE };
1313

1414
namespace detail {
1515

16-
constexpr PyObject *deprecationTypeToPyObj(DeprecationType dep) {
16+
PyObject *deprecationTypeToPyObj(DeprecationType dep) {
1717
switch (dep) {
1818
case DeprecationType::DEPRECATION:
1919
return PyExc_DeprecationWarning;

include/eigenpy/numpy.hpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,15 +150,16 @@ struct NumpyEquivalentType<unsigned long> {
150150

151151
template <typename Scalar>
152152
struct NumpyEquivalentType<
153-
Scalar, std::enable_if_t<!std::is_same<int64_t, long long>::value &&
154-
std::is_same<Scalar, long long>::value> > {
153+
Scalar,
154+
typename std::enable_if<!std::is_same<int64_t, long long>::value &&
155+
std::is_same<Scalar, long long>::value>::type> {
155156
enum { type_code = NPY_LONGLONG };
156157
};
157158
template <typename Scalar>
158159
struct NumpyEquivalentType<
159-
Scalar,
160-
std::enable_if_t<!std::is_same<uint64_t, unsigned long long>::value &&
161-
std::is_same<Scalar, unsigned long long>::value> > {
160+
Scalar, typename std::enable_if<
161+
!std::is_same<uint64_t, unsigned long long>::value &&
162+
std::is_same<Scalar, unsigned long long>::value>::type> {
162163
enum { type_code = NPY_ULONGLONG };
163164
};
164165

0 commit comments

Comments
 (0)