From b687317ccbf2ff007d3c1c7831e0ac4e53fe5a90 Mon Sep 17 00:00:00 2001 From: Mike Sheffler Date: Sun, 13 Feb 2022 16:47:12 -0800 Subject: [PATCH] EXPORT statements to help Windows build. In Constraint.h, there was a GTSAM_EXPORT that should have been GTSAM_UNSTABLE_EXPORT, and in DiscreteKey.h, there should be a GTSAM_EXPORT in front of an operator definition for a class that is being exported. --- gtsam/discrete/DiscreteKey.h | 2 +- gtsam_unstable/discrete/Constraint.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gtsam/discrete/DiscreteKey.h b/gtsam/discrete/DiscreteKey.h index ce0c56dbe..dea00074d 100644 --- a/gtsam/discrete/DiscreteKey.h +++ b/gtsam/discrete/DiscreteKey.h @@ -72,5 +72,5 @@ namespace gtsam { }; // DiscreteKeys /// Create a list from two keys - DiscreteKeys operator&(const DiscreteKey& key1, const DiscreteKey& key2); + GTSAM_EXPORT DiscreteKeys operator&(const DiscreteKey& key1, const DiscreteKey& key2); } diff --git a/gtsam_unstable/discrete/Constraint.h b/gtsam_unstable/discrete/Constraint.h index 4ee7b85eb..168891e6f 100644 --- a/gtsam_unstable/discrete/Constraint.h +++ b/gtsam_unstable/discrete/Constraint.h @@ -34,7 +34,7 @@ using Domains = std::map; * Base class for constraint factors * Derived classes include SingleValue, BinaryAllDiff, and AllDiff. */ -class GTSAM_EXPORT Constraint : public DiscreteFactor { +class GTSAM_UNSTABLE_EXPORT Constraint : public DiscreteFactor { public: typedef boost::shared_ptr shared_ptr;