Added scl_memmgr to cldai library.

src/cldai/CMakeLists.txt

@@ -30,16 +30,18 @@ SET(LIBSTEPDAI_PRIVATE_HDRS
 
 IF(MSVC OR BORLAND)
 add_definitions( -DSCL_DAI_DLL_EXPORTS )
+add_definitions( -DSCL_BASE_DLL_IMPORTS )
 add_definitions( -DSCL_UTILS_DLL_IMPORTS )
 ENDIF()
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${SCL_SOURCE_DIR}/src/base
     ${SCL_SOURCE_DIR}/src/clstepcore
     ${SCL_SOURCE_DIR}/src/clutils
 )
 
-SCL_ADDLIB(stepdai "${LIBSTEPDAI_SRCS}" "steputils")
+SCL_ADDLIB(stepdai "${LIBSTEPDAI_SRCS}" "steputils base")
 
 if(APPLE)
     if(SCL_BUILD_SHARED_LIBS)

src/cldai/sdaiApplication_instance_set.cc

@@ -29,6 +29,7 @@
 
 #include <memory.h>
 #include <math.h>
+#include "scl_memmgr.h"
 
 // to help ObjectCenter
 #ifndef HAVE_MEMMOVE

src/cldai/sdaiBinary.cc

@@ -11,6 +11,7 @@
 
 #include <sstream>
 #include <sdai.h>
+#include "scl_memmgr.h"
 
 SDAI_Binary::SDAI_Binary( const char * str, int max ) {
     content = std::string( str, max );

src/cldai/sdaiDaObject.cc

@@ -3,6 +3,7 @@
 #include <math.h>
 
 #include <sdai.h>
+#include "scl_memmgr.h"
 
 // to help ObjectCenter
 #ifndef HAVE_MEMMOVE

src/cldai/sdaiEntity_extent.cc

@@ -3,6 +3,7 @@
 //#include <EntityExtent.h>
 
 #include <sdai.h>
+#include "scl_memmgr.h"
 
 SDAI_Entity_extent::SDAI_Entity_extent( )
     : _definition( 0 ), _definition_name( 0 ), _owned_by( 0 ) {

src/cldai/sdaiEntity_extent_set.cc

@@ -27,6 +27,7 @@
 #include <math.h>
 
 #include <sdai.h>
+#include "scl_memmgr.h"
 
 /*
 #include <EntityExtent.h>

src/cldai/sdaiEnum.cc

@@ -1,5 +1,6 @@
 
 #include <sdai.h>
+#include "scl_memmgr.h"
 
 /*
 * NIST STEP Core Class Library

src/cldai/sdaiModel_contents.cc

@@ -1,5 +1,6 @@
 
 #include <sdai.h>
+#include "scl_memmgr.h"
 
 /////////    SDAI_Model_contents_instances
 

src/cldai/sdaiModel_contents_list.cc

@@ -24,6 +24,7 @@
  * UArray implementation.
  */
 #include <sdai.h>
+#include "scl_memmgr.h"
 
 // to help ObjectCenter
 #ifndef HAVE_MEMMOVE

src/cldai/sdaiObject.cc

@@ -1,4 +1,5 @@
 #include <sdai.h>
+#include "scl_memmgr.h"
 
 SDAI_sdaiObject::SDAI_sdaiObject() {
 }

src/cldai/sdaiSession_instance.cc

@@ -1,4 +1,5 @@
 #include <sdai.h>
+#include "scl_memmgr.h"
 
 SDAI_Session_instance::SDAI_Session_instance() {
 }

src/cldai/sdaiString.cc

@@ -11,6 +11,7 @@
 
 #include <sdai.h>
 #include <sstream>
+#include "scl_memmgr.h"
 
 SDAI_String::SDAI_String( const char * str, int max ) {
     content = std::string( str, max );