Pulled latest updates from trunk

This commit is contained in:
Benoit Steiner
2015-10-29 17:57:48 -07:00
41 changed files with 539 additions and 244 deletions

View File

@@ -47,11 +47,11 @@ ei_add_test(FFT)
find_package(MPFR 2.3.0)
find_package(GMP)
if(MPFR_FOUND)
if(MPFR_FOUND AND EIGEN_COMPILER_SUPPORT_CXX11)
include_directories(${MPFR_INCLUDES} ./mpreal)
ei_add_property(EIGEN_TESTED_BACKENDS "MPFR C++, ")
set(EIGEN_MPFR_TEST_LIBRARIES ${MPFR_LIBRARIES} ${GMP_LIBRARIES})
ei_add_test(mpreal_support "" "${EIGEN_MPFR_TEST_LIBRARIES}" )
ei_add_test(mpreal_support "-std=c++11" "${EIGEN_MPFR_TEST_LIBRARIES}" )
else()
ei_add_property(EIGEN_MISSING_BACKENDS "MPFR C++, ")
endif()

View File

@@ -107,7 +107,7 @@
#define MPREAL_HAVE_EXPLICIT_CONVERTERS
#endif
//#define MPFR_USE_INTMAX_T // Enable 64-bit integer types - should be defined before mpfr.h
#define MPFR_USE_INTMAX_T // Enable 64-bit integer types - should be defined before mpfr.h
#if defined(MPREAL_HAVE_MSVC_DEBUGVIEW) && defined(_MSC_VER) && defined(_DEBUG)
#define MPREAL_MSVC_DEBUGVIEW_CODE DebugView = toString();