Refactor code. All nd*.cpp/h files are now in their own subdirectory.

indra/llcharacter/llkeyframemotion.cpp

@@ -44,7 +44,7 @@
 #include "message.h"
 #include "lltimer.h"
 
-#include <ndexceptions.h> // <FS:ND/> For nd::exceptions::xran
+#include "nd/ndexceptions.h" // <FS:ND/> For nd::exceptions::xran
 
 //-----------------------------------------------------------------------------
 // Static Definitions

indra/llcommon/CMakeLists.txt

@@ -269,8 +269,9 @@ set(llcommon_HEADER_FILES
     )
 
 # <FS:ND> Add all nd* files. memory pool, intrinsics, ...
-set(llcommon_ND_SOURCE_FILES ndallocators.cpp ndintrin.cpp ndmemorypool.cpp ndexceptions.cpp ndmallocstats.cpp ndfile.cpp )
-set(llcommon_ND_HEADER_FILES ndintrin.h ndlocks.h ndmemory.h ndmemorypool.h ndpooldefines.h ndexceptions.h ndmallocstats.h ndstackwalk.h ndcallstack.h ndobjectpool.h ndstlallocator.h ndfile.h )
+
+FILE( GLOB llcommon_ND_SOURCE_FILES nd/nd*.cpp )
+FILE( GLOB llcommon_ND_HEADER_FILES nd/nd*.h )
 
 SOURCE_GROUP( nd FILES ${llcommon_ND_SOURCE_FILES} ${llcommon_ND_HEADER_FILES} )
 

indra/llcommon/llapr.h

