Tidy default heaps and fix Intermediate Build

gorlak · gorlak · commit 0990b78eb041 · 2011-07-06T23:48:10.000-07:00
diff --git a/EditorSupport/EditorSupportPch.cpp b/EditorSupport/EditorSupportPch.cpp
@@ -1,12 +1,7 @@
-//----------------------------------------------------------------------------------------------------------------------
-// EditorSupportPch.cpp
-//
-// Copyright (C) 2010 WhiteMoon Dreams, Inc.
-// All Rights Reserved
-//----------------------------------------------------------------------------------------------------------------------
-
 #include "EditorSupportPch.h"
 
+#include "Platform/Memory.h"
+
 // Define the memory heap for the current module and include the "new"/"delete" operator implementations.
 HELIUM_DEFINE_DEFAULT_MODULE_HEAP( EditorSupport );
 
diff --git a/Engine/EnginePch.cpp b/Engine/EnginePch.cpp
@@ -1,12 +1,7 @@
-//----------------------------------------------------------------------------------------------------------------------
-// EnginePch.cpp
-//
-// Copyright (C) 2010 WhiteMoon Dreams, Inc.
-// All Rights Reserved
-//----------------------------------------------------------------------------------------------------------------------
-
 #include "EnginePch.h"
 
+#include "Platform/Memory.h"
+
 // Define the memory heap for the current module and include the "new"/"delete" operator implementations.
 HELIUM_DEFINE_DEFAULT_MODULE_HEAP( Engine );
 
diff --git a/EngineJobs/EngineJobsPch.cpp b/EngineJobs/EngineJobsPch.cpp
@@ -1,12 +1,7 @@
-//----------------------------------------------------------------------------------------------------------------------
-// EngineJobsPch.cpp
-//
-// Copyright (C) 2010 WhiteMoon Dreams, Inc.
-// All Rights Reserved
-//----------------------------------------------------------------------------------------------------------------------
-
 #include "EngineJobsPch.h"
 
+#include "Platform/Memory.h"
+
 // Define the memory heap for the current module and include the "new"/"delete" operator implementations.
 HELIUM_DEFINE_DEFAULT_MODULE_HEAP( EngineJobs );
 
diff --git a/Example/ExampleGame/ExampleGamePch.cpp b/Example/ExampleGame/ExampleGamePch.cpp
@@ -1,12 +1,7 @@
-//----------------------------------------------------------------------------------------------------------------------
-// ExampleGamePch.cpp
-//
-// Copyright (C) 2010 WhiteMoon Dreams, Inc.
-// All Rights Reserved
-//----------------------------------------------------------------------------------------------------------------------
-
 #include "ExampleGamePch.h"
 
+#include "Platform/Memory.h"
+
 // Define the memory heap for the current module and include the "new"/"delete" operator implementations.
 HELIUM_DEFINE_DEFAULT_MODULE_HEAP( ExampleGame );
 
diff --git a/Example/ExampleMain/ExampleMainPch.cpp b/Example/ExampleMain/ExampleMainPch.cpp
@@ -1,12 +1,7 @@
-//----------------------------------------------------------------------------------------------------------------------
-// ExampleMainPch.cpp
-//
-// Copyright (C) 2010 WhiteMoon Dreams, Inc.
-// All Rights Reserved
-//----------------------------------------------------------------------------------------------------------------------
-
 #include "ExampleMainPch.h"
 
+#include "Platform/Memory.h"
+
 // Define the memory heap for the current module and include the "new"/"delete" operator implementations.
 HELIUM_DEFINE_DEFAULT_MODULE_HEAP( ExampleMain );
 
diff --git a/Foundation/FoundationPch.cpp b/Foundation/FoundationPch.cpp
@@ -1 +1,10 @@
-#include "FoundationPch.h"
+#include "FoundationPch.h"
+
+#include "Platform/Memory.h"
+
+// Define the memory heap for the current module and include the "new"/"delete" operator implementations.
+HELIUM_DEFINE_DEFAULT_MODULE_HEAP( Engine );
+
+#if HELIUM_DEBUG
+#include "Platform/NewDelete.h"
+#endif
diff --git a/Foundation/Memory.cpp b/Foundation/Memory.cpp
@@ -18,13 +18,6 @@
 #define abs64 labs
 #endif
 
-// Define the memory heap for the current module and include the "new"/"delete" operator implementations.
-HELIUM_DEFINE_DEFAULT_MODULE_HEAP( Foundation );
-
-#if HELIUM_SHARED
-#include "Platform/NewDelete.h"
-#endif
-
 using namespace Helium;
 using namespace Helium::Profile; 
 
diff --git a/Framework/FrameworkPch.cpp b/Framework/FrameworkPch.cpp
@@ -1,12 +1,7 @@
-//----------------------------------------------------------------------------------------------------------------------
-// FrameworkPch.cpp
-//
-// Copyright (C) 2010 WhiteMoon Dreams, Inc.
-// All Rights Reserved
-//----------------------------------------------------------------------------------------------------------------------
-
 #include "FrameworkPch.h"
 
