From 67e36febf2acd6f7fcc990332e1a82732c3e93e7 Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Mon, 1 Apr 2013 19:29:53 +0000 Subject: [PATCH] Added DLL export annotations on new code --- gtsam/inference/BayesTree.h | 2 +- gtsam_unstable/geometry/BearingS2.h | 3 ++- gtsam_unstable/geometry/Pose3Upright.h | 3 ++- gtsam_unstable/geometry/SimPolygon2D.h | 2 +- gtsam_unstable/geometry/SimWall2D.h | 3 ++- gtsam_unstable/nonlinear/summarization.h | 7 ++++--- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/gtsam/inference/BayesTree.h b/gtsam/inference/BayesTree.h index 6199d66a6..5e35b3f09 100644 --- a/gtsam/inference/BayesTree.h +++ b/gtsam/inference/BayesTree.h @@ -232,7 +232,7 @@ namespace gtsam { void clear(); /** Clear all shortcut caches - use before timing on marginal calculation to avoid residual cache data */ - inline void deleteCachedShortcuts() { + void deleteCachedShortcuts() { root_->deleteCachedShortcuts(); } diff --git a/gtsam_unstable/geometry/BearingS2.h b/gtsam_unstable/geometry/BearingS2.h index a5bb1e214..d48490ccc 100644 --- a/gtsam_unstable/geometry/BearingS2.h +++ b/gtsam_unstable/geometry/BearingS2.h @@ -9,12 +9,13 @@ #pragma once +#include #include #include namespace gtsam { -class BearingS2 : public DerivedValue { +class GTSAM_UNSTABLE_EXPORT BearingS2 : public DerivedValue { protected: Rot2 azimuth_, elevation_; diff --git a/gtsam_unstable/geometry/Pose3Upright.h b/gtsam_unstable/geometry/Pose3Upright.h index d1bbab87c..2a814b915 100644 --- a/gtsam_unstable/geometry/Pose3Upright.h +++ b/gtsam_unstable/geometry/Pose3Upright.h @@ -11,6 +11,7 @@ #pragma once +#include #include #include @@ -21,7 +22,7 @@ namespace gtsam { * @ingroup geometry * \nosubgrouping */ -class Pose3Upright : public DerivedValue { +class GTSAM_UNSTABLE_EXPORT Pose3Upright : public DerivedValue { public: static const size_t dimension = 4; diff --git a/gtsam_unstable/geometry/SimPolygon2D.h b/gtsam_unstable/geometry/SimPolygon2D.h index 9797c50cc..02892c519 100644 --- a/gtsam_unstable/geometry/SimPolygon2D.h +++ b/gtsam_unstable/geometry/SimPolygon2D.h @@ -16,7 +16,7 @@ namespace gtsam { /** * General polygon class for convex polygons */ -class SimPolygon2D { +class GTSAM_UNSTABLE_EXPORT SimPolygon2D { protected: std::vector landmarks_; static boost::minstd_rand rng; diff --git a/gtsam_unstable/geometry/SimWall2D.h b/gtsam_unstable/geometry/SimWall2D.h index 0b8328baa..d3e86296a 100644 --- a/gtsam_unstable/geometry/SimWall2D.h +++ b/gtsam_unstable/geometry/SimWall2D.h @@ -6,6 +6,7 @@ #pragma once +#include #include #include @@ -15,7 +16,7 @@ namespace gtsam { * General Wall class for walls defined around unordered endpoints * Primarily to handle ray intersections */ - class SimWall2D { + class GTSAM_UNSTABLE_EXPORT SimWall2D { protected: Point2 a_, b_; diff --git a/gtsam_unstable/nonlinear/summarization.h b/gtsam_unstable/nonlinear/summarization.h index 5d232299e..6d1da9cad 100644 --- a/gtsam_unstable/nonlinear/summarization.h +++ b/gtsam_unstable/nonlinear/summarization.h @@ -9,6 +9,7 @@ #pragma once +#include #include #include @@ -24,11 +25,11 @@ typedef boost::shared_ptr shared_jacobianGraph; * Summarization function that eliminates a set of variables (does not convert to Jacobians) * NOTE: uses sequential solver - requires fully constrained system */ -GaussianFactorGraph::shared_ptr summarizeGraphSequential( +GaussianFactorGraph::shared_ptr GTSAM_UNSTABLE_EXPORT summarizeGraphSequential( const GaussianFactorGraph& full_graph, const std::vector& indices, bool useQR = false); /** Summarization that also converts keys to indices */ -GaussianFactorGraph::shared_ptr summarizeGraphSequential( +GaussianFactorGraph::shared_ptr GTSAM_UNSTABLE_EXPORT summarizeGraphSequential( const GaussianFactorGraph& full_graph, const Ordering& ordering, const KeySet& saved_keys, bool useQR = false); @@ -38,7 +39,7 @@ GaussianFactorGraph::shared_ptr summarizeGraphSequential( * * Performs linearization to apply an ordering */ -std::pair +std::pair GTSAM_UNSTABLE_EXPORT partialCholeskySummarization(const NonlinearFactorGraph& graph, const Values& values, const KeySet& overlap_keys);