Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restore cxx11 compatibility #510

Merged
merged 3 commits into from
Sep 30, 2024
Merged

Restore cxx11 compatibility #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
896dee3
core: Allow cxx11 compatibility
jorisv Sep 30, 2024
6bf9767
ci: Force build with C++11
jorisv Sep 30, 2024
2046b4c
changelog: Add changelog entry
jorisv Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/macos-linux-conda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/eigenpy/deprecation-policy.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
11 changes: 6 additions & 5 deletions include/eigenpy/numpy.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 };
};

Expand Down
Loading