+#include "Platform/Memory.h"
+
 // Define the memory heap for the current module and include the "new"/"delete" operator implementations.
 HELIUM_DEFINE_DEFAULT_MODULE_HEAP( Framework );
 
diff --git a/FrameworkWin/FrameworkWinPch.cpp b/FrameworkWin/FrameworkWinPch.cpp
@@ -1,12 +1,7 @@
-//----------------------------------------------------------------------------------------------------------------------
-// FrameworkWinPch.cpp
-//
-// Copyright (C) 2010 WhiteMoon Dreams, Inc.
-// All Rights Reserved
-//----------------------------------------------------------------------------------------------------------------------
-
 #include "FrameworkWinPch.h"
 
+#include "Platform/Memory.h"
+
 // Define the memory heap for the current module and include the "new"/"delete" operator implementations.
 HELIUM_DEFINE_DEFAULT_MODULE_HEAP( FrameworkWin );
 
diff --git a/Graphics/GraphicsPch.cpp b/Graphics/GraphicsPch.cpp
@@ -1,12 +1,7 @@
-//----------------------------------------------------------------------------------------------------------------------
-// GraphicsPch.cpp
-//
-// Copyright (C) 2010 WhiteMoon Dreams, Inc.
-// All Rights Reserved
-//----------------------------------------------------------------------------------------------------------------------
-
 #include "GraphicsPch.h"
 
+#include "Platform/Memory.h"
+
 // Define the memory heap for the current module and include the "new"/"delete" operator implementations.
 HELIUM_DEFINE_DEFAULT_MODULE_HEAP( Graphics );
 
diff --git a/GraphicsJobs/GraphicsJobsPch.cpp b/GraphicsJobs/GraphicsJobsPch.cpp
@@ -1,12 +1,7 @@
-//----------------------------------------------------------------------------------------------------------------------
-// GraphicsJobsPch.cpp
-//
-// Copyright (C) 2010 WhiteMoon Dreams, Inc.
-// All Rights Reserved
-//----------------------------------------------------------------------------------------------------------------------
-
 #include "GraphicsJobsPch.h"
 
+#include "Platform/Memory.h"
+
 // Define the memory heap for the current module and include the "new"/"delete" operator implementations.
 HELIUM_DEFINE_DEFAULT_MODULE_HEAP( GraphicsJobs );
 
diff --git a/GraphicsTypes/GraphicsTypesPch.cpp b/GraphicsTypes/GraphicsTypesPch.cpp
@@ -1,12 +1,7 @@
-//----------------------------------------------------------------------------------------------------------------------
-// GraphicsTypesPch.cpp
-//
-// Copyright (C) 2010 WhiteMoon Dreams, Inc.
-// All Rights Reserved
-//----------------------------------------------------------------------------------------------------------------------
-
 #include "GraphicsTypesPch.h"
 
+#include "Platform/Memory.h"
+
 // Define the memory heap for the current module and include the "new"/"delete" operator implementations.
 HELIUM_DEFINE_DEFAULT_MODULE_HEAP( GraphicsTypes );
 
diff --git a/Math/MathPch.cpp b/Math/MathPch.cpp
@@ -1 +1,10 @@
-#include "MathPch.h"
+#include "MathPch.h"
+
+#include "Platform/Memory.h"
+
+// Define the memory heap for the current module and include the "new"/"delete" operator implementations.
+HELIUM_DEFINE_DEFAULT_MODULE_HEAP( Engine );
+
+#if HELIUM_DEBUG
+#include "Platform/NewDelete.h"
+#endif
diff --git a/PcSupport/PcSupportPch.cpp b/PcSupport/PcSupportPch.cpp
@@ -1,12 +1,7 @@
-//----------------------------------------------------------------------------------------------------------------------
-// PcSupportPch.cpp
-//
-// Copyright (C) 2010 WhiteMoon Dreams, Inc.
-// All Rights Reserved
-//----------------------------------------------------------------------------------------------------------------------
-
 #include "PcSupportPch.h"
 
+#include "Platform/Memory.h"
+
 // Define the memory heap for the current module and include the "new"/"delete" operator implementations.
 HELIUM_DEFINE_DEFAULT_MODULE_HEAP( PcSupport );
 
diff --git a/Pipeline/Memory.cpp b/Pipeline/Memory.cpp
@@ -1,4 +1,5 @@
 #include "PipelinePch.h"
+
 #include "Platform/Memory.h"
 
 // Define the memory heap for the current module and include the "new"/"delete" operator implementations.
diff --git a/Platform/Memory.cpp b/Platform/Memory.cpp
@@ -2,13 +2,6 @@
 #include "Platform/Memory.h"
 #include "Platform/Thread.h"
 
-// Define the memory heap for the current module and include the "new"/"delete" operator implementations.
-HELIUM_DEFINE_DEFAULT_MODULE_HEAP( Platform );
-
-#if HELIUM_SHARED
-#include "Platform/NewDelete.h"
-#endif
-
 using namespace Helium;
 
 #if HELIUM_ENABLE_MEMORY_TRACKING
