From 8bcdee5ce493076a4ebd1eb74037afd2d63c94fa Mon Sep 17 00:00:00 2001
From: Joris Vaillant <joris.vaillant@inria.fr>
Date: Wed, 7 Feb 2024 11:18:07 +0100
Subject: [PATCH 1/2] serialization: Avoid double fwd declaration in Pinocchio
 eigen.hpp

---
 include/hpp/fcl/serialization/eigen.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/hpp/fcl/serialization/eigen.h b/include/hpp/fcl/serialization/eigen.h
index 2aeb2c2e1..fa7c49dc9 100644
--- a/include/hpp/fcl/serialization/eigen.h
+++ b/include/hpp/fcl/serialization/eigen.h
@@ -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>
@@ -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,
@@ -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

From e5eb39c0cb61a1f0c54afdeb659dfc283c2a2ace Mon Sep 17 00:00:00 2001
From: Joris Vaillant <joris.vaillant@inria.fr>
Date: Wed, 7 Feb 2024 11:25:35 +0100
Subject: [PATCH 2/2] changelog: Add changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ba814007..9ed017184 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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