use scl_memmgr in clutils; SCL git 010e02b

Nicholas Reed · Nicholas Reed · commit b8ae516287b0 · 2012-06-14T20:48:23.000Z
diff --git a/src/clutils/CMakeLists.txt b/src/clutils/CMakeLists.txt
@@ -20,6 +20,7 @@ SET(LIBSTEPUTILS_PRIVATE_HDRS
 )
 
 include_directories(
+    ${SCL_SOURCE_DIR}/src/base
     ${SCL_BINARY_DIR}/include
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
@@ -29,4 +30,4 @@ add_definitions( -DSCL_BASE_DLL_IMPORTS )
 add_definitions( -DSCL_UTILS_DLL_EXPORTS )
 endif()
 
-SCL_ADDLIB(steputils "${LIBSTEPUTILS_SRCS}" "")
+SCL_ADDLIB(steputils "${LIBSTEPUTILS_SRCS}" "base")
diff --git a/src/clutils/dirobj.cc b/src/clutils/dirobj.cc
@@ -53,6 +53,8 @@
 #include <string>
 #include <iostream>
 
+#include <scl_memmgr.h>
+
 ///////////////////////////////////////////////////////////////////////////////
 //
 // Create a new DirObj object.
@@ -76,6 +78,7 @@ DirObj::DirObj( const char * dirName ) {
 
 DirObj::~DirObj() {
     ClearFileList();
+    delete [] fileList;
 }
 
 //////////////////////////////// RealPath() ///////////////////////////////////
diff --git a/src/clutils/errordesc.cc b/src/clutils/errordesc.cc
@@ -12,6 +12,7 @@
 
 #include <errordesc.h>
 #include <Str.h>
+#include <scl_memmgr.h>
 
 DebugLevel ErrorDescriptor::_debug_level = DEBUG_OFF;
 ostream  * ErrorDescriptor::_out = 0;
diff --git a/src/clutils/gennode.cc b/src/clutils/gennode.cc
@@ -14,6 +14,7 @@
 
 #include <gennode.h>
 #include <gennodelist.h>
+#include <scl_memmgr.h>
 
 //////////////////////////////////////////////////////////////////////////////
 // class GenericNode inline functions that depend on other classes
diff --git a/src/clutils/gennodearray.cc b/src/clutils/gennodearray.cc
@@ -17,6 +17,7 @@
 #include <gennode.h>
 #include <gennodelist.h>
 #include <gennodearray.h>
+#include <scl_memmgr.h>
 
 #ifndef HAVE_MEMMOVE
 extern "C" {
diff --git a/src/clutils/gennodelist.cc b/src/clutils/gennodelist.cc
@@ -16,6 +16,7 @@
 #include <gennodelist.h>
 //#include <gennode.inline.h>
 #include <gennodearray.h>
+#include <scl_memmgr.h>
 
 // inserts after existNode
 void GenNodeList::InsertAfter( GenericNode * newNode,
diff --git a/src/clutils/scl_hash.cc b/src/clutils/scl_hash.cc
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <scl_memmgr.h>
 
 /*************/
 /* constants */

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ SET(LIBSTEPUTILS_PRIVATE_HDRS`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`include_directories(`
	`23`	`+ ${SCL_SOURCE_DIR}/src/base`
`23`	`24`	`${SCL_BINARY_DIR}/include`
`24`	`25`	`${CMAKE_CURRENT_SOURCE_DIR}`
`25`	`26`	`)`
`@@ -29,4 +30,4 @@ add_definitions( -DSCL_BASE_DLL_IMPORTS )`
`29`	`30`	`add_definitions( -DSCL_UTILS_DLL_EXPORTS )`
`30`	`31`	`endif()`
`31`	`32`
`32`		`-SCL_ADDLIB(steputils "${LIBSTEPUTILS_SRCS}" "")`
	`33`	`+SCL_ADDLIB(steputils "${LIBSTEPUTILS_SRCS}" "base")`