diff --git a/Platform/PlatformPch.cpp b/Platform/PlatformPch.cpp
@@ -1 +1,10 @@
-#include "PlatformPch.h"
+#include "PlatformPch.h"
+
+#include "Platform/Memory.h"
+
+// Define the memory heap for the current module and include the "new"/"delete" operator implementations.
+HELIUM_DEFINE_DEFAULT_MODULE_HEAP( Platform );
+
+#if HELIUM_SHARED
+#include "Platform/NewDelete.h"
+#endif
diff --git a/PreprocessingPc/PreprocessingPcPch.cpp b/PreprocessingPc/PreprocessingPcPch.cpp
@@ -1,12 +1,7 @@
-//----------------------------------------------------------------------------------------------------------------------
-// PreprocessingPcPch.cpp
-//
-// Copyright (C) 2010 WhiteMoon Dreams, Inc.
-// All Rights Reserved
-//----------------------------------------------------------------------------------------------------------------------
-
 #include "PreprocessingPcPch.h"
 
+#include "Platform/Memory.h"
+
 // Define the memory heap for the current module and include the "new"/"delete" operator implementations.
 HELIUM_DEFINE_DEFAULT_MODULE_HEAP( PreprocessingPc );
 
diff --git a/Rendering/RenderingPch.cpp b/Rendering/RenderingPch.cpp
@@ -1,12 +1,7 @@
-//----------------------------------------------------------------------------------------------------------------------
-// RenderingPch.cpp
-//
-// Copyright (C) 2010 WhiteMoon Dreams, Inc.
-// All Rights Reserved
-//----------------------------------------------------------------------------------------------------------------------
-
 #include "RenderingPch.h"
 
+#include "Platform/Memory.h"
+
 // Define the memory heap for the current module and include the "new"/"delete" operator implementations.
 HELIUM_DEFINE_DEFAULT_MODULE_HEAP( Rendering );
 
diff --git a/RenderingD3D9/RenderingD3D9Pch.cpp b/RenderingD3D9/RenderingD3D9Pch.cpp
@@ -1,12 +1,7 @@
-//----------------------------------------------------------------------------------------------------------------------
-// RenderingD3D9Pch.cpp
-//
-// Copyright (C) 2010 WhiteMoon Dreams, Inc.
-// All Rights Reserved
-//----------------------------------------------------------------------------------------------------------------------
-
 #include "RenderingD3D9Pch.h"
 
+#include "Platform/Memory.h"
+
 // Define the memory heap for the current module and include the "new"/"delete" operator implementations.
 HELIUM_DEFINE_DEFAULT_MODULE_HEAP( RenderingD3D9 );
 
diff --git a/TestApp/TestAppPch.cpp b/TestApp/TestAppPch.cpp
@@ -1,5 +1,7 @@
 #include "TestAppPch.h"
 
+#include "Platform/Memory.h"
+
 // Define the memory heap for the current module and include the "new"/"delete" operator implementations.
 HELIUM_DEFINE_DEFAULT_MODULE_HEAP( TestApp );
 
diff --git a/TestJobs/TestJobsPch.cpp b/TestJobs/TestJobsPch.cpp
@@ -1,12 +1,7 @@
-//----------------------------------------------------------------------------------------------------------------------
-// TestJobsPch.cpp
-//
-// Copyright (C) 2010 WhiteMoon Dreams, Inc.
-// All Rights Reserved
-//----------------------------------------------------------------------------------------------------------------------
-
 #include "TestJobsPch.h"
 
+#include "Platform/Memory.h"
+
 // Define the memory heap for the current module and include the "new"/"delete" operator implementations.
 HELIUM_DEFINE_DEFAULT_MODULE_HEAP( TestJobs );
 
diff --git a/Windowing/WindowingPch.cpp b/Windowing/WindowingPch.cpp
@@ -1,12 +1,7 @@
-//----------------------------------------------------------------------------------------------------------------------
-// WindowingPch.cpp
-//
-// Copyright (C) 2010 WhiteMoon Dreams, Inc.
-// All Rights Reserved
-//----------------------------------------------------------------------------------------------------------------------
-
 #include "WindowingPch.h"
 
+#include "Platform/Memory.h"
+
 // Define the memory heap for the current module and include the "new"/"delete" operator implementations.
 HELIUM_DEFINE_DEFAULT_MODULE_HEAP( Windowing );
 
diff --git a/WindowingWin/WindowingWinPch.cpp b/WindowingWin/WindowingWinPch.cpp
@@ -1,12 +1,7 @@
-//----------------------------------------------------------------------------------------------------------------------
-// WindowingWinPch.cpp
-//
-// Copyright (C) 2010 WhiteMoon Dreams, Inc.
-// All Rights Reserved
-//----------------------------------------------------------------------------------------------------------------------
-
 #include "WindowingWinPch.h"
 
+#include "Platform/Memory.h"
+
 // Define the memory heap for the current module and include the "new"/"delete" operator implementations.
 HELIUM_DEFINE_DEFAULT_MODULE_HEAP( WindowingWin );
 
