diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp index cc27b9e8d2..01217925a3 100644 --- a/indra/llcharacter/llkeyframemotion.cpp +++ b/indra/llcharacter/llkeyframemotion.cpp @@ -44,7 +44,7 @@ #include "message.h" #include "lltimer.h" -#include // For nd::exceptions::xran +#include "nd/ndexceptions.h" // For nd::exceptions::xran //----------------------------------------------------------------------------- // Static Definitions diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index b736ad1b0d..f04e952b34 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -269,8 +269,9 @@ set(llcommon_HEADER_FILES ) # 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} ) diff --git a/indra/llcommon/llapr.h b/indra/llcommon/llapr.h index 24d416f7ce..f628419bf5 100644 --- a/indra/llcommon/llapr.h +++ b/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; diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp index b452796e46..1ca6be78c2 100644 --- a/indra/llcommon/llmemory.cpp +++ b/indra/llcommon/llmemory.cpp @@ -47,7 +47,7 @@ #include "llsys.h" #include "llframetimer.h" -#include "ndmemorypool.h" // tcmalloc replacement +#include "nd/ndmemorypool.h" // tcmalloc replacement //---------------------------------------------------------------------------- diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h index a30286d227..3fbc6e022c 100644 --- a/indra/llcommon/llmemory.h +++ b/indra/llcommon/llmemory.h @@ -36,7 +36,7 @@ // No tcmalloc #ifdef ND_NO_TCMALLOC -#include "ndmemory.h" +#include "nd/ndmemory.h" #else inline void* ll_aligned_malloc( size_t size, int align ) diff --git a/indra/llcommon/llrefcount.h b/indra/llcommon/llrefcount.h index 6ba4802918..053347804b 100644 --- a/indra/llcommon/llrefcount.h +++ b/indra/llcommon/llrefcount.h @@ -28,7 +28,7 @@ #include -#include "ndintrin.h" // For FAA/FAD +#include "nd/ndintrin.h" // For FAA/FAD #define LL_REF_COUNT_DEBUG 0 #if LL_REF_COUNT_DEBUG diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 4bc9171ba8..63da8484eb 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -93,7 +93,7 @@ const char MEMINFO_FILE[] = "/proc/meminfo"; extern int errno; #endif -#include "ndmemorypool.h" // tcmalloc replacement +#include "nd/ndmemorypool.h" // tcmalloc replacement static const S32 CPUINFO_BUFFER_SIZE = 16383; LLCPUInfo gSysCPU; diff --git a/indra/llcommon/ndallocators.cpp b/indra/llcommon/nd/ndallocators.cpp similarity index 100% rename from indra/llcommon/ndallocators.cpp rename to indra/llcommon/nd/ndallocators.cpp diff --git a/indra/llcommon/ndallocators.h b/indra/llcommon/nd/ndallocators.h similarity index 100% rename from indra/llcommon/ndallocators.h rename to indra/llcommon/nd/ndallocators.h diff --git a/indra/llcommon/ndcallstack.h b/indra/llcommon/nd/ndcallstack.h similarity index 100% rename from indra/llcommon/ndcallstack.h rename to indra/llcommon/nd/ndcallstack.h diff --git a/indra/llcommon/ndexceptions.cpp b/indra/llcommon/nd/ndexceptions.cpp similarity index 100% rename from indra/llcommon/ndexceptions.cpp rename to indra/llcommon/nd/ndexceptions.cpp diff --git a/indra/llcommon/ndexceptions.h b/indra/llcommon/nd/ndexceptions.h similarity index 100% rename from indra/llcommon/ndexceptions.h rename to indra/llcommon/nd/ndexceptions.h diff --git a/indra/llcommon/ndfile.cpp b/indra/llcommon/nd/ndfile.cpp similarity index 100% rename from indra/llcommon/ndfile.cpp rename to indra/llcommon/nd/ndfile.cpp diff --git a/indra/llcommon/ndfile.h b/indra/llcommon/nd/ndfile.h similarity index 100% rename from indra/llcommon/ndfile.h rename to indra/llcommon/nd/ndfile.h diff --git a/indra/llcommon/ndintrin.cpp b/indra/llcommon/nd/ndintrin.cpp similarity index 100% rename from indra/llcommon/ndintrin.cpp rename to indra/llcommon/nd/ndintrin.cpp diff --git a/indra/llcommon/ndintrin.h b/indra/llcommon/nd/ndintrin.h similarity index 100% rename from indra/llcommon/ndintrin.h rename to indra/llcommon/nd/ndintrin.h diff --git a/indra/llcommon/ndlocks.h b/indra/llcommon/nd/ndlocks.h similarity index 100% rename from indra/llcommon/ndlocks.h rename to indra/llcommon/nd/ndlocks.h diff --git a/indra/llcommon/ndmallocstats.cpp b/indra/llcommon/nd/ndmallocstats.cpp similarity index 100% rename from indra/llcommon/ndmallocstats.cpp rename to indra/llcommon/nd/ndmallocstats.cpp diff --git a/indra/llcommon/ndmallocstats.h b/indra/llcommon/nd/ndmallocstats.h similarity index 100% rename from indra/llcommon/ndmallocstats.h rename to indra/llcommon/nd/ndmallocstats.h diff --git a/indra/llcommon/ndmemory.h b/indra/llcommon/nd/ndmemory.h similarity index 100% rename from indra/llcommon/ndmemory.h rename to indra/llcommon/nd/ndmemory.h diff --git a/indra/llcommon/ndmemorypool.cpp b/indra/llcommon/nd/ndmemorypool.cpp similarity index 100% rename from indra/llcommon/ndmemorypool.cpp rename to indra/llcommon/nd/ndmemorypool.cpp diff --git a/indra/llcommon/ndmemorypool.h b/indra/llcommon/nd/ndmemorypool.h similarity index 100% rename from indra/llcommon/ndmemorypool.h rename to indra/llcommon/nd/ndmemorypool.h diff --git a/indra/llcommon/ndobjectpool.h b/indra/llcommon/nd/ndobjectpool.h similarity index 100% rename from indra/llcommon/ndobjectpool.h rename to indra/llcommon/nd/ndobjectpool.h diff --git a/indra/llcommon/ndpooldefines.h b/indra/llcommon/nd/ndpooldefines.h similarity index 100% rename from indra/llcommon/ndpooldefines.h rename to indra/llcommon/nd/ndpooldefines.h diff --git a/indra/llcommon/ndstackwalk.h b/indra/llcommon/nd/ndstackwalk.h similarity index 100% rename from indra/llcommon/ndstackwalk.h rename to indra/llcommon/nd/ndstackwalk.h diff --git a/indra/llcommon/ndstlallocator.h b/indra/llcommon/nd/ndstlallocator.h similarity index 100% rename from indra/llcommon/ndstlallocator.h rename to indra/llcommon/nd/ndstlallocator.h diff --git a/indra/llmessage/lldatapacker.h b/indra/llmessage/lldatapacker.h index 525e400ef4..b2ee3e1ee2 100644 --- a/indra/llmessage/lldatapacker.h +++ b/indra/llmessage/lldatapacker.h @@ -27,7 +27,7 @@ #ifndef LL_LLDATAPACKER_H #define LL_LLDATAPACKER_H -#include "ndexceptions.h" // For ndxran +#include "nd/ndexceptions.h" // For ndxran class LLColor4; class LLColor4U; diff --git a/indra/llmessage/lliopipe.h b/indra/llmessage/lliopipe.h index 04ac853547..3f458a8549 100644 --- a/indra/llmessage/lliopipe.h +++ b/indra/llmessage/lliopipe.h @@ -35,7 +35,7 @@ #include "llsd.h" -#include "ndintrin.h" +#include "nd/ndintrin.h" class LLIOPipe; class LLPumpIO; diff --git a/indra/llmessage/llmessagetemplate.h b/indra/llmessage/llmessagetemplate.h index 675163b4bc..83c87671f9 100644 --- a/indra/llmessage/llmessagetemplate.h +++ b/indra/llmessage/llmessagetemplate.h @@ -32,7 +32,7 @@ #include "llstat.h" #include "llstl.h" -#include "ndexceptions.h" // For ndxran +#include "nd/ndexceptions.h" // For ndxran class LLMsgVarData { diff --git a/indra/llmessage/lltemplatemessagedispatcher.cpp b/indra/llmessage/lltemplatemessagedispatcher.cpp index 0849dc5d23..4e1d52f3f0 100644 --- a/indra/llmessage/lltemplatemessagedispatcher.cpp +++ b/indra/llmessage/lltemplatemessagedispatcher.cpp @@ -33,7 +33,7 @@ #include "llsd.h" #include "lltemplatemessagereader.h" -#include "ndexceptions.h" // For ndxran +#include "nd/ndexceptions.h" // For ndxran LLTemplateMessageDispatcher::LLTemplateMessageDispatcher(LLTemplateMessageReader &template_message_reader) : mTemplateMessageReader(template_message_reader) diff --git a/indra/llmessage/lltemplatemessagereader.cpp b/indra/llmessage/lltemplatemessagereader.cpp index fbc0018c0b..0d876d2704 100644 --- a/indra/llmessage/lltemplatemessagereader.cpp +++ b/indra/llmessage/lltemplatemessagereader.cpp @@ -38,7 +38,7 @@ #include "v3math.h" #include "v4math.h" -#include "ndexceptions.h" // For ndxran +#include "nd/ndexceptions.h" // For ndxran LLTemplateMessageReader::LLTemplateMessageReader(message_template_number_map_t& number_template_map) : diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp index 388e7c2a7a..de53d98a72 100644 --- a/indra/llmessage/message.cpp +++ b/indra/llmessage/message.cpp @@ -82,7 +82,7 @@ #include "lltransfertargetvfile.h" #include "llmemtype.h" -#include "ndexceptions.h" // For ndxran +#include "nd/ndexceptions.h" // For ndxran // Constants //const char* MESSAGE_LOG_FILENAME = "message.log"; diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 594a225fd9..290a893501 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -242,8 +242,8 @@ // define a self-registering event API object #include "llappviewerlistener.h" -#include "ndmemorypool.h" // tcmalloc replacement -#include "ndmallocstats.h" // collect stats about memory allocations +#include "nd/ndmemorypool.h" // tcmalloc replacement +#include "nd/ndmallocstats.h" // collect stats about memory allocations #if (LL_LINUX || LL_SOLARIS) && LL_GTK diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index c8174ba415..ac3ea6a82c 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -54,7 +54,7 @@ #include "llglslshader.h" #include "llviewershadermgr.h" -#include "ndobjectpool.h" // For operator new/delete +#include "nd/ndobjectpool.h" // 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 ); } -// \ No newline at end of file +// diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp index 565cbdf2ca..f90bb65748 100644 --- a/indra/newview/llviewerpartsim.cpp +++ b/indra/newview/llviewerpartsim.cpp @@ -41,7 +41,7 @@ #include "llspatialpartition.h" #include "llvovolume.h" -#include "ndobjectpool.h" // For operator new/delete +#include "nd/ndobjectpool.h" // 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 ); } -// \ No newline at end of file +//