configuration files adopted to cmake configuration and automatic c++11 detection

7dd92158 · Praetorius, Simon · bda1948a · 7dd92158 · 7dd92158 · 7dd92158
Commit 7dd92158 authored Oct 15, 2016 by Praetorius, Simon
Showing with 3 additions and 17 deletions

AMDiS/src/config/Config_clang.h AMDiS/src/config/Config_clang.h +1 -4

AMDiS/src/config/Config_gcc.h AMDiS/src/config/Config_gcc.h +1 -4

AMDiS/src/config/Config_intel.h AMDiS/src/config/Config_intel.h +1 -9

No files found.
--- a/AMDiS/src/config/Config_clang.h
+++ b/AMDiS/src/config/Config_clang.h
@@ -47,10 +47,7 @@ typedef size_t aligned_size_t   __attribute__ ((aligned(CACHE_LINE)));

 // C++11 features
 // --------------
-#if __cplusplus > 199711L
-#ifndef HAS_CXX11
-  #define HAS_CXX11 1
-#endif
+#ifdef HAS_CXX11

 // __has_feature(cxx_rvalue_references)
 #if CLANG_VERSION >= 20900 && !defined(HAS_VARIADIC_TEMPLATES)

--- a/AMDiS/src/config/Config_gcc.h
+++ b/AMDiS/src/config/Config_gcc.h
@@ -47,10 +47,7 @@ typedef size_t aligned_size_t   __attribute__ ((aligned(CACHE_LINE)));

 // C++11 features
 // --------------
-#if __cplusplus > 199711L
-#ifndef HAS_CXX11
-  #define HAS_CXX11 1
-#endif
+#ifdef HAS_CXX11

 #if GCC_VERSION >= 40300 && !defined(HAS_VARIADIC_TEMPLATES)
  #define HAS_VARIADIC_TEMPLATES 1

--- a/AMDiS/src/config/Config_intel.h
+++ b/AMDiS/src/config/Config_intel.h
@@ -51,15 +51,7 @@ typedef __declspec(align(CACHE_LINE)) size_t aligned_size_t;

 // C++11 features
 // --------------
-// #if __cplusplus > 199711L
-// workaround needed to test for -std=c++11 enabled, since __cplusplus gives wrong values
-#include <vector>
-#include <functional>
-#if defined(_GLIBCXX_TUPLE) || defined(_GLIBCXX_TYPE_TRAITS) || defined(_GLIBCXX_ARRAY) || (__cplusplus > 199711L)
-
-#ifndef HAS_CXX11
-  #define HAS_CXX11 1
-#endif
+#ifdef HAS_CXX11

 #if INTEL_VERSION >= 1201 && !defined(HAS_VARIADIC_TEMPLATES)
  #define HAS_VARIADIC_TEMPLATES 1