Skip to content

Commit d947ffb

Browse files
committed
correctly fix name collisions due to newly merged Boost PR
1 parent 2379cfa commit d947ffb

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

gtsam/base/std_optional_serialization.h

+8-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,14 @@ namespace std { template<> struct is_trivially_move_constructible<boost::seriali
5555
#endif
5656
#endif
5757

58-
59-
#if __cplusplus < 201103L
58+
/*
59+
* PR https://github.com/boostorg/serialization/pull/163 was merged
60+
* on September 3rd 2023,
61+
* and so the below code is now a part of Boost 1.84.
62+
* We include it for posterity, hence the check for BOOST_VERSION being less
63+
* than 1.84.
64+
*/
65+
#if BOOST_VERSION < 108400
6066
// function specializations must be defined in the appropriate
6167
// namespace - boost::serialization
6268
namespace boost {

0 commit comments

Comments
 (0)