Merge pull request #1102 from mikesheffler/fix-msvc-windows-build-gts…

…am-unstable
borglab · Feb 17, 2022 · 07a7802 · 07a7802
2 parents 315df6c + ac01db4
commit 07a7802
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/gtsam/geometry/PinholeCamera.h b/gtsam/geometry/PinholeCamera.h
@@ -30,7 +30,7 @@ namespace gtsam {
  * \nosubgrouping
  */
 template<typename Calibration>
-class GTSAM_EXPORT PinholeCamera: public PinholeBaseK<Calibration> {
+class PinholeCamera: public PinholeBaseK<Calibration> {
 
 public:
 

diff --git a/gtsam/geometry/PinholePose.h b/gtsam/geometry/PinholePose.h
@@ -31,7 +31,7 @@ namespace gtsam {
  * \nosubgrouping
  */
 template<typename CALIBRATION>
-class GTSAM_EXPORT PinholeBaseK: public PinholeBase {
+class PinholeBaseK: public PinholeBase {
 
 private:
 

diff --git a/gtsam/nonlinear/NonlinearFactor.h b/gtsam/nonlinear/NonlinearFactor.h
@@ -282,7 +282,7 @@ class GTSAM_EXPORT NoiseModelFactor: public NonlinearFactor {
  * which are objects in non-linear manifolds (Lie groups).
  */
 template<class VALUE>
-class GTSAM_EXPORT NoiseModelFactor1: public NoiseModelFactor {
+class NoiseModelFactor1: public NoiseModelFactor {
 
 public:
 
@@ -366,7 +366,7 @@ class GTSAM_EXPORT NoiseModelFactor1: public NoiseModelFactor {
 /** A convenient base class for creating your own NoiseModelFactor with 2
  * variables.  To derive from this class, implement evaluateError(). */
 template<class VALUE1, class VALUE2>
-class GTSAM_EXPORT NoiseModelFactor2: public NoiseModelFactor {
+class NoiseModelFactor2: public NoiseModelFactor {
 
 public:
 
@@ -441,7 +441,7 @@ class GTSAM_EXPORT NoiseModelFactor2: public NoiseModelFactor {
 /** A convenient base class for creating your own NoiseModelFactor with 3
  * variables.  To derive from this class, implement evaluateError(). */
 template<class VALUE1, class VALUE2, class VALUE3>
-class GTSAM_EXPORT NoiseModelFactor3: public NoiseModelFactor {
+class NoiseModelFactor3: public NoiseModelFactor {
 
 public:
 
@@ -518,7 +518,7 @@ class GTSAM_EXPORT NoiseModelFactor3: public NoiseModelFactor {
 /** A convenient base class for creating your own NoiseModelFactor with 4
  * variables.  To derive from this class, implement evaluateError(). */
 template<class VALUE1, class VALUE2, class VALUE3, class VALUE4>
-class GTSAM_EXPORT NoiseModelFactor4: public NoiseModelFactor {
+class NoiseModelFactor4: public NoiseModelFactor {
 
 public:
 
@@ -599,7 +599,7 @@ class GTSAM_EXPORT NoiseModelFactor4: public NoiseModelFactor {
 /** A convenient base class for creating your own NoiseModelFactor with 5
  * variables.  To derive from this class, implement evaluateError(). */
 template<class VALUE1, class VALUE2, class VALUE3, class VALUE4, class VALUE5>
-class GTSAM_EXPORT NoiseModelFactor5: public NoiseModelFactor {
+class NoiseModelFactor5: public NoiseModelFactor {
 
 public:
 
@@ -684,7 +684,7 @@ class GTSAM_EXPORT NoiseModelFactor5: public NoiseModelFactor {
 /** A convenient base class for creating your own NoiseModelFactor with 6
  * variables.  To derive from this class, implement evaluateError(). */
 template<class VALUE1, class VALUE2, class VALUE3, class VALUE4, class VALUE5, class VALUE6>
-class GTSAM_EXPORT NoiseModelFactor6: public NoiseModelFactor {
+class NoiseModelFactor6: public NoiseModelFactor {
 
 public:
 

diff --git a/gtsam/slam/SmartFactorBase.h b/gtsam/slam/SmartFactorBase.h
@@ -47,7 +47,7 @@ namespace gtsam {
  * @tparam CAMERA should behave like a PinholeCamera.
  */
 template<class CAMERA>
-class GTSAM_EXPORT SmartFactorBase: public NonlinearFactor {
+class SmartFactorBase: public NonlinearFactor {
 
 private:
   typedef NonlinearFactor Base;

diff --git a/gtsam_unstable/slam/SmartStereoProjectionFactor.h b/gtsam_unstable/slam/SmartStereoProjectionFactor.h
@@ -49,7 +49,7 @@ typedef SmartProjectionParams SmartStereoProjectionParams;
  * If you'd like to store poses in values instead of cameras, use
  * SmartStereoProjectionPoseFactor instead
 */
-class GTSAM_UNSTABLE_EXPORT SmartStereoProjectionFactor
+class SmartStereoProjectionFactor
     : public SmartFactorBase<StereoCamera> {
  private: