From 7d903264a9f055efe62d7f7bf6f7d92f3faef351 Mon Sep 17 00:00:00 2001 From: ShuangLiu1992 Date: Wed, 20 Sep 2023 10:22:07 +0100 Subject: [PATCH 1/3] Fix precompiled_header.h on MSVC when boost is disabled --- gtsam/precompiled_header.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gtsam/precompiled_header.h b/gtsam/precompiled_header.h index 5ff2a55c5..e7188fc05 100644 --- a/gtsam/precompiled_header.h +++ b/gtsam/precompiled_header.h @@ -42,8 +42,10 @@ #include #include #include +#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION #include #include +#endif #include #include #include From 4750d850cef1f180c6bf143c6471d698b2f7ed16 Mon Sep 17 00:00:00 2001 From: ShuangLiu1992 Date: Sat, 7 Oct 2023 03:59:35 +0000 Subject: [PATCH 2/3] guard serialization.h --- gtsam/base/serialization.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gtsam/base/serialization.h b/gtsam/base/serialization.h index e615afe83..12556db09 100644 --- a/gtsam/base/serialization.h +++ b/gtsam/base/serialization.h @@ -16,7 +16,7 @@ * @author Richard Roberts * @date Feb 7, 2012 */ - +#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION #pragma once #include @@ -270,3 +270,4 @@ void deserializeBinary(const std::string& serialized, T& output, ///@} } // namespace gtsam +#endif \ No newline at end of file From 3f3578ee6f9733b3819d223244307dfd4e6f49c5 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Sat, 7 Oct 2023 16:19:02 -0400 Subject: [PATCH 3/3] remove previous guard and do some formatting --- gtsam/base/serialization.h | 3 ++- gtsam/precompiled_header.h | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gtsam/base/serialization.h b/gtsam/base/serialization.h index 12556db09..18612bc22 100644 --- a/gtsam/base/serialization.h +++ b/gtsam/base/serialization.h @@ -16,6 +16,7 @@ * @author Richard Roberts * @date Feb 7, 2012 */ + #ifdef GTSAM_ENABLE_BOOST_SERIALIZATION #pragma once @@ -270,4 +271,4 @@ void deserializeBinary(const std::string& serialized, T& output, ///@} } // namespace gtsam -#endif \ No newline at end of file +#endif diff --git a/gtsam/precompiled_header.h b/gtsam/precompiled_header.h index e7188fc05..5ff2a55c5 100644 --- a/gtsam/precompiled_header.h +++ b/gtsam/precompiled_header.h @@ -42,10 +42,8 @@ #include #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION #include #include -#endif #include #include #include