@@ -275,7 +275,7 @@ void LL_COMMON_API ll_apr_assert_status(apr_status_t status, apr_dso_handle_t* h
 
 extern "C" LL_COMMON_API apr_pool_t* gAPRPoolp; // Global APR memory pool
 
-#include "ndfile.h"
+#include "nd/ndfile.h"
 typedef ll::apr::LLAPRFile LLAPRFile;
 //typedef nd::apr::ndFile LLAPRFile;
 

indra/llcommon/llmemory.cpp

@@ -47,7 +47,7 @@
 #include "llsys.h"
 #include "llframetimer.h"
 
-#include "ndmemorypool.h" // <FS:ND/> tcmalloc replacement
+#include "nd/ndmemorypool.h" // <FS:ND/> tcmalloc replacement
 
 //----------------------------------------------------------------------------
 

indra/llcommon/llmemory.h

@@ -36,7 +36,7 @@
 
 // <FS:ND> No tcmalloc
 #ifdef ND_NO_TCMALLOC
-#include "ndmemory.h"
+#include "nd/ndmemory.h"
 #else
 
 inline void* ll_aligned_malloc( size_t size, int align )

indra/llcommon/llrefcount.h

@@ -28,7 +28,7 @@
 
 #include <boost/noncopyable.hpp>
 
-#include "ndintrin.h" // <FS:ND/> For FAA/FAD
+#include "nd/ndintrin.h" // <FS:ND/> For FAA/FAD
 
 #define LL_REF_COUNT_DEBUG 0
 #if LL_REF_COUNT_DEBUG

indra/llcommon/llsys.cpp

@@ -93,7 +93,7 @@ const char MEMINFO_FILE[] = "/proc/meminfo";
 extern int errno;
 #endif
 
-#include "ndmemorypool.h" // <FS:ND/> tcmalloc replacement
+#include "nd/ndmemorypool.h" // <FS:ND/> tcmalloc replacement
 
 static const S32 CPUINFO_BUFFER_SIZE = 16383;
 LLCPUInfo gSysCPU;

indra/llmessage/lldatapacker.h

@@ -27,7 +27,7 @@
 #ifndef LL_LLDATAPACKER_H 
 #define LL_LLDATAPACKER_H
 
-#include "ndexceptions.h" // <FS:ND/> For ndxran
+#include "nd/ndexceptions.h" // <FS:ND/> For ndxran
 
 class LLColor4;
 class LLColor4U;

indra/llmessage/lliopipe.h

@@ -35,7 +35,7 @@
 
 #include "llsd.h"
 
-#include "ndintrin.h"
+#include "nd/ndintrin.h"
 
 class LLIOPipe;
 class LLPumpIO;

indra/llmessage/llmessagetemplate.h

@@ -32,7 +32,7 @@
 #include "llstat.h"
 #include "llstl.h"
 
-#include "ndexceptions.h" // <FS:ND/> For ndxran
+#include "nd/ndexceptions.h" // <FS:ND/> For ndxran
 
 class LLMsgVarData
 {

indra/llmessage/lltemplatemessagedispatcher.cpp

@@ -33,7 +33,7 @@
 #include "llsd.h"
 #include "lltemplatemessagereader.h"
 
-#include "ndexceptions.h" // <FS:ND/> For ndxran
+#include "nd/ndexceptions.h" // <FS:ND/> For ndxran
 
 LLTemplateMessageDispatcher::LLTemplateMessageDispatcher(LLTemplateMessageReader &template_message_reader) :
 	mTemplateMessageReader(template_message_reader)

indra/llmessage/lltemplatemessagereader.cpp

@@ -38,7 +38,7 @@
 #include "v3math.h"
 #include "v4math.h"
 
-#include "ndexceptions.h" // <FS:ND/> For ndxran
+#include "nd/ndexceptions.h" // <FS:ND/> For ndxran
 
 LLTemplateMessageReader::LLTemplateMessageReader(message_template_number_map_t&
 												 number_template_map) :

indra/llmessage/message.cpp

@@ -82,7 +82,7 @@
 #include "lltransfertargetvfile.h"
 #include "llmemtype.h"
 
-#include "ndexceptions.h" // <FS:ND/> For ndxran
+#include "nd/ndexceptions.h" // <FS:ND/> For ndxran
 
 // Constants
 //const char* MESSAGE_LOG_FILENAME = "message.log";

indra/newview/llappviewer.cpp

@@ -242,8 +242,8 @@
 // define a self-registering event API object
 #include "llappviewerlistener.h"
 
-#include "ndmemorypool.h" // <FS:ND/> tcmalloc replacement
-#include "ndmallocstats.h" // <FS:ND/> collect stats about memory allocations
+#include "nd/ndmemorypool.h" // <FS:ND/> tcmalloc replacement
+#include "nd/ndmallocstats.h" // <FS:ND/> collect stats about memory allocations
 
 
 #if (LL_LINUX || LL_SOLARIS) && LL_GTK

indra/newview/llspatialpartition.cpp

@@ -54,7 +54,7 @@
 #include "llglslshader.h"
 #include "llviewershadermgr.h"
 
-#include "ndobjectpool.h" // <FS:ND/> For operator new/delete
+#include "nd/ndobjectpool.h" // <FS:ND/> For operator new/delete
 
 static LLFastTimer::DeclareTimer FTM_FRUSTUM_CULL("Frustum Culling");
 static LLFastTimer::DeclareTimer FTM_CULL_REBOUND("Cull Rebound");
@@ -5122,4 +5122,4 @@ void LLDrawInfo::operator delete(void* ptr)
 	sDrawinfoPool.freeMemoryOfObject( ptr );
 }
 
-// </FS:ND>
+// </FS:ND>

indra/newview/llviewerpartsim.cpp

@@ -41,7 +41,7 @@
 #include "llspatialpartition.h"
 #include "llvovolume.h"
 
-#include "ndobjectpool.h" // <FS:ND/> For operator new/delete
+#include "nd/ndobjectpool.h" // <FS:ND/> For operator new/delete
 
 const F32 PART_SIM_BOX_SIDE = 16.f;
 const F32 PART_SIM_BOX_OFFSET = 0.5f*PART_SIM_BOX_SIDE;
@@ -880,4 +880,4 @@ void LLViewerPart::operator delete(void* ptr)
 	sViewerpartPool.freeMemoryOfObject( ptr );
 }
 
-// </FS:ND>
+// </FS:ND>