From 3fb1b214524e22c000df0ed7155890c6f1c07a76 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Sun, 22 Dec 2024 23:48:10 -0500 Subject: [PATCH 1/3] remove add_definitions since it is deprecated and suboptimal --- CMakeLists.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e3b462eec5..90162fe29c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,14 +71,7 @@ include(GtsamPrinting) ############### Decide on BOOST ###################################### # Enable or disable serialization with GTSAM_ENABLE_BOOST_SERIALIZATION option(GTSAM_ENABLE_BOOST_SERIALIZATION "Enable Boost serialization" ON) -if(GTSAM_ENABLE_BOOST_SERIALIZATION) - add_definitions(-DGTSAM_ENABLE_BOOST_SERIALIZATION) -endif() - option(GTSAM_USE_BOOST_FEATURES "Enable Features that use Boost" ON) -if(GTSAM_USE_BOOST_FEATURES) - add_definitions(-DGTSAM_USE_BOOST_FEATURES) -endif() if(GTSAM_ENABLE_BOOST_SERIALIZATION OR GTSAM_USE_BOOST_FEATURES) include(cmake/HandleBoost.cmake) From 51f3c6dea3d76896897bdf1ca50d8ca97e322b65 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Sun, 22 Dec 2024 23:48:50 -0500 Subject: [PATCH 2/3] Optimize build time by adding Boost definitions in config.h --- gtsam/base/FastSet.h | 2 ++ gtsam/base/serialization.h | 5 ++++- gtsam/base/serializationTestHelpers.h | 5 ++++- gtsam/config.h.in | 4 ++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gtsam/base/FastSet.h b/gtsam/base/FastSet.h index a1be08d808..58ddd13a0f 100644 --- a/gtsam/base/FastSet.h +++ b/gtsam/base/FastSet.h @@ -18,6 +18,8 @@ #pragma once +#include + #ifdef GTSAM_ENABLE_BOOST_SERIALIZATION #include #if BOOST_VERSION >= 107400 diff --git a/gtsam/base/serialization.h b/gtsam/base/serialization.h index 18612bc227..e829014aee 100644 --- a/gtsam/base/serialization.h +++ b/gtsam/base/serialization.h @@ -17,9 +17,12 @@ * @date Feb 7, 2012 */ -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION #pragma once +#include + +#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION + #include #include #include diff --git a/gtsam/base/serializationTestHelpers.h b/gtsam/base/serializationTestHelpers.h index 09b36cdc84..fb0701d892 100644 --- a/gtsam/base/serializationTestHelpers.h +++ b/gtsam/base/serializationTestHelpers.h @@ -17,9 +17,12 @@ * @date Feb 7, 2012 */ -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION #pragma once +#include + +#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION + #include #include #include diff --git a/gtsam/config.h.in b/gtsam/config.h.in index 719cbc6cb0..8b4903d3af 100644 --- a/gtsam/config.h.in +++ b/gtsam/config.h.in @@ -88,3 +88,7 @@ #cmakedefine GTSAM_SLOW_BUT_CORRECT_BETWEENFACTOR #cmakedefine GTSAM_SLOW_BUT_CORRECT_EXPMAP + +// Boost flags +#cmakedefine01 GTSAM_ENABLE_BOOST_SERIALIZATION +#cmakedefine01 GTSAM_USE_BOOST_FEATURES From ae213dd46477fd39e8399f466ff6b21d11909713 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Thu, 26 Dec 2024 23:44:00 -0500 Subject: [PATCH 3/3] replace #ifdef with #if for GTSAM_ENABLE_BOOST_SERIALIZATION --- gtsam/base/ConcurrentMap.h | 4 +-- gtsam/base/FastList.h | 4 +-- gtsam/base/FastMap.h | 4 +-- gtsam/base/FastSet.h | 4 +-- gtsam/base/GenericValue.h | 2 +- gtsam/base/MatrixSerialization.h | 2 +- gtsam/base/SymmetricBlockMatrix.h | 4 +-- gtsam/base/Value.h | 6 ++-- gtsam/base/VectorSerialization.h | 2 +- gtsam/base/VerticalBlockMatrix.h | 2 +- gtsam/base/serialization.h | 2 +- gtsam/base/serializationTestHelpers.h | 2 +- gtsam/base/std_optional_serialization.h | 2 +- gtsam/discrete/DecisionTree-inl.h | 4 +-- gtsam/discrete/DecisionTree.h | 6 ++-- gtsam/discrete/DecisionTreeFactor.h | 2 +- gtsam/discrete/DiscreteBayesNet.h | 2 +- gtsam/discrete/DiscreteConditional.h | 2 +- gtsam/discrete/DiscreteFactor.h | 2 +- gtsam/discrete/DiscreteKey.h | 4 +-- gtsam/discrete/DiscreteLookupDAG.h | 2 +- gtsam/geometry/BearingRange.h | 4 +-- gtsam/geometry/Cal3.h | 2 +- gtsam/geometry/Cal3Bundler.h | 2 +- gtsam/geometry/Cal3DS2.h | 2 +- gtsam/geometry/Cal3DS2_Base.h | 2 +- gtsam/geometry/Cal3Fisheye.h | 2 +- gtsam/geometry/Cal3Unified.h | 2 +- gtsam/geometry/Cal3_S2.h | 2 +- gtsam/geometry/Cal3_S2Stereo.h | 2 +- gtsam/geometry/Cal3f.h | 2 +- gtsam/geometry/CalibratedCamera.h | 6 ++-- gtsam/geometry/CameraSet.h | 2 +- gtsam/geometry/EssentialMatrix.h | 2 +- gtsam/geometry/PinholeCamera.h | 2 +- gtsam/geometry/PinholePose.h | 4 +-- gtsam/geometry/PinholeSet.h | 2 +- gtsam/geometry/Point2.h | 2 +- gtsam/geometry/Point3.h | 2 +- gtsam/geometry/Pose2.h | 2 +- gtsam/geometry/Pose3.h | 2 +- gtsam/geometry/Rot2.h | 2 +- gtsam/geometry/Rot3.h | 2 +- gtsam/geometry/SO3.h | 2 +- gtsam/geometry/SO4.h | 2 +- gtsam/geometry/SOn.h | 6 ++-- gtsam/geometry/Similarity3.h | 2 +- gtsam/geometry/SphericalCamera.h | 6 ++-- gtsam/geometry/StereoCamera.h | 2 +- gtsam/geometry/StereoPoint2.h | 4 +-- gtsam/geometry/Unit3.h | 2 +- gtsam/geometry/tests/testBearingRange.cpp | 2 +- gtsam/geometry/tests/testUnit3.cpp | 2 +- gtsam/geometry/triangulation.h | 4 +-- gtsam/hybrid/HybridBayesNet.h | 2 +- gtsam/hybrid/HybridBayesTree.h | 2 +- gtsam/hybrid/HybridConditional.h | 2 +- gtsam/hybrid/HybridFactor.h | 2 +- gtsam/hybrid/HybridGaussianConditional.h | 2 +- gtsam/hybrid/HybridGaussianFactor.h | 2 +- gtsam/hybrid/HybridGaussianProductFactor.h | 2 +- gtsam/inference/BayesTree.h | 2 +- gtsam/inference/BayesTreeCliqueBase.h | 2 +- gtsam/inference/Conditional.h | 2 +- gtsam/inference/Factor.h | 4 +-- gtsam/inference/FactorGraph.h | 4 +-- gtsam/inference/LabeledSymbol.h | 2 +- gtsam/inference/Ordering.h | 2 +- gtsam/inference/Symbol.h | 4 +-- gtsam/inference/VariableIndex.h | 2 +- gtsam/linear/GaussianBayesNet.h | 2 +- gtsam/linear/GaussianConditional.h | 2 +- gtsam/linear/GaussianFactor.h | 2 +- gtsam/linear/GaussianFactorGraph.h | 2 +- gtsam/linear/HessianFactor.h | 2 +- gtsam/linear/JacobianFactor.h | 6 ++-- gtsam/linear/LossFunctions.h | 28 +++++++++---------- gtsam/linear/NoiseModel.h | 16 +++++------ gtsam/linear/SubgraphBuilder.cpp | 4 +-- gtsam/linear/SubgraphBuilder.h | 6 ++-- gtsam/linear/VectorValues.h | 2 +- gtsam/navigation/AHRSFactor.h | 4 +-- gtsam/navigation/AttitudeFactor.h | 6 ++-- gtsam/navigation/BarometricFactor.h | 2 +- gtsam/navigation/CombinedImuFactor.cpp | 2 +- gtsam/navigation/CombinedImuFactor.h | 4 +-- gtsam/navigation/GPSFactor.h | 4 +-- gtsam/navigation/ImuBias.h | 4 +-- gtsam/navigation/ImuFactor.h | 6 ++-- gtsam/navigation/MagPoseFactor.h | 2 +- gtsam/navigation/ManifoldPreintegration.h | 2 +- gtsam/navigation/NavState.h | 2 +- gtsam/navigation/PreintegratedRotation.h | 4 +-- gtsam/navigation/PreintegrationBase.h | 2 +- .../navigation/PreintegrationCombinedParams.h | 2 +- gtsam/navigation/PreintegrationParams.h | 2 +- gtsam/navigation/TangentPreintegration.h | 2 +- gtsam/nonlinear/CustomFactor.h | 2 +- gtsam/nonlinear/ExpressionFactor.h | 4 +-- gtsam/nonlinear/FunctorizedFactor.h | 4 +-- gtsam/nonlinear/ISAM2.h | 2 +- gtsam/nonlinear/ISAM2Clique.h | 2 +- gtsam/nonlinear/LinearContainerFactor.h | 2 +- gtsam/nonlinear/NonlinearEquality.h | 6 ++-- gtsam/nonlinear/NonlinearFactor.h | 6 ++-- gtsam/nonlinear/NonlinearFactorGraph.h | 2 +- gtsam/nonlinear/PriorFactor.h | 2 +- gtsam/nonlinear/Values.h | 4 +-- gtsam/sam/BearingFactor.h | 2 +- gtsam/sam/BearingRangeFactor.h | 2 +- gtsam/sam/RangeFactor.h | 4 +-- gtsam/sfm/SfmData.h | 2 +- gtsam/sfm/SfmTrack.h | 2 +- gtsam/sfm/TranslationFactor.h | 4 +-- gtsam/slam/AntiFactor.h | 2 +- gtsam/slam/BetweenFactor.h | 4 +-- gtsam/slam/BoundingConstraint.h | 4 +-- gtsam/slam/EssentialMatrixConstraint.h | 2 +- gtsam/slam/GeneralSFMFactor.h | 6 ++-- gtsam/slam/PoseRotationPrior.h | 2 +- gtsam/slam/PoseTranslationPrior.h | 2 +- gtsam/slam/ProjectionFactor.h | 2 +- gtsam/slam/ReferenceFrameFactor.h | 2 +- gtsam/slam/SmartFactorBase.h | 4 +-- gtsam/slam/SmartFactorParams.h | 2 +- gtsam/slam/SmartProjectionFactor.h | 2 +- gtsam/slam/SmartProjectionPoseFactor.h | 2 +- gtsam/slam/SmartProjectionRigFactor.h | 2 +- gtsam/slam/StereoFactor.h | 2 +- gtsam/slam/TriangulationFactor.h | 2 +- gtsam/symbolic/SymbolicBayesNet.h | 2 +- gtsam/symbolic/SymbolicBayesTree.h | 2 +- gtsam/symbolic/SymbolicConditional.h | 2 +- gtsam/symbolic/SymbolicFactor.h | 2 +- gtsam/symbolic/SymbolicFactorGraph.h | 2 +- gtsam_unstable/dynamics/PoseRTV.h | 2 +- gtsam_unstable/dynamics/VelocityConstraint3.h | 2 +- gtsam_unstable/geometry/BearingS2.h | 2 +- gtsam_unstable/geometry/InvDepthCamera3.h | 4 +-- gtsam_unstable/geometry/Pose3Upright.h | 2 +- gtsam_unstable/nonlinear/LinearizedFactor.h | 6 ++-- gtsam_unstable/slam/BetweenFactorEM.h | 2 +- gtsam_unstable/slam/BiasedGPSFactor.h | 2 +- .../slam/EquivInertialNavFactor_GlobalVel.h | 2 +- .../EquivInertialNavFactor_GlobalVel_NoBias.h | 2 +- .../slam/GaussMarkov1stOrderFactor.h | 2 +- .../slam/InertialNavFactor_GlobalVelocity.h | 2 +- gtsam_unstable/slam/InvDepthFactor3.h | 2 +- gtsam_unstable/slam/InvDepthFactorVariant1.h | 2 +- gtsam_unstable/slam/InvDepthFactorVariant2.h | 2 +- gtsam_unstable/slam/InvDepthFactorVariant3.h | 4 +-- gtsam_unstable/slam/MultiProjectionFactor.h | 2 +- gtsam_unstable/slam/PartialPriorFactor.h | 2 +- gtsam_unstable/slam/PoseBetweenFactor.h | 2 +- gtsam_unstable/slam/PosePriorFactor.h | 2 +- gtsam_unstable/slam/PoseToPointFactor.h | 2 +- gtsam_unstable/slam/ProjectionFactorPPP.h | 2 +- gtsam_unstable/slam/ProjectionFactorPPPC.h | 2 +- .../slam/ProjectionFactorRollingShutter.h | 2 +- gtsam_unstable/slam/RelativeElevationFactor.h | 2 +- .../SmartProjectionPoseFactorRollingShutter.h | 2 +- .../slam/SmartStereoProjectionFactor.h | 4 +-- .../slam/SmartStereoProjectionFactorPP.h | 2 +- .../slam/SmartStereoProjectionPoseFactor.h | 2 +- .../slam/TransformBtwRobotsUnaryFactor.h | 2 +- .../slam/TransformBtwRobotsUnaryFactorEM.h | 2 +- tests/simulated2D.h | 6 ++-- tests/testExpressionFactor.cpp | 2 +- 168 files changed, 247 insertions(+), 247 deletions(-) diff --git a/gtsam/base/ConcurrentMap.h b/gtsam/base/ConcurrentMap.h index 372f02d068..03687f5624 100644 --- a/gtsam/base/ConcurrentMap.h +++ b/gtsam/base/ConcurrentMap.h @@ -48,7 +48,7 @@ using ConcurrentMapBase = gtsam::FastMap; #endif -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #include #endif @@ -101,7 +101,7 @@ class ConcurrentMap : public ConcurrentMapBase { #endif private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/base/FastList.h b/gtsam/base/FastList.h index 414c1e83f8..1a3b9ed3fe 100644 --- a/gtsam/base/FastList.h +++ b/gtsam/base/FastList.h @@ -20,7 +20,7 @@ #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #include #if BOOST_VERSION >= 107400 @@ -79,7 +79,7 @@ class FastList: public std::list diff --git a/gtsam/base/FastMap.h b/gtsam/base/FastMap.h index e8ef3fc4f7..75998fd2fa 100644 --- a/gtsam/base/FastMap.h +++ b/gtsam/base/FastMap.h @@ -19,7 +19,7 @@ #pragma once #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #include #endif @@ -69,7 +69,7 @@ class FastMap : public std::map, bool exists(const KEY& e) const { return this->find(e) != this->end(); } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/base/FastSet.h b/gtsam/base/FastSet.h index 58ddd13a0f..9a2f624974 100644 --- a/gtsam/base/FastSet.h +++ b/gtsam/base/FastSet.h @@ -20,7 +20,7 @@ #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #if BOOST_VERSION >= 107400 #include @@ -125,7 +125,7 @@ class FastSet: public std::set, } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/base/GenericValue.h b/gtsam/base/GenericValue.h index 87ce7a73d5..62ea8ec39f 100644 --- a/gtsam/base/GenericValue.h +++ b/gtsam/base/GenericValue.h @@ -173,7 +173,7 @@ class GenericValue: public Value { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/base/MatrixSerialization.h b/gtsam/base/MatrixSerialization.h index 9cf730230e..11b6a417ae 100644 --- a/gtsam/base/MatrixSerialization.h +++ b/gtsam/base/MatrixSerialization.h @@ -19,7 +19,7 @@ // \callgraph // Defined only if boost serialization is enabled -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #pragma once #include diff --git a/gtsam/base/SymmetricBlockMatrix.h b/gtsam/base/SymmetricBlockMatrix.h index 1783857cb8..378e91144b 100644 --- a/gtsam/base/SymmetricBlockMatrix.h +++ b/gtsam/base/SymmetricBlockMatrix.h @@ -21,7 +21,7 @@ #include #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #endif #include @@ -386,7 +386,7 @@ namespace gtsam { template friend class SymmetricBlockMatrixBlockExpr; private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/base/Value.h b/gtsam/base/Value.h index c36de42ab7..09a3f4878a 100644 --- a/gtsam/base/Value.h +++ b/gtsam/base/Value.h @@ -21,7 +21,7 @@ #include // Configuration from CMake #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #include #endif @@ -121,7 +121,7 @@ namespace gtsam { * The last two links explain why these export lines have to be in the same source module that includes * any of the archive class headers. * */ -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION friend class boost::serialization::access; template void serialize(ARCHIVE & /*ar*/, const unsigned int /*version*/) { @@ -132,6 +132,6 @@ namespace gtsam { } /* namespace gtsam */ -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION BOOST_SERIALIZATION_ASSUME_ABSTRACT(gtsam::Value) #endif diff --git a/gtsam/base/VectorSerialization.h b/gtsam/base/VectorSerialization.h index 7acf108f4e..39d7e02996 100644 --- a/gtsam/base/VectorSerialization.h +++ b/gtsam/base/VectorSerialization.h @@ -17,7 +17,7 @@ */ // Defined only if boost serialization is enabled -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #pragma once #include diff --git a/gtsam/base/VerticalBlockMatrix.h b/gtsam/base/VerticalBlockMatrix.h index c8fef76e9a..0ff8a8ae23 100644 --- a/gtsam/base/VerticalBlockMatrix.h +++ b/gtsam/base/VerticalBlockMatrix.h @@ -221,7 +221,7 @@ namespace gtsam { friend class SymmetricBlockMatrix; private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/base/serialization.h b/gtsam/base/serialization.h index e829014aee..ef7ed497f7 100644 --- a/gtsam/base/serialization.h +++ b/gtsam/base/serialization.h @@ -21,7 +21,7 @@ #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #include diff --git a/gtsam/base/serializationTestHelpers.h b/gtsam/base/serializationTestHelpers.h index fb0701d892..cc6dadafdb 100644 --- a/gtsam/base/serializationTestHelpers.h +++ b/gtsam/base/serializationTestHelpers.h @@ -21,7 +21,7 @@ #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #include diff --git a/gtsam/base/std_optional_serialization.h b/gtsam/base/std_optional_serialization.h index 7e0f2e844a..93a5c8dbaf 100644 --- a/gtsam/base/std_optional_serialization.h +++ b/gtsam/base/std_optional_serialization.h @@ -11,7 +11,7 @@ #pragma once // Defined only if boost serialization is enabled -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #include diff --git a/gtsam/discrete/DecisionTree-inl.h b/gtsam/discrete/DecisionTree-inl.h index bda44bb9d8..efc19d9ee8 100644 --- a/gtsam/discrete/DecisionTree-inl.h +++ b/gtsam/discrete/DecisionTree-inl.h @@ -144,7 +144,7 @@ namespace gtsam { private: using Base = DecisionTree::Node; -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -471,7 +471,7 @@ namespace gtsam { private: using Base = DecisionTree::Node; -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/discrete/DecisionTree.h b/gtsam/discrete/DecisionTree.h index 486f798e91..7c8d2742de 100644 --- a/gtsam/discrete/DecisionTree.h +++ b/gtsam/discrete/DecisionTree.h @@ -23,7 +23,7 @@ #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #endif #include @@ -132,7 +132,7 @@ namespace gtsam { virtual bool isLeaf() const = 0; private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -440,7 +440,7 @@ namespace gtsam { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/discrete/DecisionTreeFactor.h b/gtsam/discrete/DecisionTreeFactor.h index e1eb2a4530..80ee10a7b2 100644 --- a/gtsam/discrete/DecisionTreeFactor.h +++ b/gtsam/discrete/DecisionTreeFactor.h @@ -310,7 +310,7 @@ namespace gtsam { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/discrete/DiscreteBayesNet.h b/gtsam/discrete/DiscreteBayesNet.h index a5a4621aa9..738b91aa5b 100644 --- a/gtsam/discrete/DiscreteBayesNet.h +++ b/gtsam/discrete/DiscreteBayesNet.h @@ -147,7 +147,7 @@ class GTSAM_EXPORT DiscreteBayesNet: public BayesNet { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/discrete/DiscreteConditional.h b/gtsam/discrete/DiscreteConditional.h index 8cba6dbe7f..3ec9ae5903 100644 --- a/gtsam/discrete/DiscreteConditional.h +++ b/gtsam/discrete/DiscreteConditional.h @@ -275,7 +275,7 @@ class GTSAM_EXPORT DiscreteConditional bool forceComplete) const; private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/discrete/DiscreteFactor.h b/gtsam/discrete/DiscreteFactor.h index 29981e94bc..a1fde0f864 100644 --- a/gtsam/discrete/DiscreteFactor.h +++ b/gtsam/discrete/DiscreteFactor.h @@ -163,7 +163,7 @@ class GTSAM_EXPORT DiscreteFactor : public Factor { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/discrete/DiscreteKey.h b/gtsam/discrete/DiscreteKey.h index 44cc192ef0..d200792c83 100644 --- a/gtsam/discrete/DiscreteKey.h +++ b/gtsam/discrete/DiscreteKey.h @@ -21,7 +21,7 @@ #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #endif #include @@ -87,7 +87,7 @@ namespace gtsam { /// Check equality to another DiscreteKeys object. bool equals(const DiscreteKeys& other, double tol = 0) const; -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/discrete/DiscreteLookupDAG.h b/gtsam/discrete/DiscreteLookupDAG.h index f077a13d9c..afb4d42083 100644 --- a/gtsam/discrete/DiscreteLookupDAG.h +++ b/gtsam/discrete/DiscreteLookupDAG.h @@ -123,7 +123,7 @@ class GTSAM_EXPORT DiscreteLookupDAG : public BayesNet { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/geometry/BearingRange.h b/gtsam/geometry/BearingRange.h index 07229dfcae..9c4e42edf8 100644 --- a/gtsam/geometry/BearingRange.h +++ b/gtsam/geometry/BearingRange.h @@ -21,7 +21,7 @@ #include #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #endif #include @@ -148,7 +148,7 @@ struct BearingRange { /// @{ private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// Serialization function template void serialize(ARCHIVE& ar, const unsigned int /*version*/) { diff --git a/gtsam/geometry/Cal3.h b/gtsam/geometry/Cal3.h index 5eecee8451..63efb0d496 100644 --- a/gtsam/geometry/Cal3.h +++ b/gtsam/geometry/Cal3.h @@ -184,7 +184,7 @@ class GTSAM_EXPORT Cal3 { /// @{ private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam/geometry/Cal3Bundler.h b/gtsam/geometry/Cal3Bundler.h index 01eb9437ac..71b5fba1d8 100644 --- a/gtsam/geometry/Cal3Bundler.h +++ b/gtsam/geometry/Cal3Bundler.h @@ -145,7 +145,7 @@ class GTSAM_EXPORT Cal3Bundler : public Cal3f { /// @name Advanced Interface /// @{ -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/geometry/Cal3DS2.h b/gtsam/geometry/Cal3DS2.h index 0ecfc24aef..8c1bbe3022 100644 --- a/gtsam/geometry/Cal3DS2.h +++ b/gtsam/geometry/Cal3DS2.h @@ -104,7 +104,7 @@ class GTSAM_EXPORT Cal3DS2 : public Cal3DS2_Base { /// @name Advanced Interface /// @{ -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/geometry/Cal3DS2_Base.h b/gtsam/geometry/Cal3DS2_Base.h index 6eff04c101..986c9842b1 100644 --- a/gtsam/geometry/Cal3DS2_Base.h +++ b/gtsam/geometry/Cal3DS2_Base.h @@ -156,7 +156,7 @@ class GTSAM_EXPORT Cal3DS2_Base : public Cal3 { /// @name Advanced Interface /// @{ -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/geometry/Cal3Fisheye.h b/gtsam/geometry/Cal3Fisheye.h index 4c542c5bea..f10a31b65b 100644 --- a/gtsam/geometry/Cal3Fisheye.h +++ b/gtsam/geometry/Cal3Fisheye.h @@ -184,7 +184,7 @@ class GTSAM_EXPORT Cal3Fisheye : public Cal3 { /// @name Advanced Interface /// @{ -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/geometry/Cal3Unified.h b/gtsam/geometry/Cal3Unified.h index 7eb4d2edba..cef2b8f9bb 100644 --- a/gtsam/geometry/Cal3Unified.h +++ b/gtsam/geometry/Cal3Unified.h @@ -138,7 +138,7 @@ class GTSAM_EXPORT Cal3Unified : public Cal3DS2_Base { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/geometry/Cal3_S2.h b/gtsam/geometry/Cal3_S2.h index 568cde41eb..8a587af9b3 100644 --- a/gtsam/geometry/Cal3_S2.h +++ b/gtsam/geometry/Cal3_S2.h @@ -132,7 +132,7 @@ class GTSAM_EXPORT Cal3_S2 : public Cal3 { /// @{ private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam/geometry/Cal3_S2Stereo.h b/gtsam/geometry/Cal3_S2Stereo.h index 292519cfd8..58c7dd37af 100644 --- a/gtsam/geometry/Cal3_S2Stereo.h +++ b/gtsam/geometry/Cal3_S2Stereo.h @@ -143,7 +143,7 @@ class GTSAM_EXPORT Cal3_S2Stereo : public Cal3_S2 { /// @{ private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/geometry/Cal3f.h b/gtsam/geometry/Cal3f.h index 6c3c214b8b..b6cf4435b1 100644 --- a/gtsam/geometry/Cal3f.h +++ b/gtsam/geometry/Cal3f.h @@ -118,7 +118,7 @@ class GTSAM_EXPORT Cal3f : public Cal3 { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/geometry/CalibratedCamera.h b/gtsam/geometry/CalibratedCamera.h index d3d1e1b9a2..d364318c96 100644 --- a/gtsam/geometry/CalibratedCamera.h +++ b/gtsam/geometry/CalibratedCamera.h @@ -25,7 +25,7 @@ #include #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #endif @@ -230,7 +230,7 @@ class GTSAM_EXPORT PinholeBase { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -406,7 +406,7 @@ class GTSAM_EXPORT CalibratedCamera: public PinholeBase { /// @name Advanced Interface /// @{ -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/geometry/CameraSet.h b/gtsam/geometry/CameraSet.h index e3c16f0666..36c1e1f54e 100644 --- a/gtsam/geometry/CameraSet.h +++ b/gtsam/geometry/CameraSet.h @@ -472,7 +472,7 @@ class CameraSet : public std::vector> { } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam/geometry/EssentialMatrix.h b/gtsam/geometry/EssentialMatrix.h index 3986f30631..74b7366854 100644 --- a/gtsam/geometry/EssentialMatrix.h +++ b/gtsam/geometry/EssentialMatrix.h @@ -180,7 +180,7 @@ class EssentialMatrix { /// @name Advanced Interface /// @{ -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/geometry/PinholeCamera.h b/gtsam/geometry/PinholeCamera.h index 0439b2fde7..f8599572d1 100644 --- a/gtsam/geometry/PinholeCamera.h +++ b/gtsam/geometry/PinholeCamera.h @@ -324,7 +324,7 @@ class PinholeCamera: public PinholeBaseK { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/geometry/PinholePose.h b/gtsam/geometry/PinholePose.h index f1191dbcc4..252d8bc6fc 100644 --- a/gtsam/geometry/PinholePose.h +++ b/gtsam/geometry/PinholePose.h @@ -212,7 +212,7 @@ class PinholeBaseK: public PinholeBase { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -425,7 +425,7 @@ class PinholePose: public PinholeBaseK { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/geometry/PinholeSet.h b/gtsam/geometry/PinholeSet.h index 55269f9d67..45cdb11e4e 100644 --- a/gtsam/geometry/PinholeSet.h +++ b/gtsam/geometry/PinholeSet.h @@ -64,7 +64,7 @@ class PinholeSet: public CameraSet { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam/geometry/Point2.h b/gtsam/geometry/Point2.h index 76beea11a7..66d57f7850 100644 --- a/gtsam/geometry/Point2.h +++ b/gtsam/geometry/Point2.h @@ -19,7 +19,7 @@ #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #endif diff --git a/gtsam/geometry/Point3.h b/gtsam/geometry/Point3.h index d5c32816eb..9bc943a43a 100644 --- a/gtsam/geometry/Point3.h +++ b/gtsam/geometry/Point3.h @@ -26,7 +26,7 @@ #include #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #endif #include diff --git a/gtsam/geometry/Pose2.h b/gtsam/geometry/Pose2.h index ff9a6399e3..3f85a7f42e 100644 --- a/gtsam/geometry/Pose2.h +++ b/gtsam/geometry/Pose2.h @@ -339,7 +339,7 @@ class GTSAM_EXPORT Pose2: public LieGroup { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION // +#if GTSAM_ENABLE_BOOST_SERIALIZATION // // Serialization function friend class boost::serialization::access; template diff --git a/gtsam/geometry/Pose3.h b/gtsam/geometry/Pose3.h index 81a9848e2c..eefbd7654d 100644 --- a/gtsam/geometry/Pose3.h +++ b/gtsam/geometry/Pose3.h @@ -406,7 +406,7 @@ class GTSAM_EXPORT Pose3: public LieGroup { friend std::ostream &operator<<(std::ostream &os, const Pose3& p); private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/geometry/Rot2.h b/gtsam/geometry/Rot2.h index 6bb97ff6cf..07f328b96d 100644 --- a/gtsam/geometry/Rot2.h +++ b/gtsam/geometry/Rot2.h @@ -213,7 +213,7 @@ namespace gtsam { static Rot2 ClosestTo(const Matrix2& M); private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/geometry/Rot3.h b/gtsam/geometry/Rot3.h index d1e3304382..71f4cbacd1 100644 --- a/gtsam/geometry/Rot3.h +++ b/gtsam/geometry/Rot3.h @@ -532,7 +532,7 @@ class GTSAM_EXPORT Rot3 : public LieGroup { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/geometry/SO3.h b/gtsam/geometry/SO3.h index 163ae66231..36329a19d5 100644 --- a/gtsam/geometry/SO3.h +++ b/gtsam/geometry/SO3.h @@ -98,7 +98,7 @@ template <> GTSAM_EXPORT Vector9 SO3::vec(OptionalJacobian<9, 3> H) const; -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION template /** Serialization function */ void serialize(Archive& ar, SO3& R, const unsigned int /*version*/) { diff --git a/gtsam/geometry/SO4.h b/gtsam/geometry/SO4.h index 834cab7466..43b74f7aaf 100644 --- a/gtsam/geometry/SO4.h +++ b/gtsam/geometry/SO4.h @@ -78,7 +78,7 @@ GTSAM_EXPORT Matrix3 topLeft(const SO4 &Q, OptionalJacobian<9, 6> H = {}); */ GTSAM_EXPORT Matrix43 stiefel(const SO4 &Q, OptionalJacobian<12, 6> H = {}); -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION template /** Serialization function */ void serialize(Archive &ar, SO4 &Q, const unsigned int /*version*/) { diff --git a/gtsam/geometry/SOn.h b/gtsam/geometry/SOn.h index b0da3b213d..e8e1f641dc 100644 --- a/gtsam/geometry/SOn.h +++ b/gtsam/geometry/SOn.h @@ -24,7 +24,7 @@ #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #endif @@ -326,7 +326,7 @@ class SO : public LieGroup, internal::DimensionSO(N)> { /// @name Serialization /// @{ -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION template friend void save(Archive&, SO&, const unsigned int); template @@ -380,7 +380,7 @@ template <> GTSAM_EXPORT typename SOn::VectorN2 SOn::vec(DynamicJacobian H) const; -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ template void serialize( diff --git a/gtsam/geometry/Similarity3.h b/gtsam/geometry/Similarity3.h index 05bd0431e1..8f7f30be8e 100644 --- a/gtsam/geometry/Similarity3.h +++ b/gtsam/geometry/Similarity3.h @@ -203,7 +203,7 @@ class GTSAM_EXPORT Similarity3 : public LieGroup { private: - #ifdef GTSAM_ENABLE_BOOST_SERIALIZATION + #if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/geometry/SphericalCamera.h b/gtsam/geometry/SphericalCamera.h index 1ff87cec3a..786295d7b8 100644 --- a/gtsam/geometry/SphericalCamera.h +++ b/gtsam/geometry/SphericalCamera.h @@ -26,7 +26,7 @@ #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #endif @@ -54,7 +54,7 @@ class GTSAM_EXPORT EmptyCal { } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template @@ -223,7 +223,7 @@ class GTSAM_EXPORT SphericalCamera { static size_t Dim() { return 6; } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/geometry/StereoCamera.h b/gtsam/geometry/StereoCamera.h index 026125572b..315e4d2678 100644 --- a/gtsam/geometry/StereoCamera.h +++ b/gtsam/geometry/StereoCamera.h @@ -177,7 +177,7 @@ class GTSAM_EXPORT StereoCamera { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION friend class boost::serialization::access; template void serialize(Archive & ar, const unsigned int /*version*/) { diff --git a/gtsam/geometry/StereoPoint2.h b/gtsam/geometry/StereoPoint2.h index 7a1910e42e..26c14750b8 100644 --- a/gtsam/geometry/StereoPoint2.h +++ b/gtsam/geometry/StereoPoint2.h @@ -20,7 +20,7 @@ #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #endif @@ -150,7 +150,7 @@ class GTSAM_EXPORT StereoPoint2 { /// @name Advanced Interface /// @{ -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/geometry/Unit3.h b/gtsam/geometry/Unit3.h index a7304280f2..65a304d623 100644 --- a/gtsam/geometry/Unit3.h +++ b/gtsam/geometry/Unit3.h @@ -198,7 +198,7 @@ class GTSAM_EXPORT Unit3 { /// @name Advanced Interface /// @{ -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/geometry/tests/testBearingRange.cpp b/gtsam/geometry/tests/testBearingRange.cpp index ff2a9a6a40..df4a4dc512 100644 --- a/gtsam/geometry/tests/testBearingRange.cpp +++ b/gtsam/geometry/tests/testBearingRange.cpp @@ -56,7 +56,7 @@ TEST(BearingRange, 3D) { EXPECT(assert_equal(expected, actual)); } -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION using namespace serializationTestHelpers; /* ************************************************************************* */ TEST(BearingRange, Serialization2D) { diff --git a/gtsam/geometry/tests/testUnit3.cpp b/gtsam/geometry/tests/testUnit3.cpp index 0c4c2c7257..855e50a42b 100644 --- a/gtsam/geometry/tests/testUnit3.cpp +++ b/gtsam/geometry/tests/testUnit3.cpp @@ -499,7 +499,7 @@ TEST(Unit3, CopyAssign) { } /* ************************************************************************* */ -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION TEST(actualH, Serialization) { Unit3 p(0, 1, 0); EXPECT(serializationTestHelpers::equalsObj(p)); diff --git a/gtsam/geometry/triangulation.h b/gtsam/geometry/triangulation.h index 9087f01c50..7498248456 100644 --- a/gtsam/geometry/triangulation.h +++ b/gtsam/geometry/triangulation.h @@ -622,7 +622,7 @@ struct GTSAM_EXPORT TriangulationParameters { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template @@ -687,7 +687,7 @@ class TriangulationResult : public std::optional { } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam/hybrid/HybridBayesNet.h b/gtsam/hybrid/HybridBayesNet.h index 96afb87d6d..3e07c71ce1 100644 --- a/gtsam/hybrid/HybridBayesNet.h +++ b/gtsam/hybrid/HybridBayesNet.h @@ -268,7 +268,7 @@ class GTSAM_EXPORT HybridBayesNet : public BayesNet { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/hybrid/HybridBayesTree.h b/gtsam/hybrid/HybridBayesTree.h index 0fe9ca6eac..06d880f02a 100644 --- a/gtsam/hybrid/HybridBayesTree.h +++ b/gtsam/hybrid/HybridBayesTree.h @@ -115,7 +115,7 @@ class GTSAM_EXPORT HybridBayesTree : public BayesTree { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/hybrid/HybridConditional.h b/gtsam/hybrid/HybridConditional.h index f3df725ef6..a08b3a6ee5 100644 --- a/gtsam/hybrid/HybridConditional.h +++ b/gtsam/hybrid/HybridConditional.h @@ -217,7 +217,7 @@ class GTSAM_EXPORT HybridConditional /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/hybrid/HybridFactor.h b/gtsam/hybrid/HybridFactor.h index 8d6fef3f43..9fc280322b 100644 --- a/gtsam/hybrid/HybridFactor.h +++ b/gtsam/hybrid/HybridFactor.h @@ -140,7 +140,7 @@ class GTSAM_EXPORT HybridFactor : public Factor { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/hybrid/HybridGaussianConditional.h b/gtsam/hybrid/HybridGaussianConditional.h index 0d2b1323c8..e769662ed1 100644 --- a/gtsam/hybrid/HybridGaussianConditional.h +++ b/gtsam/hybrid/HybridGaussianConditional.h @@ -253,7 +253,7 @@ class GTSAM_EXPORT HybridGaussianConditional /// Check whether `given` has values for all frontal keys. bool allFrontalsGiven(const VectorValues &given) const; -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/hybrid/HybridGaussianFactor.h b/gtsam/hybrid/HybridGaussianFactor.h index 6d1064647e..efbba9e518 100644 --- a/gtsam/hybrid/HybridGaussianFactor.h +++ b/gtsam/hybrid/HybridGaussianFactor.h @@ -176,7 +176,7 @@ class GTSAM_EXPORT HybridGaussianFactor : public HybridFactor { // Private constructor using ConstructorHelper above. HybridGaussianFactor(const ConstructorHelper &helper); -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/hybrid/HybridGaussianProductFactor.h b/gtsam/hybrid/HybridGaussianProductFactor.h index 60a58a3a51..f5e75aa86b 100644 --- a/gtsam/hybrid/HybridGaussianProductFactor.h +++ b/gtsam/hybrid/HybridGaussianProductFactor.h @@ -119,7 +119,7 @@ class GTSAM_EXPORT HybridGaussianProductFactor ///@} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/inference/BayesTree.h b/gtsam/inference/BayesTree.h index d0ebd916ec..03f79c8cf1 100644 --- a/gtsam/inference/BayesTree.h +++ b/gtsam/inference/BayesTree.h @@ -262,7 +262,7 @@ namespace gtsam { template friend class EliminatableClusterTree; private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/inference/BayesTreeCliqueBase.h b/gtsam/inference/BayesTreeCliqueBase.h index adffa2f146..0ccb04e908 100644 --- a/gtsam/inference/BayesTreeCliqueBase.h +++ b/gtsam/inference/BayesTreeCliqueBase.h @@ -208,7 +208,7 @@ namespace gtsam { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/inference/Conditional.h b/gtsam/inference/Conditional.h index f9da36b7bc..31e4517147 100644 --- a/gtsam/inference/Conditional.h +++ b/gtsam/inference/Conditional.h @@ -233,7 +233,7 @@ namespace gtsam { // Cast to derived type (const) (casts down to derived conditional type, then up to factor type) const FACTOR& asFactor() const { return static_cast(static_cast(*this)); } -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/inference/Factor.h b/gtsam/inference/Factor.h index 074151e166..19741b22e4 100644 --- a/gtsam/inference/Factor.h +++ b/gtsam/inference/Factor.h @@ -21,7 +21,7 @@ #pragma once -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #endif #include @@ -193,7 +193,7 @@ namespace gtsam { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// @name Serialization /// @{ /** Serialization function */ diff --git a/gtsam/inference/FactorGraph.h b/gtsam/inference/FactorGraph.h index b6046d0bb4..ca73213593 100644 --- a/gtsam/inference/FactorGraph.h +++ b/gtsam/inference/FactorGraph.h @@ -29,7 +29,7 @@ #include // for Eigen::aligned_allocator -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #include #endif @@ -420,7 +420,7 @@ class FactorGraph { inline bool exists(size_t idx) const { return idx < size() && at(idx); } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/inference/LabeledSymbol.h b/gtsam/inference/LabeledSymbol.h index 927fb76692..16ac7bccce 100644 --- a/gtsam/inference/LabeledSymbol.h +++ b/gtsam/inference/LabeledSymbol.h @@ -142,7 +142,7 @@ class GTSAM_EXPORT LabeledSymbol { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam/inference/Ordering.h b/gtsam/inference/Ordering.h index c3df1b8a08..fced5d4f29 100644 --- a/gtsam/inference/Ordering.h +++ b/gtsam/inference/Ordering.h @@ -252,7 +252,7 @@ class GTSAM_EXPORT Ordering: public KeyVector { static Ordering ColamdConstrained( const VariableIndex& variableIndex, std::vector& cmember); -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/inference/Symbol.h b/gtsam/inference/Symbol.h index 9f21337076..a62c22fac1 100644 --- a/gtsam/inference/Symbol.h +++ b/gtsam/inference/Symbol.h @@ -21,7 +21,7 @@ #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #endif #include @@ -124,7 +124,7 @@ class GTSAM_EXPORT Symbol { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/inference/VariableIndex.h b/gtsam/inference/VariableIndex.h index 110c0bba4e..2f872b25d8 100644 --- a/gtsam/inference/VariableIndex.h +++ b/gtsam/inference/VariableIndex.h @@ -192,7 +192,7 @@ class GTSAM_EXPORT VariableIndex { } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/linear/GaussianBayesNet.h b/gtsam/linear/GaussianBayesNet.h index e858bbe43d..538d1532ee 100644 --- a/gtsam/linear/GaussianBayesNet.h +++ b/gtsam/linear/GaussianBayesNet.h @@ -267,7 +267,7 @@ namespace gtsam { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/linear/GaussianConditional.h b/gtsam/linear/GaussianConditional.h index 27270fece1..14b1ce87f2 100644 --- a/gtsam/linear/GaussianConditional.h +++ b/gtsam/linear/GaussianConditional.h @@ -278,7 +278,7 @@ namespace gtsam { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/linear/GaussianFactor.h b/gtsam/linear/GaussianFactor.h index c5133c6b2d..253bbff0f0 100644 --- a/gtsam/linear/GaussianFactor.h +++ b/gtsam/linear/GaussianFactor.h @@ -179,7 +179,7 @@ namespace gtsam { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/linear/GaussianFactorGraph.h b/gtsam/linear/GaussianFactorGraph.h index 6a7848f511..67313c086d 100644 --- a/gtsam/linear/GaussianFactorGraph.h +++ b/gtsam/linear/GaussianFactorGraph.h @@ -400,7 +400,7 @@ namespace gtsam { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/linear/HessianFactor.h b/gtsam/linear/HessianFactor.h index 56b3d6537a..189020712a 100644 --- a/gtsam/linear/HessianFactor.h +++ b/gtsam/linear/HessianFactor.h @@ -370,7 +370,7 @@ namespace gtsam { friend class NonlinearFactorGraph; friend class NonlinearClusterTree; -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/linear/JacobianFactor.h b/gtsam/linear/JacobianFactor.h index 407ed1e277..4a5b6d5d1e 100644 --- a/gtsam/linear/JacobianFactor.h +++ b/gtsam/linear/JacobianFactor.h @@ -24,7 +24,7 @@ #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #include #endif @@ -421,7 +421,7 @@ namespace gtsam { // be very selective on who can access these private methods: template friend class ExpressionFactor; -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -468,7 +468,7 @@ struct traits : public Testable { } // \ namespace gtsam -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION BOOST_CLASS_VERSION(gtsam::JacobianFactor, 1) #endif diff --git a/gtsam/linear/LossFunctions.h b/gtsam/linear/LossFunctions.h index a8902e11b2..989557d87b 100644 --- a/gtsam/linear/LossFunctions.h +++ b/gtsam/linear/LossFunctions.h @@ -24,7 +24,7 @@ #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #include #include @@ -129,7 +129,7 @@ class GTSAM_EXPORT Base { void reweight(Matrix &A1, Matrix &A2, Matrix &A3, Vector &error) const; private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -161,7 +161,7 @@ class GTSAM_EXPORT Null : public Base { static shared_ptr Create(); private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -195,7 +195,7 @@ class GTSAM_EXPORT Fair : public Base { double modelParameter() const { return c_; } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -230,7 +230,7 @@ class GTSAM_EXPORT Huber : public Base { double modelParameter() const { return k_; } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -270,7 +270,7 @@ class GTSAM_EXPORT Cauchy : public Base { double modelParameter() const { return k_; } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -306,7 +306,7 @@ class GTSAM_EXPORT Tukey : public Base { double modelParameter() const { return c_; } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -341,7 +341,7 @@ class GTSAM_EXPORT Welsch : public Base { double modelParameter() const { return c_; } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -380,7 +380,7 @@ class GTSAM_EXPORT GemanMcClure : public Base { double c_; private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -420,7 +420,7 @@ class GTSAM_EXPORT DCS : public Base { double c_; private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -460,7 +460,7 @@ class GTSAM_EXPORT L2WithDeadZone : public Base { double modelParameter() const { return k_; } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -496,7 +496,7 @@ class GTSAM_EXPORT AsymmetricTukey : public Base { double modelParameter() const { return c_; } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -532,7 +532,7 @@ class GTSAM_EXPORT AsymmetricCauchy : public Base { double modelParameter() const { return k_; } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -577,7 +577,7 @@ class GTSAM_EXPORT Custom : public Base { inline Custom() = default; private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/linear/NoiseModel.h b/gtsam/linear/NoiseModel.h index 34fa63e4cc..47a84654a1 100644 --- a/gtsam/linear/NoiseModel.h +++ b/gtsam/linear/NoiseModel.h @@ -24,7 +24,7 @@ #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #include #include @@ -141,7 +141,7 @@ namespace gtsam { virtual double weight(const Vector& v) const { return 1.0; } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -280,7 +280,7 @@ namespace gtsam { double negLogConstant() const; private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -375,7 +375,7 @@ namespace gtsam { } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -520,7 +520,7 @@ namespace gtsam { shared_ptr unit() const; private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -593,7 +593,7 @@ namespace gtsam { inline double sigma() const { return sigma_; } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -648,7 +648,7 @@ namespace gtsam { void unwhitenInPlace(Eigen::Block& /*v*/) const override {} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -739,7 +739,7 @@ namespace gtsam { const RobustModel::shared_ptr &robust, const NoiseModel::shared_ptr noise); private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/linear/SubgraphBuilder.cpp b/gtsam/linear/SubgraphBuilder.cpp index 834fc8d123..9520b826b0 100644 --- a/gtsam/linear/SubgraphBuilder.cpp +++ b/gtsam/linear/SubgraphBuilder.cpp @@ -25,7 +25,7 @@ #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #include #include @@ -71,7 +71,7 @@ vector Subgraph::edgeIndices() const { return eid; } -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /****************************************************************************/ void Subgraph::save(const std::string &fn) const { std::ofstream os(fn.c_str()); diff --git a/gtsam/linear/SubgraphBuilder.h b/gtsam/linear/SubgraphBuilder.h index f9ddd4c9a5..df77ea9de3 100644 --- a/gtsam/linear/SubgraphBuilder.h +++ b/gtsam/linear/SubgraphBuilder.h @@ -21,7 +21,7 @@ #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #include #endif @@ -51,7 +51,7 @@ class GTSAM_EXPORT Subgraph { friend std::ostream &operator<<(std::ostream &os, const Edge &edge); private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION friend class boost::serialization::access; template void serialize(Archive &ar, const unsigned int /*version*/) { @@ -87,7 +87,7 @@ class GTSAM_EXPORT Subgraph { friend std::ostream &operator<<(std::ostream &os, const Subgraph &subgraph); private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION friend class boost::serialization::access; template void serialize(Archive &ar, const unsigned int /*version*/) { diff --git a/gtsam/linear/VectorValues.h b/gtsam/linear/VectorValues.h index 7fbd43ffc6..e60209a832 100644 --- a/gtsam/linear/VectorValues.h +++ b/gtsam/linear/VectorValues.h @@ -371,7 +371,7 @@ namespace gtsam { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/navigation/AHRSFactor.h b/gtsam/navigation/AHRSFactor.h index 4289b4969f..496fcde3d8 100644 --- a/gtsam/navigation/AHRSFactor.h +++ b/gtsam/navigation/AHRSFactor.h @@ -120,7 +120,7 @@ class GTSAM_EXPORT PreintegratedAhrsMeasurements : public PreintegratedRotation private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -208,7 +208,7 @@ class GTSAM_EXPORT AHRSFactor: public NoiseModelFactorN { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/navigation/AttitudeFactor.h b/gtsam/navigation/AttitudeFactor.h index 2fada724d1..e342e451ee 100644 --- a/gtsam/navigation/AttitudeFactor.h +++ b/gtsam/navigation/AttitudeFactor.h @@ -73,7 +73,7 @@ class AttitudeFactor { const Unit3& bRef() const { return bMeasured_; } #endif -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -138,7 +138,7 @@ class GTSAM_EXPORT Rot3AttitudeFactor : public NoiseModelFactorN, } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -220,7 +220,7 @@ class GTSAM_EXPORT Pose3AttitudeFactor : public NoiseModelFactorN, } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/navigation/BarometricFactor.h b/gtsam/navigation/BarometricFactor.h index 70cae8d367..545928ca9a 100644 --- a/gtsam/navigation/BarometricFactor.h +++ b/gtsam/navigation/BarometricFactor.h @@ -97,7 +97,7 @@ class GTSAM_EXPORT BarometricFactor : public NoiseModelFactorN { } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam/navigation/CombinedImuFactor.cpp b/gtsam/navigation/CombinedImuFactor.cpp index a2eb9e0c08..64ee86be98 100644 --- a/gtsam/navigation/CombinedImuFactor.cpp +++ b/gtsam/navigation/CombinedImuFactor.cpp @@ -21,7 +21,7 @@ **/ #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #endif diff --git a/gtsam/navigation/CombinedImuFactor.h b/gtsam/navigation/CombinedImuFactor.h index 0ffb386a05..b4c3ae8dc7 100644 --- a/gtsam/navigation/CombinedImuFactor.h +++ b/gtsam/navigation/CombinedImuFactor.h @@ -169,7 +169,7 @@ class GTSAM_EXPORT PreintegratedCombinedMeasurements /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template @@ -281,7 +281,7 @@ class GTSAM_EXPORT CombinedImuFactor OptionalMatrixType H6) const override; private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/navigation/GPSFactor.h b/gtsam/navigation/GPSFactor.h index cd89dd4645..6af1843603 100644 --- a/gtsam/navigation/GPSFactor.h +++ b/gtsam/navigation/GPSFactor.h @@ -97,7 +97,7 @@ class GTSAM_EXPORT GPSFactor: public NoiseModelFactorN { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template @@ -166,7 +166,7 @@ class GTSAM_EXPORT GPSFactor2: public NoiseModelFactorN { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam/navigation/ImuBias.h b/gtsam/navigation/ImuBias.h index 6df87eda68..02a020c42d 100644 --- a/gtsam/navigation/ImuBias.h +++ b/gtsam/navigation/ImuBias.h @@ -20,7 +20,7 @@ #include #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #endif @@ -142,7 +142,7 @@ class GTSAM_EXPORT ConstantBias { /// @name Advanced Interface /// @{ -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/navigation/ImuFactor.h b/gtsam/navigation/ImuFactor.h index 7254838fd4..b19989a77a 100644 --- a/gtsam/navigation/ImuFactor.h +++ b/gtsam/navigation/ImuFactor.h @@ -142,7 +142,7 @@ class GTSAM_EXPORT PreintegratedImuMeasurements: public PreintegrationType { #endif private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template @@ -244,7 +244,7 @@ class GTSAM_EXPORT ImuFactor: public NoiseModelFactorN void serialize(ARCHIVE & ar, const unsigned int /*version*/) { @@ -316,7 +316,7 @@ class GTSAM_EXPORT ImuFactor2 : public NoiseModelFactorN diff --git a/gtsam/navigation/MagPoseFactor.h b/gtsam/navigation/MagPoseFactor.h index ba9a08d785..ea0b30c75c 100644 --- a/gtsam/navigation/MagPoseFactor.h +++ b/gtsam/navigation/MagPoseFactor.h @@ -132,7 +132,7 @@ class MagPoseFactor: public NoiseModelFactorN { } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function. friend class boost::serialization::access; template diff --git a/gtsam/navigation/ManifoldPreintegration.h b/gtsam/navigation/ManifoldPreintegration.h index 40691c445b..43228044ab 100644 --- a/gtsam/navigation/ManifoldPreintegration.h +++ b/gtsam/navigation/ManifoldPreintegration.h @@ -113,7 +113,7 @@ class GTSAM_EXPORT ManifoldPreintegration : public PreintegrationBase { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/navigation/NavState.h b/gtsam/navigation/NavState.h index 95ee71fe9c..e246cbe271 100644 --- a/gtsam/navigation/NavState.h +++ b/gtsam/navigation/NavState.h @@ -269,7 +269,7 @@ class GTSAM_EXPORT NavState : public LieGroup { private: /// @{ /// serialization -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// friend class boost::serialization::access; template void serialize(ARCHIVE & ar, const unsigned int /*version*/) { diff --git a/gtsam/navigation/PreintegratedRotation.h b/gtsam/navigation/PreintegratedRotation.h index 49b1aa4c11..a887ef3215 100644 --- a/gtsam/navigation/PreintegratedRotation.h +++ b/gtsam/navigation/PreintegratedRotation.h @@ -85,7 +85,7 @@ struct GTSAM_EXPORT PreintegratedRotationParams { std::optional getBodyPSensor() const { return body_P_sensor; } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -227,7 +227,7 @@ class GTSAM_EXPORT PreintegratedRotation { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/navigation/PreintegrationBase.h b/gtsam/navigation/PreintegrationBase.h index e4a790b9db..de3a380cfe 100644 --- a/gtsam/navigation/PreintegrationBase.h +++ b/gtsam/navigation/PreintegrationBase.h @@ -173,7 +173,7 @@ class GTSAM_EXPORT PreintegrationBase { OptionalJacobian<9, 6> H5 = {}) const; private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/navigation/PreintegrationCombinedParams.h b/gtsam/navigation/PreintegrationCombinedParams.h index 6be05c082a..b384a36e72 100644 --- a/gtsam/navigation/PreintegrationCombinedParams.h +++ b/gtsam/navigation/PreintegrationCombinedParams.h @@ -84,7 +84,7 @@ struct GTSAM_EXPORT PreintegrationCombinedParams : PreintegrationParams { const Matrix6& getBiasAccOmegaInit() const { return biasAccOmegaInt; } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/navigation/PreintegrationParams.h b/gtsam/navigation/PreintegrationParams.h index 8435d0bada..6ea9e73b3e 100644 --- a/gtsam/navigation/PreintegrationParams.h +++ b/gtsam/navigation/PreintegrationParams.h @@ -71,7 +71,7 @@ struct GTSAM_EXPORT PreintegrationParams: PreintegratedRotationParams { protected: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/navigation/TangentPreintegration.h b/gtsam/navigation/TangentPreintegration.h index e16ad9310d..7f5c63d50c 100644 --- a/gtsam/navigation/TangentPreintegration.h +++ b/gtsam/navigation/TangentPreintegration.h @@ -127,7 +127,7 @@ class GTSAM_EXPORT TangentPreintegration : public PreintegrationBase { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/nonlinear/CustomFactor.h b/gtsam/nonlinear/CustomFactor.h index c4015db373..5f8a19ff04 100644 --- a/gtsam/nonlinear/CustomFactor.h +++ b/gtsam/nonlinear/CustomFactor.h @@ -88,7 +88,7 @@ class GTSAM_EXPORT CustomFactor: public NoiseModelFactor { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/nonlinear/ExpressionFactor.h b/gtsam/nonlinear/ExpressionFactor.h index d9af1933c6..4f6648849b 100644 --- a/gtsam/nonlinear/ExpressionFactor.h +++ b/gtsam/nonlinear/ExpressionFactor.h @@ -200,7 +200,7 @@ class ExpressionFactor : public NoiseModelFactor { } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// Save to an archive: just saves the base class template void save(Archive& ar, const unsigned int /*version*/) const { @@ -287,7 +287,7 @@ class ExpressionFactorN : public ExpressionFactor { return expression(keys); } -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION friend class boost::serialization::access; template void serialize(ARCHIVE &ar, const unsigned int /*version*/) { diff --git a/gtsam/nonlinear/FunctorizedFactor.h b/gtsam/nonlinear/FunctorizedFactor.h index 128de5847d..ca253179bd 100644 --- a/gtsam/nonlinear/FunctorizedFactor.h +++ b/gtsam/nonlinear/FunctorizedFactor.h @@ -119,7 +119,7 @@ class FunctorizedFactor : public NoiseModelFactorN { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -231,7 +231,7 @@ class FunctorizedFactor2 : public NoiseModelFactorN { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/nonlinear/ISAM2.h b/gtsam/nonlinear/ISAM2.h index d3abd95fd2..f71b4b7da0 100644 --- a/gtsam/nonlinear/ISAM2.h +++ b/gtsam/nonlinear/ISAM2.h @@ -340,7 +340,7 @@ class GTSAM_EXPORT ISAM2 : public BayesTree { void updateDelta(bool forceFullSolve = false) const; private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/nonlinear/ISAM2Clique.h b/gtsam/nonlinear/ISAM2Clique.h index fde9dd3f2d..39bce432a6 100644 --- a/gtsam/nonlinear/ISAM2Clique.h +++ b/gtsam/nonlinear/ISAM2Clique.h @@ -146,7 +146,7 @@ class GTSAM_EXPORT ISAM2Clique void restoreFromOriginals(const Vector& originalValues, VectorValues* delta) const; -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/nonlinear/LinearContainerFactor.h b/gtsam/nonlinear/LinearContainerFactor.h index dfbf221c39..f63ecb0c60 100644 --- a/gtsam/nonlinear/LinearContainerFactor.h +++ b/gtsam/nonlinear/LinearContainerFactor.h @@ -163,7 +163,7 @@ class GTSAM_EXPORT LinearContainerFactor : public NonlinearFactor { void initializeLinearizationPoint(const Values& linearizationPoint); private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/nonlinear/NonlinearEquality.h b/gtsam/nonlinear/NonlinearEquality.h index f81486b301..538a95208a 100644 --- a/gtsam/nonlinear/NonlinearEquality.h +++ b/gtsam/nonlinear/NonlinearEquality.h @@ -180,7 +180,7 @@ class NonlinearEquality: public NoiseModelFactorN { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template @@ -273,7 +273,7 @@ class NonlinearEquality1: public NoiseModelFactorN { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template @@ -344,7 +344,7 @@ class NonlinearEquality2 : public NoiseModelFactorN { GTSAM_MAKE_ALIGNED_OPERATOR_NEW private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam/nonlinear/NonlinearFactor.h b/gtsam/nonlinear/NonlinearFactor.h index 101743b783..1af01f60d6 100644 --- a/gtsam/nonlinear/NonlinearFactor.h +++ b/gtsam/nonlinear/NonlinearFactor.h @@ -29,7 +29,7 @@ #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #endif #include @@ -303,7 +303,7 @@ class GTSAM_EXPORT NoiseModelFactor: public NonlinearFactor { shared_ptr cloneWithNewNoiseModel(const SharedNoiseModel newNoise) const; private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -715,7 +715,7 @@ class NoiseModelFactorN } } -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/nonlinear/NonlinearFactorGraph.h b/gtsam/nonlinear/NonlinearFactorGraph.h index bf56d835f3..8e3443dc71 100644 --- a/gtsam/nonlinear/NonlinearFactorGraph.h +++ b/gtsam/nonlinear/NonlinearFactorGraph.h @@ -250,7 +250,7 @@ namespace gtsam { std::shared_ptr linearizeToHessianFactor( const Values& values, const Scatter& scatter, const Dampen& dampen = nullptr) const; -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/nonlinear/PriorFactor.h b/gtsam/nonlinear/PriorFactor.h index 1593734590..0979be3df8 100644 --- a/gtsam/nonlinear/PriorFactor.h +++ b/gtsam/nonlinear/PriorFactor.h @@ -105,7 +105,7 @@ namespace gtsam { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/nonlinear/Values.h b/gtsam/nonlinear/Values.h index 2fe64d9c91..7e950479ad 100644 --- a/gtsam/nonlinear/Values.h +++ b/gtsam/nonlinear/Values.h @@ -29,7 +29,7 @@ #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #endif @@ -393,7 +393,7 @@ namespace gtsam { return filter(key_value.key) && (dynamic_cast*>(&key_value.value)); } -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/sam/BearingFactor.h b/gtsam/sam/BearingFactor.h index 01b2baf184..97f23ed8fe 100644 --- a/gtsam/sam/BearingFactor.h +++ b/gtsam/sam/BearingFactor.h @@ -75,7 +75,7 @@ struct BearingFactor : public ExpressionFactorN { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION friend class boost::serialization::access; template void serialize(ARCHIVE& ar, const unsigned int /*version*/) { diff --git a/gtsam/sam/BearingRangeFactor.h b/gtsam/sam/BearingRangeFactor.h index d5467be475..aa08fea173 100644 --- a/gtsam/sam/BearingRangeFactor.h +++ b/gtsam/sam/BearingRangeFactor.h @@ -92,7 +92,7 @@ class BearingRangeFactor private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION friend class boost::serialization::access; template void serialize(ARCHIVE& ar, const unsigned int /*version*/) { diff --git a/gtsam/sam/RangeFactor.h b/gtsam/sam/RangeFactor.h index 193a89a5a2..0ccc54afdc 100644 --- a/gtsam/sam/RangeFactor.h +++ b/gtsam/sam/RangeFactor.h @@ -80,7 +80,7 @@ class RangeFactor : public ExpressionFactorN { } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION friend class boost::serialization::access; template void serialize(ARCHIVE& ar, const unsigned int /*version*/) { @@ -164,7 +164,7 @@ class RangeFactorWithTransform : public ExpressionFactorN { } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION friend class boost::serialization::access; /** Serialization function */ template diff --git a/gtsam/sfm/SfmData.h b/gtsam/sfm/SfmData.h index 7161ab2f94..dbe3369791 100644 --- a/gtsam/sfm/SfmData.h +++ b/gtsam/sfm/SfmData.h @@ -125,7 +125,7 @@ struct GTSAM_EXPORT SfmData { /// @name Serialization /// @{ -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION friend class boost::serialization::access; /** Serialization function */ template diff --git a/gtsam/sfm/SfmTrack.h b/gtsam/sfm/SfmTrack.h index 2b494ed7c7..bdfa79cef9 100644 --- a/gtsam/sfm/SfmTrack.h +++ b/gtsam/sfm/SfmTrack.h @@ -160,7 +160,7 @@ struct GTSAM_EXPORT SfmTrack : SfmTrack2d { /// @name Serialization /// @{ -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/sfm/TranslationFactor.h b/gtsam/sfm/TranslationFactor.h index cfb9cff20d..20bf005c17 100644 --- a/gtsam/sfm/TranslationFactor.h +++ b/gtsam/sfm/TranslationFactor.h @@ -78,7 +78,7 @@ class TranslationFactor : public NoiseModelFactorN { } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION friend class boost::serialization::access; template void serialize(ARCHIVE& ar, const unsigned int /*version*/) { @@ -149,7 +149,7 @@ class BilinearAngleTranslationFactor } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION friend class boost::serialization::access; template void serialize(ARCHIVE& ar, const unsigned int /*version*/) { diff --git a/gtsam/slam/AntiFactor.h b/gtsam/slam/AntiFactor.h index 3b031b3348..11a0b15309 100644 --- a/gtsam/slam/AntiFactor.h +++ b/gtsam/slam/AntiFactor.h @@ -106,7 +106,7 @@ namespace gtsam { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/slam/BetweenFactor.h b/gtsam/slam/BetweenFactor.h index 3e2478e739..297703d4a1 100644 --- a/gtsam/slam/BetweenFactor.h +++ b/gtsam/slam/BetweenFactor.h @@ -135,7 +135,7 @@ namespace gtsam { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -176,7 +176,7 @@ namespace gtsam { private: /** Serialization function */ -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION friend class boost::serialization::access; template void serialize(ARCHIVE & ar, const unsigned int /*version*/) { diff --git a/gtsam/slam/BoundingConstraint.h b/gtsam/slam/BoundingConstraint.h index a496971e28..85d1f6255a 100644 --- a/gtsam/slam/BoundingConstraint.h +++ b/gtsam/slam/BoundingConstraint.h @@ -83,7 +83,7 @@ struct BoundingConstraint1: public NoiseModelFactorN { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -161,7 +161,7 @@ struct BoundingConstraint2: public NoiseModelFactorN { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/slam/EssentialMatrixConstraint.h b/gtsam/slam/EssentialMatrixConstraint.h index 45e54aa5df..6b57a8f279 100644 --- a/gtsam/slam/EssentialMatrixConstraint.h +++ b/gtsam/slam/EssentialMatrixConstraint.h @@ -91,7 +91,7 @@ class GTSAM_EXPORT EssentialMatrixConstraint: public NoiseModelFactorN diff --git a/gtsam/slam/GeneralSFMFactor.h b/gtsam/slam/GeneralSFMFactor.h index 581624b389..06c832eb40 100644 --- a/gtsam/slam/GeneralSFMFactor.h +++ b/gtsam/slam/GeneralSFMFactor.h @@ -36,7 +36,7 @@ #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #endif #include @@ -182,7 +182,7 @@ class GeneralSFMFactor: public NoiseModelFactorN { } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -283,7 +283,7 @@ class GeneralSFMFactor2: public NoiseModelFactorN { } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/slam/PoseRotationPrior.h b/gtsam/slam/PoseRotationPrior.h index 8ce90988bc..47ea4c69f3 100644 --- a/gtsam/slam/PoseRotationPrior.h +++ b/gtsam/slam/PoseRotationPrior.h @@ -91,7 +91,7 @@ class PoseRotationPrior : public NoiseModelFactorN { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/slam/PoseTranslationPrior.h b/gtsam/slam/PoseTranslationPrior.h index c5257f45c1..378610825b 100644 --- a/gtsam/slam/PoseTranslationPrior.h +++ b/gtsam/slam/PoseTranslationPrior.h @@ -90,7 +90,7 @@ class PoseTranslationPrior : public NoiseModelFactorN { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/slam/ProjectionFactor.h b/gtsam/slam/ProjectionFactor.h index f40d8f5bb5..baea29eed7 100644 --- a/gtsam/slam/ProjectionFactor.h +++ b/gtsam/slam/ProjectionFactor.h @@ -188,7 +188,7 @@ namespace gtsam { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam/slam/ReferenceFrameFactor.h b/gtsam/slam/ReferenceFrameFactor.h index 0ae6ea88ab..21617e27a8 100644 --- a/gtsam/slam/ReferenceFrameFactor.h +++ b/gtsam/slam/ReferenceFrameFactor.h @@ -122,7 +122,7 @@ class ReferenceFrameFactor : public NoiseModelFactorN { Key local_key() const { return this->key3(); } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/slam/SmartFactorBase.h b/gtsam/slam/SmartFactorBase.h index d3e879c33d..e641bf5d1e 100644 --- a/gtsam/slam/SmartFactorBase.h +++ b/gtsam/slam/SmartFactorBase.h @@ -30,7 +30,7 @@ #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #endif #include @@ -450,7 +450,7 @@ class SmartFactorBase: public NonlinearFactor { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION/// +#if GTSAM_ENABLE_BOOST_SERIALIZATION/// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam/slam/SmartFactorParams.h b/gtsam/slam/SmartFactorParams.h index 4523d0e0e4..de3245038a 100644 --- a/gtsam/slam/SmartFactorParams.h +++ b/gtsam/slam/SmartFactorParams.h @@ -118,7 +118,7 @@ struct SmartProjectionParams { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam/slam/SmartProjectionFactor.h b/gtsam/slam/SmartProjectionFactor.h index c54efecc46..3c8843b396 100644 --- a/gtsam/slam/SmartProjectionFactor.h +++ b/gtsam/slam/SmartProjectionFactor.h @@ -466,7 +466,7 @@ class SmartProjectionFactor: public SmartFactorBase { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam/slam/SmartProjectionPoseFactor.h b/gtsam/slam/SmartProjectionPoseFactor.h index b88c1c6282..855ae8c08d 100644 --- a/gtsam/slam/SmartProjectionPoseFactor.h +++ b/gtsam/slam/SmartProjectionPoseFactor.h @@ -148,7 +148,7 @@ class SmartProjectionPoseFactor private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam/slam/SmartProjectionRigFactor.h b/gtsam/slam/SmartProjectionRigFactor.h index 6007c84e25..dd42372990 100644 --- a/gtsam/slam/SmartProjectionRigFactor.h +++ b/gtsam/slam/SmartProjectionRigFactor.h @@ -349,7 +349,7 @@ class SmartProjectionRigFactor : public SmartProjectionFactor { } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam/slam/StereoFactor.h b/gtsam/slam/StereoFactor.h index 5adafcf3a8..5fd171851a 100644 --- a/gtsam/slam/StereoFactor.h +++ b/gtsam/slam/StereoFactor.h @@ -175,7 +175,7 @@ class GenericStereoFactor: public NoiseModelFactorN { } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/slam/TriangulationFactor.h b/gtsam/slam/TriangulationFactor.h index 3b8486a594..f36e9b3857 100644 --- a/gtsam/slam/TriangulationFactor.h +++ b/gtsam/slam/TriangulationFactor.h @@ -187,7 +187,7 @@ class TriangulationFactor: public NoiseModelFactorN { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam/symbolic/SymbolicBayesNet.h b/gtsam/symbolic/SymbolicBayesNet.h index 3102191dcc..4bba7cb69f 100644 --- a/gtsam/symbolic/SymbolicBayesNet.h +++ b/gtsam/symbolic/SymbolicBayesNet.h @@ -101,7 +101,7 @@ namespace gtsam { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/symbolic/SymbolicBayesTree.h b/gtsam/symbolic/SymbolicBayesTree.h index 275b9560d4..2b9e2f7ad2 100644 --- a/gtsam/symbolic/SymbolicBayesTree.h +++ b/gtsam/symbolic/SymbolicBayesTree.h @@ -62,7 +62,7 @@ namespace gtsam { bool equals(const This& other, double tol = 1e-9) const; private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/symbolic/SymbolicConditional.h b/gtsam/symbolic/SymbolicConditional.h index 5cc4e9cfc8..3cc3e60cc6 100644 --- a/gtsam/symbolic/SymbolicConditional.h +++ b/gtsam/symbolic/SymbolicConditional.h @@ -126,7 +126,7 @@ namespace gtsam { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/symbolic/SymbolicFactor.h b/gtsam/symbolic/SymbolicFactor.h index 190609ecbd..fd19740de5 100644 --- a/gtsam/symbolic/SymbolicFactor.h +++ b/gtsam/symbolic/SymbolicFactor.h @@ -151,7 +151,7 @@ namespace gtsam { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam/symbolic/SymbolicFactorGraph.h b/gtsam/symbolic/SymbolicFactorGraph.h index 4122031d05..bbcd59f5ea 100644 --- a/gtsam/symbolic/SymbolicFactorGraph.h +++ b/gtsam/symbolic/SymbolicFactorGraph.h @@ -145,7 +145,7 @@ namespace gtsam { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam_unstable/dynamics/PoseRTV.h b/gtsam_unstable/dynamics/PoseRTV.h index 0e0d9ae27c..95b7cfff35 100644 --- a/gtsam_unstable/dynamics/PoseRTV.h +++ b/gtsam_unstable/dynamics/PoseRTV.h @@ -157,7 +157,7 @@ class GTSAM_UNSTABLE_EXPORT PoseRTV : public ProductLieGroup { /// @} private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam_unstable/dynamics/VelocityConstraint3.h b/gtsam_unstable/dynamics/VelocityConstraint3.h index 9f2ec89d2f..9751b30a79 100644 --- a/gtsam_unstable/dynamics/VelocityConstraint3.h +++ b/gtsam_unstable/dynamics/VelocityConstraint3.h @@ -51,7 +51,7 @@ class VelocityConstraint3 : public NoiseModelFactorN { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam_unstable/geometry/BearingS2.h b/gtsam_unstable/geometry/BearingS2.h index cb1d055dfd..0c3f40df87 100644 --- a/gtsam_unstable/geometry/BearingS2.h +++ b/gtsam_unstable/geometry/BearingS2.h @@ -90,7 +90,7 @@ class GTSAM_UNSTABLE_EXPORT BearingS2 { /// @name Advanced Interface /// @{ -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION // +#if GTSAM_ENABLE_BOOST_SERIALIZATION // // Serialization function friend class boost::serialization::access; template diff --git a/gtsam_unstable/geometry/InvDepthCamera3.h b/gtsam_unstable/geometry/InvDepthCamera3.h index 45b27efe3a..d1486209e8 100644 --- a/gtsam_unstable/geometry/InvDepthCamera3.h +++ b/gtsam_unstable/geometry/InvDepthCamera3.h @@ -19,7 +19,7 @@ #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #endif @@ -175,7 +175,7 @@ class InvDepthCamera3 { /// @name Advanced Interface /// @{ -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam_unstable/geometry/Pose3Upright.h b/gtsam_unstable/geometry/Pose3Upright.h index a77715fc68..20e0fde5db 100644 --- a/gtsam_unstable/geometry/Pose3Upright.h +++ b/gtsam_unstable/geometry/Pose3Upright.h @@ -130,7 +130,7 @@ class GTSAM_UNSTABLE_EXPORT Pose3Upright { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION // +#if GTSAM_ENABLE_BOOST_SERIALIZATION // // Serialization function friend class boost::serialization::access; template diff --git a/gtsam_unstable/nonlinear/LinearizedFactor.h b/gtsam_unstable/nonlinear/LinearizedFactor.h index 1ff45ef5f1..7aa596be15 100644 --- a/gtsam_unstable/nonlinear/LinearizedFactor.h +++ b/gtsam_unstable/nonlinear/LinearizedFactor.h @@ -59,7 +59,7 @@ class GTSAM_UNSTABLE_EXPORT LinearizedGaussianFactor : public NonlinearFactor { const Values& linearizationPoint() const { return lin_points_; } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template @@ -148,7 +148,7 @@ class GTSAM_UNSTABLE_EXPORT LinearizedJacobianFactor : public LinearizedGaussian Vector error_vector(const Values& c) const; private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION friend class boost::serialization::access; /** Serialization function */ template @@ -279,7 +279,7 @@ class GTSAM_UNSTABLE_EXPORT LinearizedHessianFactor : public LinearizedGaussianF private: /** Serialization function */ -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION friend class boost::serialization::access; template void serialize(ARCHIVE & ar, const unsigned int /*version*/) { diff --git a/gtsam_unstable/slam/BetweenFactorEM.h b/gtsam_unstable/slam/BetweenFactorEM.h index f1337c0e8f..6cdce415e7 100644 --- a/gtsam_unstable/slam/BetweenFactorEM.h +++ b/gtsam_unstable/slam/BetweenFactorEM.h @@ -415,7 +415,7 @@ class BetweenFactorEM: public NonlinearFactor { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam_unstable/slam/BiasedGPSFactor.h b/gtsam_unstable/slam/BiasedGPSFactor.h index f2b669f4fc..1c278b111d 100644 --- a/gtsam_unstable/slam/BiasedGPSFactor.h +++ b/gtsam_unstable/slam/BiasedGPSFactor.h @@ -94,7 +94,7 @@ namespace gtsam { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam_unstable/slam/EquivInertialNavFactor_GlobalVel.h b/gtsam_unstable/slam/EquivInertialNavFactor_GlobalVel.h index 0accb8f42b..b759ceb56a 100644 --- a/gtsam_unstable/slam/EquivInertialNavFactor_GlobalVel.h +++ b/gtsam_unstable/slam/EquivInertialNavFactor_GlobalVel.h @@ -704,7 +704,7 @@ class EquivInertialNavFactor_GlobalVel : public NoiseModelFactorN diff --git a/gtsam_unstable/slam/EquivInertialNavFactor_GlobalVel_NoBias.h b/gtsam_unstable/slam/EquivInertialNavFactor_GlobalVel_NoBias.h index a94c953354..56f2e2cee3 100644 --- a/gtsam_unstable/slam/EquivInertialNavFactor_GlobalVel_NoBias.h +++ b/gtsam_unstable/slam/EquivInertialNavFactor_GlobalVel_NoBias.h @@ -573,7 +573,7 @@ class EquivInertialNavFactor_GlobalVel_NoBias : public NoiseModelFactorN diff --git a/gtsam_unstable/slam/GaussMarkov1stOrderFactor.h b/gtsam_unstable/slam/GaussMarkov1stOrderFactor.h index b91ed2afe6..c9c4141b1d 100644 --- a/gtsam_unstable/slam/GaussMarkov1stOrderFactor.h +++ b/gtsam_unstable/slam/GaussMarkov1stOrderFactor.h @@ -113,7 +113,7 @@ class GaussMarkov1stOrderFactor: public NoiseModelFactorN { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam_unstable/slam/InertialNavFactor_GlobalVelocity.h b/gtsam_unstable/slam/InertialNavFactor_GlobalVelocity.h index 8fda5456ba..95fde2f75a 100644 --- a/gtsam_unstable/slam/InertialNavFactor_GlobalVelocity.h +++ b/gtsam_unstable/slam/InertialNavFactor_GlobalVelocity.h @@ -411,7 +411,7 @@ class InertialNavFactor_GlobalVelocity : public NoiseModelFactorN diff --git a/gtsam_unstable/slam/InvDepthFactor3.h b/gtsam_unstable/slam/InvDepthFactor3.h index 64a1366a29..f47c56bc9f 100644 --- a/gtsam_unstable/slam/InvDepthFactor3.h +++ b/gtsam_unstable/slam/InvDepthFactor3.h @@ -113,7 +113,7 @@ class InvDepthFactor3: public NoiseModelFactorN { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam_unstable/slam/InvDepthFactorVariant1.h b/gtsam_unstable/slam/InvDepthFactorVariant1.h index a49b2090c0..638b774406 100644 --- a/gtsam_unstable/slam/InvDepthFactorVariant1.h +++ b/gtsam_unstable/slam/InvDepthFactorVariant1.h @@ -133,7 +133,7 @@ class InvDepthFactorVariant1: public NoiseModelFactorN { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam_unstable/slam/InvDepthFactorVariant2.h b/gtsam_unstable/slam/InvDepthFactorVariant2.h index 7abbbe89ae..01f087df0c 100644 --- a/gtsam_unstable/slam/InvDepthFactorVariant2.h +++ b/gtsam_unstable/slam/InvDepthFactorVariant2.h @@ -140,7 +140,7 @@ class InvDepthFactorVariant2: public NoiseModelFactorN { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam_unstable/slam/InvDepthFactorVariant3.h b/gtsam_unstable/slam/InvDepthFactorVariant3.h index 8664002e82..f71df8425d 100644 --- a/gtsam_unstable/slam/InvDepthFactorVariant3.h +++ b/gtsam_unstable/slam/InvDepthFactorVariant3.h @@ -137,7 +137,7 @@ class InvDepthFactorVariant3a: public NoiseModelFactorN { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template @@ -269,7 +269,7 @@ class InvDepthFactorVariant3b: public NoiseModelFactorN { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION friend class boost::serialization::access; /// Serialization function template diff --git a/gtsam_unstable/slam/MultiProjectionFactor.h b/gtsam_unstable/slam/MultiProjectionFactor.h index 8e2ea0cf74..28e9c0215b 100644 --- a/gtsam_unstable/slam/MultiProjectionFactor.h +++ b/gtsam_unstable/slam/MultiProjectionFactor.h @@ -213,7 +213,7 @@ namespace gtsam { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam_unstable/slam/PartialPriorFactor.h b/gtsam_unstable/slam/PartialPriorFactor.h index 0a735a2e14..645d0305a7 100644 --- a/gtsam_unstable/slam/PartialPriorFactor.h +++ b/gtsam_unstable/slam/PartialPriorFactor.h @@ -142,7 +142,7 @@ namespace gtsam { const std::vector& indices() const { return indices_; } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam_unstable/slam/PoseBetweenFactor.h b/gtsam_unstable/slam/PoseBetweenFactor.h index aa383967d1..1e0526e22e 100644 --- a/gtsam_unstable/slam/PoseBetweenFactor.h +++ b/gtsam_unstable/slam/PoseBetweenFactor.h @@ -119,7 +119,7 @@ namespace gtsam { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam_unstable/slam/PosePriorFactor.h b/gtsam_unstable/slam/PosePriorFactor.h index 4a201ad892..60df7e9484 100644 --- a/gtsam_unstable/slam/PosePriorFactor.h +++ b/gtsam_unstable/slam/PosePriorFactor.h @@ -101,7 +101,7 @@ namespace gtsam { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam_unstable/slam/PoseToPointFactor.h b/gtsam_unstable/slam/PoseToPointFactor.h index be454cb702..911445fa57 100644 --- a/gtsam_unstable/slam/PoseToPointFactor.h +++ b/gtsam_unstable/slam/PoseToPointFactor.h @@ -92,7 +92,7 @@ class PoseToPointFactor : public NoiseModelFactorN { const POINT& measured() const { return measured_; } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam_unstable/slam/ProjectionFactorPPP.h b/gtsam_unstable/slam/ProjectionFactorPPP.h index 38467c6ccd..126900bc2a 100644 --- a/gtsam_unstable/slam/ProjectionFactorPPP.h +++ b/gtsam_unstable/slam/ProjectionFactorPPP.h @@ -171,7 +171,7 @@ namespace gtsam { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam_unstable/slam/ProjectionFactorPPPC.h b/gtsam_unstable/slam/ProjectionFactorPPPC.h index df63330dfa..cea74842fc 100644 --- a/gtsam_unstable/slam/ProjectionFactorPPPC.h +++ b/gtsam_unstable/slam/ProjectionFactorPPPC.h @@ -151,7 +151,7 @@ class ProjectionFactorPPPC private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam_unstable/slam/ProjectionFactorRollingShutter.h b/gtsam_unstable/slam/ProjectionFactorRollingShutter.h index c5eb58f141..7787137333 100644 --- a/gtsam_unstable/slam/ProjectionFactorRollingShutter.h +++ b/gtsam_unstable/slam/ProjectionFactorRollingShutter.h @@ -194,7 +194,7 @@ class GTSAM_UNSTABLE_EXPORT ProjectionFactorRollingShutter inline bool throwCheirality() const { return throwCheirality_; } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam_unstable/slam/RelativeElevationFactor.h b/gtsam_unstable/slam/RelativeElevationFactor.h index d24415c3b3..13bd5eba0a 100644 --- a/gtsam_unstable/slam/RelativeElevationFactor.h +++ b/gtsam_unstable/slam/RelativeElevationFactor.h @@ -65,7 +65,7 @@ class GTSAM_UNSTABLE_EXPORT RelativeElevationFactor: public NoiseModelFactorN diff --git a/gtsam_unstable/slam/SmartProjectionPoseFactorRollingShutter.h b/gtsam_unstable/slam/SmartProjectionPoseFactorRollingShutter.h index 4a2047ee1f..f28ce642b1 100644 --- a/gtsam_unstable/slam/SmartProjectionPoseFactorRollingShutter.h +++ b/gtsam_unstable/slam/SmartProjectionPoseFactorRollingShutter.h @@ -453,7 +453,7 @@ class SmartProjectionPoseFactorRollingShutter } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam_unstable/slam/SmartStereoProjectionFactor.h b/gtsam_unstable/slam/SmartStereoProjectionFactor.h index 52d6eda05f..7b06e88271 100644 --- a/gtsam_unstable/slam/SmartStereoProjectionFactor.h +++ b/gtsam_unstable/slam/SmartStereoProjectionFactor.h @@ -30,7 +30,7 @@ #include #include -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION #include #endif @@ -504,7 +504,7 @@ class SmartStereoProjectionFactor private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam_unstable/slam/SmartStereoProjectionFactorPP.h b/gtsam_unstable/slam/SmartStereoProjectionFactorPP.h index 189c501bb3..7482682fa4 100644 --- a/gtsam_unstable/slam/SmartStereoProjectionFactorPP.h +++ b/gtsam_unstable/slam/SmartStereoProjectionFactorPP.h @@ -285,7 +285,7 @@ class GTSAM_UNSTABLE_EXPORT SmartStereoProjectionFactorPP } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam_unstable/slam/SmartStereoProjectionPoseFactor.h b/gtsam_unstable/slam/SmartStereoProjectionPoseFactor.h index 77a15c246c..93d8877a72 100644 --- a/gtsam_unstable/slam/SmartStereoProjectionPoseFactor.h +++ b/gtsam_unstable/slam/SmartStereoProjectionPoseFactor.h @@ -138,7 +138,7 @@ class GTSAM_UNSTABLE_EXPORT SmartStereoProjectionPoseFactor Base::Cameras cameras(const Values& values) const override; private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/gtsam_unstable/slam/TransformBtwRobotsUnaryFactor.h b/gtsam_unstable/slam/TransformBtwRobotsUnaryFactor.h index 2a257ff579..cbc8eba528 100644 --- a/gtsam_unstable/slam/TransformBtwRobotsUnaryFactor.h +++ b/gtsam_unstable/slam/TransformBtwRobotsUnaryFactor.h @@ -216,7 +216,7 @@ namespace gtsam { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/gtsam_unstable/slam/TransformBtwRobotsUnaryFactorEM.h b/gtsam_unstable/slam/TransformBtwRobotsUnaryFactorEM.h index c47cf3b7d6..352a9ff37b 100644 --- a/gtsam_unstable/slam/TransformBtwRobotsUnaryFactorEM.h +++ b/gtsam_unstable/slam/TransformBtwRobotsUnaryFactorEM.h @@ -414,7 +414,7 @@ namespace gtsam { private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template diff --git a/tests/simulated2D.h b/tests/simulated2D.h index 612dd18917..78fc26708a 100644 --- a/tests/simulated2D.h +++ b/tests/simulated2D.h @@ -160,7 +160,7 @@ namespace simulated2D { /// Default constructor GenericPrior() { } -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template @@ -210,7 +210,7 @@ namespace simulated2D { /// Default constructor GenericOdometry() { } -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template @@ -261,7 +261,7 @@ namespace simulated2D { /// Default constructor GenericMeasurement() { } -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION /// +#if GTSAM_ENABLE_BOOST_SERIALIZATION /// /// Serialization function friend class boost::serialization::access; template diff --git a/tests/testExpressionFactor.cpp b/tests/testExpressionFactor.cpp index 4c2ac99b18..845c28e5a5 100644 --- a/tests/testExpressionFactor.cpp +++ b/tests/testExpressionFactor.cpp @@ -688,7 +688,7 @@ class TestNaryFactor } private: -#ifdef GTSAM_ENABLE_BOOST_SERIALIZATION +#if GTSAM_ENABLE_BOOST_SERIALIZATION /** Serialization function */ friend class boost::serialization::access; template