replace nullptr by NULL

cshorler · cshorler · commit 97de8f90699b · 2021-08-14T10:24:35.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -113,9 +113,6 @@ if(MSVC)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS)
 else()
   add_definitions(-pedantic -W -Wall -Wundef -Wfloat-equal -Wshadow -Winline -Wno-long-long)
-  if(HAVE_NULLPTR)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-  endif(HAVE_NULLPTR)
 endif()
 
 include_directories(
diff --git a/include/sc_cf_cmake.h.in b/include/sc_cf_cmake.h.in
@@ -26,6 +26,5 @@
 
 #cmakedefine HAVE_STD_THREAD 1
 #cmakedefine HAVE_STD_CHRONO 1
-#cmakedefine HAVE_NULLPTR 1
 
 #endif /* SCL_CF_H */
diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt
@@ -15,7 +15,6 @@ set(SC_BASE_HDRS
   sc_getopt.h
   sc_trace_fprintf.h
   sc_mkdir.h
-  sc_nullptr.h
   path2str.h
   judy/src/judy.h
   judy/src/judyLArray.h
diff --git a/src/base/sc_nullptr.h b/src/base/sc_nullptr.h
diff --git a/src/clstepcore/mgrnode.h b/src/clstepcore/mgrnode.h
@@ -25,15 +25,13 @@ class DisplayNode;
 
 #include <editordefines.h>
 
-#include <sc_nullptr.h>
-
 class InstMgr;
 
 class SC_CORE_EXPORT MgrNodeBase : public GenericNode {
     public:
         virtual inline SDAI_Application_instance * GetSTEPentity() {
             abort();
-            return nullptr;
+            return NULL;
         };
     virtual ~MgrNodeBase() {};
 };
diff --git a/src/clstepcore/sdaiApplication_instance.cc b/src/clstepcore/sdaiApplication_instance.cc
@@ -20,8 +20,6 @@
 #include "sdaiApplication_instance.h"
 #include "superInvAttrIter.h"
 
-#include <sc_nullptr.h>
-
 SDAI_Application_instance NilSTEPentity;
 
 bool isNilSTEPentity( const SDAI_Application_instance * ai ) {
@@ -956,7 +954,7 @@ const SDAI_Application_instance::iAMap_t::value_type SDAI_Application_instance::
     }
     iAstruct z;
     memset( &z, 0, sizeof z );
-    iAMap_t::value_type nil( (Inverse_attribute *) nullptr, z );
+    iAMap_t::value_type nil( ( Inverse_attribute * ) NULL, z );
     return nil;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@`
`20`	`20`	`#include "sdaiApplication_instance.h"`
`21`	`21`	`#include "superInvAttrIter.h"`
`22`	`22`
`23`		`-#include <sc_nullptr.h>`
`24`		`-`
`25`	`23`	`SDAI_Application_instance NilSTEPentity;`
`26`	`24`
`27`	`25`	`bool isNilSTEPentity( const SDAI_Application_instance * ai ) {`
`@@ -956,7 +954,7 @@ const SDAI_Application_instance::iAMap_t::value_type SDAI_Application_instance::`
`956`	`954`	`}`
`957`	`955`	`iAstruct z;`
`958`	`956`	`memset( &z, 0, sizeof z );`
`959`		`- iAMap_t::value_type nil( (Inverse_attribute *) nullptr, z );`
	`957`	`+ iAMap_t::value_type nil( ( Inverse_attribute * ) NULL, z );`
`960`	`958`	`return nil;`
`961`	`959`	`}`
`962`	`960`