Fixed compiler error on MSVC 10.0

release/4.3a0
Richard Roberts 2013-12-24 14:48:39 -05:00
parent 886119bcf0
commit 6654fb2701
1 changed files with 18 additions and 1 deletions

View File

@ -17,9 +17,26 @@
#pragma once #pragma once
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include <boost/pool/singleton_pool.hpp>
#include <gtsam/base/Value.h> #include <gtsam/base/Value.h>
//////////////////
// The following includes windows.h in some MSVC versions, so we undef min, max, and ERROR
#include <boost/pool/singleton_pool.hpp>
#ifdef min
#undef min
#endif
#ifdef max
#undef max
#endif
#ifdef ERROR
#undef ERROR
#endif
//////////////////
namespace gtsam { namespace gtsam {
template<class DERIVED> template<class DERIVED>