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

Avoid double fwd declaration in Pinocchio eigen.hpp #530

Merged
merged 2 commits into from
Feb 7, 2024
Merged

Avoid double fwd declaration in Pinocchio eigen.hpp #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bcdee5
serialization: Avoid double fwd declaration in Pinocchio eigen.hpp
jorisv Feb 7, 2024
e5eb39c
changelog: Add changelog entry
jorisv Feb 7, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Fixed

- CMake: fix assimp finder
- Don't define GCC7 Boost serialization hack when `HPP_FCL_SKIP_EIGEN_BOOST_SERIALIZATION` is defined ([#530](https://github.com/humanoid-path-planner/hpp-fcl/pull/530))

## [2.4.1] - 2024-01-23

Expand Down
7 changes: 4 additions & 3 deletions include/hpp/fcl/serialization/eigen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
#ifndef HPP_FCL_SERIALIZATION_EIGEN_H
#define HPP_FCL_SERIALIZATION_EIGEN_H

#ifndef HPP_FCL_SKIP_EIGEN_BOOST_SERIALIZATION

#include <Eigen/Dense>

#include <boost/serialization/split_free.hpp>
Expand Down Expand Up @@ -40,8 +42,6 @@ struct traits<boost::serialization::U> {
namespace boost {
namespace serialization {

#ifndef HPP_FCL_SKIP_EIGEN_BOOST_SERIALIZATION

template <class Archive, typename Scalar, int Rows, int Cols, int Options,
int MaxRows, int MaxCols>
void save(Archive& ar,
Expand Down Expand Up @@ -108,8 +108,9 @@ void serialize(Archive& ar,
split_free(ar, m, version);
}

#endif // ifned HPP_FCL_SKIP_EIGEN_BOOST_SERIALIZATION
} // namespace serialization
} // namespace boost
//
#endif // ifned HPP_FCL_SKIP_EIGEN_BOOST_SERIALIZATION

#endif // ifndef HPP_FCL_SERIALIZATION_EIGEN_H
Loading