Reduced compiler.h to about a page of mostly defines and includes

Author: eddelbuettel

inst/include/Rcpp/platform/compiler.h

@@ -22,132 +22,39 @@
 
 // NB: A vast list valid identifiers is at these wiki pages:
 //     http://sourceforge.net/p/predef/wiki/Home/
-
-#undef GOOD_COMPILER_FOR_RCPP
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__SUNPRO_CC) || defined(__clang__) || defined(__INTEL_COMPILER)
 #define GOOD_COMPILER_FOR_RCPP
-#endif
-#ifdef __SUNPRO_CC
-#define GOOD_COMPILER_FOR_RCPP
-#endif
-#ifdef __clang__
-#define GOOD_COMPILER_FOR_RCPP
-#endif
-#ifdef __INTEL_COMPILER
-#define GOOD_COMPILER_FOR_RCPP
-#endif
-
-#ifndef GOOD_COMPILER_FOR_RCPP
-# error "This compiler is not supported"
+#else
+#error "This compiler is not supported"
 #endif
 
+// New simpler test and minimal standard: C++11 or else we die
 #if __cplusplus < 201103L
-# error "The C++ compilation standard is too old: use C++11 or newer."
+#error "The C++ compilation standard is too old: use C++11 or newer."
 #endif
 
 #ifdef __GNUC__
     #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
 #endif
 
-// TODO: Clean in a subsequent round
-#define RCPP_USING_CXX0X_OR_LATER
-
-// Check C++11 features (could/should work generally)
-#if defined(__INTEL_COMPILER)
-    #define RCPP_USING_CXX11
-    #if __INTEL_COMPILER >= 1210
-        #define HAS_VARIADIC_TEMPLATES
-    #endif
-    #if __INTEL_COMPILER >= 1100
-        #define HAS_STATIC_ASSERT
-    #endif
-#elif defined(__clang__)
-    #define RCPP_USING_CXX11
-    #if __has_feature(cxx_variadic_templates)
-        #define HAS_VARIADIC_TEMPLATES
-    #endif
-    #if __has_feature(cxx_static_assert)
-        #define HAS_STATIC_ASSERT
-    #endif
-#elif defined(__GNUC__)
-    // given the check about __cplusplus we can unconditionally define
-    #define RCPP_USING_CXX11
-    #define HAS_VARIADIC_TEMPLATES
-    #define HAS_STATIC_ASSERT
-#endif
-
 // C++11 features -- that used to be carefully tested for or worked around via CXX0X / TR1
+#define RCPP_USING_CXX11
+#define HAS_VARIADIC_TEMPLATES
+#define HAS_STATIC_ASSERT
 #include <cmath>
 #define HAS_CXX0X_UNORDERED_MAP
 #define HAS_CXX0X_UNORDERED_SET
 #define HAS_CXX0X_INITIALIZER_LIST
-
-// // Check TR1 Headers (TODO remove when no longer needed below)
-// #if defined(__INTEL_COMPILER) || (defined(__GNUC__) && !defined(__clang__))
-//     #define HAS_TR1_UNORDERED_MAP
-//     #define HAS_TR1_UNORDERED_SET
-// #elif defined(__clang__)
-//     #if __has_include(<tr1/unordered_map>)
-//         #define HAS_TR1_UNORDERED_MAP
-//     #endif
-//     #if __has_include(<tr1/unordered_set>)
-//         #define HAS_TR1_UNORDERED_SET
-//     #endif
-// #endif
-
-// #if defined(HAS_TR1_UNORDERED_MAP) && defined(HAS_TR1_UNORDERED_SET)
-// #define HAS_TR1
-// #endif
-
-// Conditionally include headers
-// #ifdef HAS_CXX0X_INITIALIZER_LIST
 #include <initializer_list>
-// #endif
-
-// // TODO: Simplify further: First case should work generally
-// #ifdef RCPP_USING_CXX11
-//     #if defined(HAS_CXX0X_UNORDERED_MAP)
-        #include <unordered_map>
-        #define RCPP_USING_UNORDERED_MAP
-        #define RCPP_UNORDERED_MAP std::unordered_map
-    // #else
-    //     #include <map>
-    //     #define RCPP_USING_MAP
-    //     #define RCPP_UNORDERED_MAP std::map
-    // #endif
-    // #if defined(HAS_CXX0X_UNORDERED_SET)
-        #include <unordered_set>
-        #define RCPP_USING_UNORDERED_SET
-        #define RCPP_UNORDERED_SET std::unordered_set
-    // #else
-    //     #include <set>
-    //     #define RCPP_USING_SET
-    //     #define RCPP_UNORDERED_SET std::set
-    // #endif
-// #else
-//     #if defined(HAS_TR1_UNORDERED_MAP)
-//         #include <tr1/unordered_map>
-//         #define RCPP_USING_TR1_UNORDERED_MAP
-//         #define RCPP_UNORDERED_MAP std::tr1::unordered_map
-//     // #else
-//     //     #include <map>
-//     //     #define RCPP_USING_MAP
-//     //     #define RCPP_UNORDERED_MAP std::map
-//     #endif
-//     #if defined(HAS_TR1_UNORDERED_SET)
-//         #include <tr1/unordered_set>
-//         #define RCPP_USING_TR1_UNORDERED_SET
-//         #define RCPP_UNORDERED_SET std::tr1::unordered_set
-//     // #else
-//     //     #include <set>
-//     //     #define RCPP_USING_SET
-//     //     #define RCPP_UNORDERED_SET std::set
-//     #endif
-// #endif
+#include <unordered_map>
+#define RCPP_USING_UNORDERED_MAP
+#define RCPP_UNORDERED_MAP std::unordered_map
+#include <unordered_set>
+#define RCPP_USING_UNORDERED_SET
+#define RCPP_UNORDERED_SET std::unordered_set
 
 #ifdef __GNUC__
   #define RCPP_HAS_DEMANGLING
 #endif
 
-
 #endif