Renamed libutil namespace -> util

Removed debugging options
mbcrawfo · Nov 11, 2014 · 2c62ed6 · 2c62ed6
1 parent 2d1d38f
commit 2c62ed6
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 77 deletions.
diff --git a/include/debug.h b/include/debug.h
diff --git a/include/log/ILogFormatter.h b/include/log/ILogFormatter.h
@@ -27,7 +27,7 @@
 #include "prereqs.h"
 #include "log/LogMessage.h"
 
-namespace libutil
+namespace util
 {
 
 /**

diff --git a/include/log/Log.h b/include/log/Log.h
@@ -31,7 +31,7 @@
 #include <cstdarg>
 #include <sstream>
 
-namespace libutil
+namespace util
 {
 
 /**

diff --git a/include/log/LogMessage.h b/include/log/LogMessage.h
@@ -28,7 +28,7 @@
 #include <chrono>
 #include <string>
 
-namespace libutil
+namespace util
 {
 
 /**

diff --git a/include/log/LogWriter.h b/include/log/LogWriter.h
@@ -28,7 +28,7 @@
 #include "log/LogMessage.h"
 #include "log/ILogFormatter.h"
 
-namespace libutil
+namespace util
 {
 
 /**

diff --git a/include/log/StreamLogWriter.h b/include/log/StreamLogWriter.h
@@ -28,7 +28,7 @@
 #include "log/LogWriter.h"
 #include <ostream>
 
-namespace libutil
+namespace util
 {
 
 /**

diff --git a/include/memory/MemoryAllocator.h b/include/memory/MemoryAllocator.h
@@ -27,7 +27,7 @@
 #include "prereqs.h"
 #include "memory/MemoryCounter.h"
 
-namespace libutil
+namespace util
 {
 
 /**

diff --git a/include/memory/MemoryCounter.h b/include/memory/MemoryCounter.h
@@ -27,7 +27,15 @@
 #include "prereqs.h"
 #include <unordered_map>
 
-namespace libutil
+// Enables tracking of memory allocations when defined
+//#define LU_DEBUG_MEMORY_TRACK
+
+// Enables detailed memory tracking when defined. LU_DEBUG_MEMORY_TRACK must 
+// also be defined. When enabled, current usage is tracked as well as total 
+// usage
+//#define LU_DEBUG_MEMORY_TRACK_DETAIL
+
+namespace util
 {
 
 /**

diff --git a/include/memory/StdLibAllocator.h b/include/memory/StdLibAllocator.h
@@ -27,7 +27,7 @@
 #include "prereqs.h"
 #include <limits>
 
-namespace libutil
+namespace util
 {
 
 /**

diff --git a/include/memory/memory.h b/include/memory/memory.h
@@ -28,7 +28,7 @@
 #include "memory/MemoryAllocator.h"
 #include "memory/StdLibAllocator.h"
 
-namespace libutil
+namespace util
 {
 
 /**

diff --git a/include/prereqs.h b/include/prereqs.h
@@ -30,7 +30,6 @@
 #define COMMON_H_INCLUDED__
 
 #include "platform.h"
-#include "debug.h"
 
 // Use to suppress warnings on unused code.
 #define LU_UNUSED(x) static_cast<void>(x)
@@ -41,18 +40,7 @@
   #define WIN32_LEAN_AND_MEAN
   #define NOMINMAX
 
-  #if defined(LU_DEBUG_STL)
-    #define _ITERATOR_DEBUG_LEVEL 1
-  #else
-    #define _ITERATOR_DEBUG_LEVEL 0
-  #endif
-
 #elif LU_COMPILER == LU_COMPILER_GNUCXX
-  #if defined(LU_DEBUG_STL)
-    #define _GLIBCXX_DEBUG
-  #else
-    #undef _GLIBCXX_DEBUG
-  #endif
 
 #elif LU_COMPILER == LU_COMPILER_CLANG
   #if defined(LU_DEBUG_STL)

diff --git a/include/utility/IHashable.h b/include/utility/IHashable.h
@@ -26,7 +26,7 @@
 
 #include "prereqs.h"
 
-namespace libutil
+namespace util
 {
 
 /**

diff --git a/include/utility/IToString.h b/include/utility/IToString.h
@@ -28,7 +28,7 @@
 #include <string>
 #include <ostream>
 
-namespace libutil
+namespace util
 {
 
 /**
@@ -49,7 +49,7 @@ class IToString
 
 }
 
-std::ostream& operator<<(std::ostream& os, const libutil::IToString& its)
+std::ostream& operator<<(std::ostream& os, const util::IToString& its)
 {
   os << its.toString();
   return os;

diff --git a/include/utility/Singleton.h b/include/utility/Singleton.h
@@ -26,7 +26,7 @@
 
 #include "prereqs.h"
 
-namespace libutil
+namespace util
 {
 
 /**

diff --git a/include/utility/Singularity.h b/include/utility/Singularity.h
@@ -26,7 +26,7 @@
 
 #include "prereqs.h"
 
-namespace libutil
+namespace util
 {
 
 /**

diff --git a/msvc/libutil.vcxproj b/msvc/libutil.vcxproj
@@ -80,7 +80,6 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\debug.h" />
     <ClInclude Include="..\include\log\ILogFormatter.h" />
     <ClInclude Include="..\include\log\Log.h" />
     <ClInclude Include="..\include\log\LogMessage.h" />

diff --git a/msvc/libutil.vcxproj.filters b/msvc/libutil.vcxproj.filters
@@ -26,9 +26,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\debug.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\include\platform.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/src/log/Log.cpp b/src/log/Log.cpp
@@ -26,7 +26,7 @@
 
 static const int PRINTF_BUFFER_SIZE = 256;
 
-namespace libutil
+namespace util
 {
 
 Log::Log(const std::string& logName, LogLevel outputLevel)

diff --git a/src/log/LogMessage.cpp b/src/log/LogMessage.cpp
@@ -23,7 +23,7 @@
 
 #include "log/LogMessage.h"
 
-namespace libutil
+namespace util
 {
 
 std::string toString(const LogLevel level)

diff --git a/src/log/LogWriter.cpp b/src/log/LogWriter.cpp
@@ -23,7 +23,7 @@
 
 #include "log/LogWriter.h"
 
-namespace libutil
+namespace util
 {
 
 LogWriter::LogWriter()

diff --git a/src/log/StreamLogWriter.cpp b/src/log/StreamLogWriter.cpp
@@ -23,7 +23,7 @@
 
 #include "log/StreamLogWriter.h"
 
-namespace libutil
+namespace util
 {
 
 StreamLogWriter::StreamLogWriter(std::ostream& stream)
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ @@
     #include "prereqs.h"
-    namespace libutil
+    namespace util
     {
     /**
@@ Expand Down @@