From ee06f786797b74e75e6c2eae1209fa6389c49876 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Tue, 4 Nov 2014 21:58:52 +0100 Subject: Introduce unified macros to identify compiler, OS, and architecture. They are all defined in util/Macros.h and prefixed with EIGEN_COMP_, EIGEN_OS_, and EIGEN_ARCH_ respectively. --- Eigen/src/StlSupport/StdDeque.h | 2 +- Eigen/src/StlSupport/StdList.h | 2 +- Eigen/src/StlSupport/details.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Eigen/src/StlSupport') diff --git a/Eigen/src/StlSupport/StdDeque.h b/Eigen/src/StlSupport/StdDeque.h index aaf66330b..909600476 100644 --- a/Eigen/src/StlSupport/StdDeque.h +++ b/Eigen/src/StlSupport/StdDeque.h @@ -14,7 +14,7 @@ #include "details.h" // Define the explicit instantiation (e.g. necessary for the Intel compiler) -#if defined(__INTEL_COMPILER) || defined(__GNUC__) +#if EIGEN_COMP_GNUC || EIGEN_COMP_ICC #define EIGEN_EXPLICIT_STL_DEQUE_INSTANTIATION(...) template class std::deque<__VA_ARGS__, EIGEN_ALIGNED_ALLOCATOR<__VA_ARGS__> >; #else #define EIGEN_EXPLICIT_STL_DEQUE_INSTANTIATION(...) diff --git a/Eigen/src/StlSupport/StdList.h b/Eigen/src/StlSupport/StdList.h index 3c742430c..265b46f8e 100644 --- a/Eigen/src/StlSupport/StdList.h +++ b/Eigen/src/StlSupport/StdList.h @@ -13,7 +13,7 @@ #include "details.h" // Define the explicit instantiation (e.g. necessary for the Intel compiler) -#if defined(__INTEL_COMPILER) || defined(__GNUC__) +#if EIGEN_COMP_GNUC || EIGEN_COMP_ICC #define EIGEN_EXPLICIT_STL_LIST_INSTANTIATION(...) template class std::list<__VA_ARGS__, EIGEN_ALIGNED_ALLOCATOR<__VA_ARGS__> >; #else #define EIGEN_EXPLICIT_STL_LIST_INSTANTIATION(...) diff --git a/Eigen/src/StlSupport/details.h b/Eigen/src/StlSupport/details.h index d8debc7c4..e42ec024f 100644 --- a/Eigen/src/StlSupport/details.h +++ b/Eigen/src/StlSupport/details.h @@ -46,7 +46,7 @@ namespace Eigen { ~aligned_allocator_indirection() {} }; -#ifdef _MSC_VER +#if EIGEN_COMP_MSVC // sometimes, MSVC detects, at compile time, that the argument x // in std::vector::resize(size_t s,T x) won't be aligned and generate an error -- cgit v1.2.3