Added scl_memmgr to cleditor library.

davyw · davyw · commit 3be42207eef9 · 2012-03-20T21:12:45.000+01:00
diff --git a/src/cleditor/CMakeLists.txt b/src/cleditor/CMakeLists.txt
@@ -35,19 +35,21 @@ SET(LIBSTEPEDITOR_PRIVATE_HDRS
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${SCL_SOURCE_DIR}/src/base
     ${SCL_SOURCE_DIR}/src/cldai
     ${SCL_SOURCE_DIR}/src/clstepcore
     ${SCL_SOURCE_DIR}/src/clutils
 )
 
 if(MSVC OR BORLAND)
 add_definitions( -DSCL_EDITOR_DLL_EXPORTS )
+add_definitions( -DSCL_BASE_DLL_IMPORTS )
 add_definitions( -DSCL_CORE_DLL_IMPORTS )
 add_definitions( -DSCL_DAI_DLL_IMPORTS )
 add_definitions( -DSCL_UTILS_DLL_IMPORTS )
 endif()
 
-SCL_ADDLIB(stepeditor "${LIBSTEPEDITOR_SRCS}" stepcore stepdai steputils)
+SCL_ADDLIB(stepeditor "${LIBSTEPEDITOR_SRCS}" "stepcore stepdai steputils base")
 
 if(APPLE)
     if(SCL_BUILD_SHARED_LIBS)
diff --git a/src/cleditor/STEPfile.cc b/src/cleditor/STEPfile.cc
@@ -35,6 +35,8 @@
 // void PushPastString (istream& in, std::string &s, ErrorDescriptor *err)
 #include <STEPundefined.h>
 
+#include "scl_memmgr.h"
+
 /***************************
 function:     SetFileName
 returns:      (const std::string) The new file name for the class.
diff --git a/src/cleditor/STEPfile.inline.cc b/src/cleditor/STEPfile.inline.cc
@@ -17,6 +17,7 @@
 #include <cmath>
 
 #include <cstring>
+#include "scl_memmgr.h"
 
 extern void HeaderSchemaInit( Registry & reg );
 
diff --git a/src/cleditor/SdaiHeaderSchema.cc b/src/cleditor/SdaiHeaderSchema.cc
@@ -13,6 +13,7 @@ extern ofstream * logStream;
 #include <ExpDict.h>
 #include <STEPattribute.h>
 #include <SdaiHeaderSchema.h>
+#include "scl_memmgr.h"
 
 Schema * s_header_section_schema = 0;
 
diff --git a/src/cleditor/SdaiHeaderSchemaAll.cc b/src/cleditor/SdaiHeaderSchemaAll.cc
@@ -5,6 +5,7 @@
 // regenerate it.
 
 #include <SdaiHeaderSchema.h>
+#include "scl_memmgr.h"
 
 void HeaderInitSchemasAndEnts( Registry & reg ) {
     Uniqueness_rule_ptr ur;
diff --git a/src/cleditor/SdaiHeaderSchemaInit.cc b/src/cleditor/SdaiHeaderSchemaInit.cc
@@ -8,6 +8,7 @@
 #include <ExpDict.h>
 #include <STEPattribute.h>
 #include <SdaiHeaderSchema.h>
+#include "scl_memmgr.h"
 
 void SdaiHEADER_SECTION_SCHEMAInit( Registry & reg ) {
     header_section_schemat_time_stamp_text->ReferentType( t_sdaiSTRING );
diff --git a/src/cleditor/SdaiSchemaInit.cc b/src/cleditor/SdaiSchemaInit.cc
@@ -5,6 +5,7 @@
 // regenerate it.
 
 #include <SdaiSchemaInit.h>
+#include "scl_memmgr.h"
 
 void HeaderSchemaInit( Registry & reg ) {
     HeaderInitSchemasAndEnts( reg );
diff --git a/src/cleditor/cmdmgr.cc b/src/cleditor/cmdmgr.cc
@@ -11,7 +11,7 @@
 */
 
 #include <cmdmgr.h>
-
+#include "scl_memmgr.h"
 
 ReplicateLinkNode * ReplicateList::FindNode( MgrNode * mn ) {
     ReplicateLinkNode * rln = ( ReplicateLinkNode * )GetHead();
diff --git a/src/cleditor/dispnode.cc b/src/cleditor/dispnode.cc
@@ -18,6 +18,7 @@
 
 #include <dispnode.h>
 #include <dispnodelist.h>
+#include "scl_memmgr.h"
 
 // define this to be the name of the display object
 class StepEntityEditor;
diff --git a/src/cleditor/dispnodelist.cc b/src/cleditor/dispnodelist.cc
@@ -19,7 +19,7 @@
 #include <mgrnodelist.h>
 #include <dispnode.h>
 #include <dispnodelist.h>
-
+#include "scl_memmgr.h"
 
 void DisplayNodeList::Remove( GenericNode * node ) {
     GenNodeList::Remove( node );
diff --git a/src/cleditor/instmgr.cc b/src/cleditor/instmgr.cc
@@ -18,6 +18,7 @@
 
 #include <sdai.h>
 #include <instmgr.h>
+#include "scl_memmgr.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 //  debug_level >= 2 => tells when a command is chosen
diff --git a/src/cleditor/mgrnode.cc b/src/cleditor/mgrnode.cc
@@ -22,6 +22,7 @@
 #include <sdai.h>
 
 #include <iostream>
+#include "scl_memmgr.h"
 
 void * MgrNode::SEE() {
     return ( di ? di->SEE() : 0 );
diff --git a/src/cleditor/mgrnodearray.cc b/src/cleditor/mgrnodearray.cc
@@ -37,7 +37,7 @@ static int PrintFunctionTrace = 2;
 #include <sdai.h>
 
 #include <string.h> // to get bcopy() - ANSI
-
+#include "scl_memmgr.h"
 
 //////////////////////////////////////////////////////////////////////////////
 // class MgrNodeArray member functions
diff --git a/src/cleditor/mgrnodelist.cc b/src/cleditor/mgrnodelist.cc
@@ -16,7 +16,7 @@
 #include <mgrnodelist.h>
 #include <dispnode.h>
 #include <dispnodelist.h>
-
+#include "scl_memmgr.h"
 
 MgrNodeList::MgrNodeList( stateEnum type ) : GenNodeList( new MgrNode() ) {
 //    if(debug_level >= PrintFunctionTrace)
diff --git a/src/cleditor/needFunc.cc b/src/cleditor/needFunc.cc
@@ -1,4 +1,5 @@
 #include <needFunc.h>
+#include "scl_memmgr.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // Function defined as a stub (necessary to use the scl)
