From 3f98942e9a5cf4dbefd358dd6ee7191d79e92f6c Mon Sep 17 00:00:00 2001
From: Jing Dong <thu.dongjing@gmail.com>
Date: Wed, 17 May 2017 14:30:17 -0700
Subject: [PATCH] a few tmp fix to bypass eigen errors, should not be permanent
 solutions

---
 CMakeLists.txt                                        | 3 +++
 gtsam/3rdparty/Eigen/Eigen/src/Core/PlainObjectBase.h | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9aa8b701a..6db1f6681 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -251,6 +251,9 @@ else()
 
 endif()
 
+# tmp mute eigen static assert to avoid errors in shared lib
+add_definitions(-DEIGEN_NO_STATIC_ASSERT)
+
 ###############################################################################
 # Global compile options
 
diff --git a/gtsam/3rdparty/Eigen/Eigen/src/Core/PlainObjectBase.h b/gtsam/3rdparty/Eigen/Eigen/src/Core/PlainObjectBase.h
index 9f71956ff..be2c67c5f 100644
--- a/gtsam/3rdparty/Eigen/Eigen/src/Core/PlainObjectBase.h
+++ b/gtsam/3rdparty/Eigen/Eigen/src/Core/PlainObjectBase.h
@@ -380,7 +380,7 @@ class PlainObjectBase : public internal::dense_xpr_base<Derived>::type
       */
     EIGEN_STRONG_INLINE void conservativeResize(Index size)
     {
-      internal::conservative_resize_like_impl<Derived>::run(*this, size);
+      internal::conservative_resize_like_impl<Derived>::run(*this, size, 1);
     }
 
     /** Resizes the matrix to \a rows x \a cols of \c other, while leaving old values untouched.