bug #1136: Protect isinf for Intel compilers. Also don't distinguish GCC from ICC and don't rely on EIGEN_NOT_A_MACRO, which might not be defined when including this.

1 files changed, 4 insertions, 6 deletions

diff --git a/unsupported/test/mpreal/mpreal.h b/unsupported/test/mpreal/mpreal.h
index c4f6cf0cb..9b0cf7268 100644
--- a/unsupported/test/mpreal/mpreal.h
+++ b/unsupported/test/mpreal/mpreal.h
@@ -72,14 +72,12 @@
 #define MPREAL_VERSION_STRING "3.6.2"

 

 // Detect compiler using signatures from http://predef.sourceforge.net/

-#if defined(__GNUC__) && defined(__INTEL_COMPILER)

-    #define IsInf(x) isinf(x)                   // Intel ICC compiler on Linux

-

+#if defined(__GNUC__)

+    #define IsInf(x) (isinf)(x)                 // GNU C++/Intel ICC compiler on Linux

 #elif defined(_MSC_VER)                         // Microsoft Visual C++

     #define IsInf(x) (!_finite(x))

-

 #else

-    #define IsInf(x) std::isinf EIGEN_NOT_A_MACRO (x)              // GNU C/C++ (and/or other compilers), just hope for C99 conformance

+    #define IsInf(x) (std::isinf)(x)              // GNU C/C++ (and/or other compilers), just hope for C99 conformance

 #endif

 

 // A Clang feature extension to determine compiler features.

@@ -3103,4 +3101,4 @@ namespace std
 

 }

 

-#endif /* __MPREAL_H__ */
\ No newline at end of file
+#endif /* __MPREAL_H__ */