Added scl_memmgr to clstepcore library.

davyw · davyw · commit 245ff1458b9e · 2012-03-20T21:08:45.000+01:00
diff --git a/src/clstepcore/CMakeLists.txt b/src/clstepcore/CMakeLists.txt
@@ -49,6 +49,7 @@ endif()
 
 if(MSVC OR BORLAND)
 	add_definitions( -DSCL_CORE_DLL_EXPORTS )
+	add_definitions( -DSCL_BASE_DLL_IMPORTS )
 	add_definitions( -DSCL_EXPRESS_DLL_IMPORTS )
 	add_definitions( -DSCL_UTILS_DLL_IMPORTS )
 	add_definitions( -DSCL_DAI_DLL_IMPORTS )
@@ -78,12 +79,13 @@ SET(LIBSTEPCORE_PRIVATE_HDRS
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${SCL_SOURCE_DIR}/src/base
     ${SCL_SOURCE_DIR}/src/cldai
     ${SCL_SOURCE_DIR}/src/cleditor
     ${SCL_SOURCE_DIR}/src/clutils
 )
 
-SCL_ADDLIB(stepcore "${LIBSTEPCORE_SRCS} ${LIBDEPEND_SRCS}" "express steputils stepdai")
+SCL_ADDLIB(stepcore "${LIBSTEPCORE_SRCS} ${LIBDEPEND_SRCS}" "express steputils stepdai base")
 if(APPLE)
     if(SCL_BUILD_SHARED_LIBS)
         set_target_properties(stepcore PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
diff --git a/src/clstepcore/ExpDict.cc b/src/clstepcore/ExpDict.cc
@@ -18,6 +18,7 @@
 
 #include <ExpDict.h>
 #include <STEPaggregate.h>
+#include "scl_memmgr.h"
 
 
 Explicit_item_id__set::Explicit_item_id__set( int defaultSize ) {
diff --git a/src/clstepcore/ExpDict.inline.cc b/src/clstepcore/ExpDict.inline.cc
@@ -11,6 +11,7 @@
 */
 
 #include <ExpDict.h>
+#include "scl_memmgr.h"
 
 Dictionary_instance::~Dictionary_instance() {
 }
diff --git a/src/clstepcore/Registry.inline.cc b/src/clstepcore/Registry.inline.cc
@@ -11,6 +11,7 @@
 
 #include <ExpDict.h>
 #include <Registry.h>
+#include "scl_memmgr.h"
 
 const TypeDescriptor  * t_sdaiINTEGER;
 const TypeDescriptor  * t_sdaiREAL;
diff --git a/src/clstepcore/STEPaggregate.cc b/src/clstepcore/STEPaggregate.cc
@@ -17,6 +17,7 @@
 #include <STEPattribute.h>
 #include <instmgr.h>
 #include <ExpDict.h>
+#include "scl_memmgr.h"
 
 const int Real_Num_Precision = REAL_NUM_PRECISION; // from STEPattribute.h
 
diff --git a/src/clstepcore/STEPattribute.cc b/src/clstepcore/STEPattribute.cc
@@ -16,7 +16,7 @@
 #include <STEPaggregate.h>
 #include <ExpDict.h>
 #include <sdai.h>
-
+#include "scl_memmgr.h"
 
 // REAL_NUM_PRECISION is defined in STEPattribute.h, and is also used
 // in aggregate real handling (STEPaggregate.cc)  -- IMS 6 Jun 95
diff --git a/src/clstepcore/STEPattribute.inline.cc b/src/clstepcore/STEPattribute.inline.cc
@@ -14,6 +14,7 @@
 #include <STEPattribute.h>
 #include <sdai.h>
 #include <ExpDict.h>
+#include "scl_memmgr.h"
 
 ///  This is needed so that STEPattribute's can be passed as references to inline functions
 STEPattribute::STEPattribute( const STEPattribute & a )
diff --git a/src/clstepcore/STEPattributeList.cc b/src/clstepcore/STEPattributeList.cc
@@ -12,6 +12,7 @@
 
 #include <STEPattributeList.h>
 #include <STEPattribute.h>
+#include "scl_memmgr.h"
 
 AttrListNode::AttrListNode( STEPattribute * a ) {
     attr = a;
diff --git a/src/clstepcore/STEPcomplex.cc b/src/clstepcore/STEPcomplex.cc
@@ -5,6 +5,7 @@
 #include <complexSupport.h>
 #include <STEPattribute.h>
 #include <sstream>
+#include "scl_memmgr.h"
 
 extern const char * ReadStdKeyword( istream & in, std::string & buf, int skipInitWS );
 
diff --git a/src/clstepcore/STEPundefined.cc b/src/clstepcore/STEPundefined.cc
@@ -13,7 +13,7 @@
 #include <stdio.h> // to get the BUFSIZ #define
 #include <STEPundefined.h>
 #include <STEPattribute.h>
-
+#include "scl_memmgr.h"
 
 /** \class SCLundefined
 **    helper functions for reading unknown types
diff --git a/src/clstepcore/SingleLinkList.cc b/src/clstepcore/SingleLinkList.cc
@@ -11,6 +11,7 @@
 */
 
 #include <SingleLinkList.h>
+#include "scl_memmgr.h"
 
 void SingleLinkList::DeleteFollowingNodes( SingleLinkNode * item ) {
     if( head ) {
diff --git a/src/clstepcore/SingleLinkList.inline.cc b/src/clstepcore/SingleLinkList.inline.cc
@@ -12,6 +12,7 @@
 
 #include <SingleLinkList.h>
 #include <iostream>
+#include "scl_memmgr.h"
 
 SingleLinkNode *
 SingleLinkNode::NextNode()  const {
diff --git a/src/clstepcore/collect.cc b/src/clstepcore/collect.cc
@@ -12,6 +12,7 @@
  *****************************************************************************/
 
 #include "complexSupport.h"
+#include "scl_memmgr.h"
 
 /**
  * Inserts a new ComplexList to our list.  The ComplexLists are ordered by
diff --git a/src/clstepcore/complexlist.cc b/src/clstepcore/complexlist.cc
@@ -11,6 +11,7 @@
  *****************************************************************************/
 
 #include "complexSupport.h"
+#include "scl_memmgr.h"
 
 /**
  * Destructor for ComplexList.
diff --git a/src/clstepcore/entlist.cc b/src/clstepcore/entlist.cc
@@ -14,6 +14,7 @@
  *****************************************************************************/
 
 #include "complexSupport.h"
+#include "scl_memmgr.h"
 
 /**
  * Returns the number of EntLists in this's list (EntList->next, next->next
diff --git a/src/clstepcore/entnode.cc b/src/clstepcore/entnode.cc
@@ -12,6 +12,7 @@
  *****************************************************************************/
 
 #include "complexSupport.h"
+#include "scl_memmgr.h"
 
 /**
  * Given a list of entity names, creates a sorted linked list of EntNodes
diff --git a/src/clstepcore/match-ors.cc b/src/clstepcore/match-ors.cc
@@ -14,6 +14,7 @@
  *****************************************************************************/
 
 #include "complexSupport.h"
+#include "scl_memmgr.h"
 
 /**
  * Loops through descendants of this, invoking their matchOR functions.
diff --git a/src/clstepcore/multlist.cc b/src/clstepcore/multlist.cc
@@ -13,6 +13,7 @@
  *****************************************************************************/
 
 #include "complexSupport.h"
+#include "scl_memmgr.h"
 
 /**
  * Deletes the childList of this, before this is deleted.
diff --git a/src/clstepcore/non-ors.cc b/src/clstepcore/non-ors.cc
@@ -11,6 +11,7 @@
  *****************************************************************************/
 
 #include "complexSupport.h"
+#include "scl_memmgr.h"
 
 /**
  * Checks if we match the nodes of ents.  If only one unmarked is left
diff --git a/src/clstepcore/orlist.cc b/src/clstepcore/orlist.cc
@@ -11,6 +11,7 @@
  *****************************************************************************/
 
 #include "complexSupport.h"
+#include "scl_memmgr.h"
 
 /**
  * Check if we matched nm.  We have two possibilities here:  If we have a
diff --git a/src/clstepcore/print.cc b/src/clstepcore/print.cc
@@ -8,6 +8,7 @@
  *****************************************************************************/
 
 #include "complexSupport.h"
+#include "scl_memmgr.h"
 
 // Local function prototypes:
 static char * joinText( JoinType, char * );
diff --git a/src/clstepcore/read_func.cc b/src/clstepcore/read_func.cc
@@ -4,6 +4,7 @@
 #include <sdai.h>
 #include <read_func.h>
 #include <STEPattribute.h>
+#include "scl_memmgr.h"
 
 const int RealNumPrecision = REAL_NUM_PRECISION;
 
diff --git a/src/clstepcore/sdai.cc b/src/clstepcore/sdai.cc
@@ -2,6 +2,7 @@
 #include <cfloat>
 
 #include <sdai.h>
+#include "scl_memmgr.h"
 
 const char * SCLversion = "STEP Class Library, github.com/mpictor/StepClassLibrary";
 
diff --git a/src/clstepcore/trynext.cc b/src/clstepcore/trynext.cc
@@ -12,6 +12,7 @@
  *****************************************************************************/
 
 #include "complexSupport.h"
+#include "scl_memmgr.h"
 
 // Local function prototypes:
 static EntList * firstCandidate( EntList * );

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`*/`
`12`	`12`
`13`	`13`	`#include <ExpDict.h>`
	`14`	`+#include "scl_memmgr.h"`
`14`	`15`
`15`	`16`	`Dictionary_instance::~Dictionary_instance() {`
`16`	`17`	`}`