From 456c8eb6ed6621b7dca3311a19342dd7ecca3bc2 Mon Sep 17 00:00:00 2001 From: Chris Beall Date: Thu, 14 Aug 2014 00:57:41 -0400 Subject: [PATCH] Partial fix for Boost 1.56 with Visual Studio 2013. More errors remain. --- gtsam/base/types.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gtsam/base/types.h b/gtsam/base/types.h index f50f21d43..aca04a14b 100644 --- a/gtsam/base/types.h +++ b/gtsam/base/types.h @@ -299,6 +299,8 @@ namespace gtsam { // Define some common g++ functions and macros we use that MSVC does not have +#if (_MSC_VER < 1800) + #include namespace std { template inline int isfinite(T a) { @@ -309,6 +311,8 @@ namespace std { return (int)boost::math::isinf(a); } } +#endif + #include #ifndef M_PI #define M_PI (boost::math::constants::pi())