[COMP] Remove old nullptr detection

Possible fix for issue coolfluid#271
barche · Jan 11, 2018 · ed8bcaa · ed8bcaa
1 parent f1bdfb6
commit ed8bcaa
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 110 deletions.
diff --git a/cf3/common/CF.hpp b/cf3/common/CF.hpp
@@ -62,25 +62,9 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
-// define the nullptr either as macro or as nullptr idiom until C++0x
-#ifdef CF3_CXX_MANUAL_NATIVE_NULLPTR
-  using std::nullptr_t;
-#else
-#ifdef CF3_CXX_SUPPORTS_NULLPTR
-const class nullptr_t
-{
-public:
-  template<class T> operator T*() const { return 0; }
-  template<class C, class T> operator T C::*() const { return 0; }
-private:
-  void operator&() const;
-} nullptr = {};
-#elif defined CF3_CXX_NATIVE_NULLPTR
-  using std::nullptr_t;
-#else
-  #define nullptr 0
-#endif
-#endif
+
+using std::nullptr_t;
+
 
 ////////////////////////////////////////////////////////////////////////////////
 

diff --git a/cmake/CheckCompilerFeatures.cmake b/cmake/CheckCompilerFeatures.cmake
@@ -57,10 +57,6 @@
   # coolfluid_log( "+++++  Checking for pre compiled header support" )
   # include(CheckPreCompiledHeaderSupport)
 
-#######################################################################################
-
-include(CheckNullPtr)
-
 #######################################################################################
 
   check_cxx_source_compiles(

diff --git a/cmake/CheckNullPtr.cmake b/cmake/CheckNullPtr.cmake
diff --git a/cmake/DefineBuildRules.cmake b/cmake/DefineBuildRules.cmake
@@ -2,7 +2,7 @@ set( CF3_LIBRARY_LINK_FLAGS "" CACHE STRING "Extra link flags for libraries" FOR
 mark_as_advanced( CF3_LIBRARY_LINK_FLAGS )
 
 # Switch on C++11
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -DCF3_CXX_MANUAL_NATIVE_NULLPTR")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
 ########################################################################################
 # GCC Compiler

diff --git a/config/coolfluid-config.hpp.in b/config/coolfluid-config.hpp.in
@@ -53,8 +53,6 @@
 #endif
 
 // compiler features
-#cmakedefine CF3_CXX_SUPPORTS_NULLPTR  // nullptr as type
-#cmakedefine CF3_CXX_NATIVE_NULLPTR  // nullptr as type, defined in cstddef
 #define CXX_NEEDS_FRIEND_TMPL_DECL           // cxx friend templates
 #define cf_restrict ${CF3_RESTRICT_KEYWORD}   // define our restrict keyword