build: Move refcount.h include into WWCommon.h

Core/GameEngine/Include/Common/Debug.h

@@ -45,6 +45,8 @@
 
 #pragma once
 
+#include <Utility/CppMacros.h>
+
 class AsciiString;
 
 #define NO_RELEASE_DEBUG_LOGGING
@@ -190,7 +192,7 @@ class AsciiString;
 				if (!ignoreCrash) { \
 					TheCurrentIgnoreCrashPtr = &ignoreCrash; \
 					DebugCrash m ; \
-					TheCurrentIgnoreCrashPtr = NULL; \
+					TheCurrentIgnoreCrashPtr = nullptr; \
 				} \
 			} \
 		} while (0)

Core/Libraries/Source/WWVegas/WW3D2/aabtree.h

@@ -40,7 +40,6 @@
 #pragma once
 
 #include "always.h"
-#include "refcount.h"
 #include "simplevec.h"
 #include "vector3.h"
 #include "Vector3i.h"

Core/Libraries/Source/WWVegas/WW3D2/font3d.h

@@ -35,7 +35,6 @@
 #pragma once
 
 #include "always.h"
-#include "refcount.h"
 #include "vector4.h"
 #include "widestring.h"
 #include "rect.h"

Core/Libraries/Source/WWVegas/WW3D2/hanim.h

@@ -39,11 +39,9 @@
 
 #include "always.h"
 #include "quat.h"
-#include "refcount.h"
 #include "w3d_file.h"
 #include "hash.h"
 #include "mempool.h"
-#include <refcount.h>
 #include <SLIST.h>
 #include <Vector.h>
 

Core/Libraries/Source/WWVegas/WW3D2/hcanim.h

@@ -39,7 +39,6 @@
 
 #include "always.h"
 #include "quat.h"
-#include "refcount.h"
 #include "w3d_file.h"
 #include "SLIST.h"
 #include "Vector.h"

Core/Libraries/Source/WWVegas/WW3D2/projector.cpp

@@ -46,7 +46,6 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include "projector.h"
-#include "refcount.h"
 #include "matrixmapper.h"
 
 

Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h

@@ -36,8 +36,8 @@
 
 #pragma once
 
+#include "always.h"
 #include "render2d.h"
-#include "refcount.h"
 #include "Vector.h"
 #include "vector2i.h"
 #include "wwstring.h"

Core/Libraries/Source/WWVegas/WW3D2/rendobj.h

@@ -41,7 +41,6 @@
 #pragma once
 
 #include "always.h"
-#include "refcount.h"
 #include "sphere.h"
 #include "coltype.h"
 #include "aabox.h"

Core/Libraries/Source/WWVegas/WW3D2/snapPts.h

@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include "refcount.h"
+#include "always.h"
 #include "Vector.h"
 #include "vector3.h"
 #include "w3derr.h"

Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h

@@ -38,8 +38,8 @@
 
 #pragma once
 
+#include "always.h"
 #include "ww3dformat.h"
-#include "refcount.h"
 
 struct IDirect3DSurface8;
 class Vector2i;

Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h

@@ -41,9 +41,9 @@
 #pragma warning (pop)
 
 //#include <malloc.h>
+#include "always.h"
 #include "vector3.h"
 #include "matrix3d.h"
-#include "refcount.h"
 #include "RAWFILE.h"
 #include "SoundSceneObj.h"
 #include "Vector.h"

Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.h

@@ -40,7 +40,7 @@
 #include "mss.h"
 #pragma warning (pop)
 
-#include "refcount.h"
+#include "always.h"
 
 
 // Forward declarations

Core/Libraries/Source/WWVegas/WWAudio/SoundCullObj.h

@@ -36,9 +36,9 @@
 
 #pragma once
 
+#include "always.h"
 #include "SoundSceneObj.h"
 #include "cullsys.h"
-#include "refcount.h"
 #include "mempool.h"
 #include "multilist.h"
 

Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.h

@@ -34,7 +34,7 @@
 
 #pragma once
 
-#include "refcount.h"
+#include "always.h"
 #include "WWAudio.h"
 #include "bittype.h"
 #include "persist.h"

Core/Libraries/Source/WWVegas/WWAudio/Threads.cpp

@@ -30,12 +30,10 @@
  * Functions:                                                                                  *
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-
+#include "always.h"
 #include "Threads.h"
-#include "refcount.h"
 #include "Utils.h"
 #include <process.h>
-#include "wwdebug.h"
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////

Core/Libraries/Source/WWVegas/WWDebug/wwdebug.h

@@ -41,14 +41,16 @@
 #include <Utility/intrin_compat.h>
 #endif
 
+#include "../../../../../Core/GameEngine/Include/Common/Debug.h"
+
 // The macro MESSAGE allows user to put:
 // #pragma MESSAGE("Hello world")
 // anywhere in a source file.  The message:
 // sourcefname.cpp (123) : Hello world
 // would be printed if put in sourcefname.cpp on line 123 in compile window like an error.
 // You can then use next/prev error	hot keys to see where comment is.  It is not an error and
-// will be printed everytime it is compiled.  Very useful to put comments in code that cannot
-// be forgoten.
+// will be printed every time it is compiled.  Very useful to put comments in code that cannot
+// be forgotten.
 #define STRING_IT(a) #a
 #define TOKEN_IT(a) STRING_IT(,##a)
 #define MESSAGE(a) message (__FILE__ "(" TOKEN_IT(__LINE__) ") : " a)
@@ -105,8 +107,6 @@ void					WWDebug_DBWin32_Message_Handler( const char * message);
 ** WWDEBUG_SAY(("dir = %f",dir));
 */
 
-#include "../../../../../Core/GameEngine/Include/Common/Debug.h"
-
 #ifdef DEBUG_LOGGING
 #define WWDEBUG_SAY(x)							DEBUG_LOG(x)
 #define WWDEBUG_WARNING(x)					DEBUG_LOG(x)

Core/Libraries/Source/WWVegas/WWLib/WWCommon.h

@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include "refcount.h"
 #include "STLUtils.h"
 #include "stringex.h"
 #include <Utility/stdio_adapter.h>

Core/Libraries/Source/WWVegas/WWLib/always.h

@@ -109,13 +109,20 @@
 	#define MSGW3DNEWARRAY(MSG)			new( MSG, 0 )
 	#define W3DNEW									new("W3D_" __FILE__, 0)
 	#define W3DNEWARRAY							new("W3A_" __FILE__, 0)
+
+	#define NEW_REF( C, P )					( (C*)RefCountClass::Set_Ref_Owner( W3DNEW C P, __FILE__, __LINE__ ) )
+	#define SET_REF_OWNER( P )			( RefCountClass::Set_Ref_Owner( P, __FILE__, __LINE__ ) )
 #else
 	#define MSGW3DNEW(MSG)					new
 	#define MSGW3DNEWARRAY(MSG)			new
 	#define W3DNEW									new
 	#define W3DNEWARRAY							new
+
+	#define NEW_REF( C, P )					( W3DNEW C P )
+	#define SET_REF_OWNER( P )			P
 #endif
 
+
 // ----------------------------------------------------------------------------
 extern void* createW3DMemPool(const char *poolName, int allocationSize);
 extern void* allocateFromW3DMemPool(void* p, int allocationSize);
@@ -187,7 +194,7 @@ class W3DMPO
 ** Define the MIN and MAX macros.
 ** NOTE: Joe used to #include <minmax.h> in the various compiler header files.  This
 ** header defines 'min' and 'max' macros which conflict with the surrender code so
-** I'm relpacing all occurances of 'min' and 'max with 'MIN' and 'MAX'.  For code which
+** I'm replacing all occurrences of 'min' and 'max with 'MIN' and 'MAX'.  For code which
 ** is out of our domain (e.g. Max sdk) I'm declaring template functions for 'min' and 'max'
 */
 #define NOMINMAX

Core/Libraries/Source/WWVegas/WWLib/ntree.h

@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include "refcount.h"
+#include "always.h"
 #include "wwstring.h"
 
 

Core/Libraries/Source/WWVegas/WWLib/refcount.h

@@ -36,9 +36,9 @@
 
 #pragma once
 
-#include "always.h"
 #include "LISTNODE.h"
-#include "wwdebug.h"
+#include "WWDebug/wwdebug.h"
+
 
 class RefCountClass;
 
@@ -51,14 +51,6 @@
 	int						Line;
 };
 
-#define	NEW_REF( C, P )						( (C*)RefCountClass::Set_Ref_Owner( W3DNEW C P, __FILE__, __LINE__ ) )
-#define	SET_REF_OWNER( P )				(		RefCountClass::Set_Ref_Owner( P,       __FILE__, __LINE__ ) )
-
-#else
-
-#define	NEW_REF( C, P )					( W3DNEW C P )
-#define	SET_REF_OWNER( P )			P
-
 #endif // RTS_DEBUG
 
 
@@ -69,7 +61,7 @@
 ** point it at the new object, and add-ref the new object (if its not null...)
 */
 #define REF_PTR_SET(dst,src)	{ if (src) (src)->Add_Ref(); if (dst) (dst)->Release_Ref(); (dst) = (src); }
-#define REF_PTR_RELEASE(x)		{ if (x) x->Release_Ref(); x = NULL; }
+#define REF_PTR_RELEASE(x)		{ if (x) x->Release_Ref(); x = nullptr; }
 
 
 /*
@@ -104,7 +96,7 @@
 	RefCountClass(void)
 		: NumRefs(1)
 #ifdef RTS_DEBUG
 		, ActiveRefNode(this)
 #endif
 	{
 #ifdef RTS_DEBUG
@@ -119,7 +111,7 @@
 	RefCountClass(const RefCountClass & )
 		: NumRefs(1)
 #ifdef RTS_DEBUG
 		, ActiveRefNode(this)
 #endif
 	{
 #ifdef RTS_DEBUG
@@ -137,14 +129,14 @@
 #ifdef RTS_DEBUG
 	void Add_Ref(void) const;
 #else
-	WWINLINE void Add_Ref(void) const							{ NumRefs++; }
+	void Add_Ref(void) const							{ NumRefs++; }
 #endif
 
 	/*
 	** Release_Ref, call this function when you no longer need the pointer
 	** to this object.
 	*/
-	WWINLINE void		Release_Ref(void) const
+	void Release_Ref(void) const
 	{
 #ifdef RTS_DEBUG
 		Dec_Total_Refs(this);

Core/Libraries/Source/WWVegas/WWLib/sharebuf.h

@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include "refcount.h"
+#include "always.h"
 
 
 /*

Core/Libraries/Source/WWVegas/WWMath/cullsys.h

@@ -36,9 +36,8 @@
 
 #pragma once
 
-#include "wwdebug.h"
+#include "always.h"
 #include "stdlib.h"
-#include "refcount.h"
 #include "aabox.h"
 
 class CullableClass;

Core/Libraries/Source/WWVegas/WWMath/lookuptable.h

@@ -41,7 +41,6 @@
 #include "always.h"
 #include "simplevec.h"
 #include "wwstring.h"
-#include "refcount.h"
 #include "multilist.h"
 #include "wwmath.h"
 

Core/Libraries/Source/WWVegas/WWSaveLoad/persist.h

@@ -37,7 +37,6 @@
 #pragma once
 
 #include "always.h"
-#include "refcount.h"
 #include "postloadable.h"
 
 class PersistFactoryClass;

Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.cpp

@@ -36,7 +36,6 @@
 
 
 #include "pointerremap.h"
-#include "refcount.h"
 #include "wwdebug.h"
 
 

Dependencies/Utility/Utility/CppMacros.h

@@ -37,9 +37,10 @@
 #endif
 
 #if __cplusplus >= 201103L
-  #define CPP_11(code) code
+#define CPP_11(code) code
 #else
-  #define CPP_11(code)
-  #define static_assert(expr, msg)
-  #define constexpr
+#define CPP_11(code)
+#define static_assert(expr, msg)
+#define constexpr
+#define nullptr 0
 #endif

Generals/Code/GameEngine/Include/Common/StateMachine.h

@@ -34,8 +34,6 @@
 #include "Common/Snapshot.h"
 #include "Common/Xfer.h"
 
-#include "refcount.h"
-
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

Generals/Code/GameEngine/Include/GameLogic/AI.h

@@ -34,7 +34,6 @@
 #include "Common/GameType.h"
 #include "GameLogic/Damage.h"
 #include "Common/STLTypedefs.h"
-#include "refcount.h"
 #include "ref_ptr.h"
 
 class AIGroup;

Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h

@@ -40,7 +40,6 @@
 
 #include "always.h"
 #include "wwdebug.h"
-#include "refcount.h"
 #include "sphere.h"
 
 class DX8Wrapper;

Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h

@@ -41,7 +41,6 @@
 #include "always.h"
 #include "wwstring.h"
 #include "simplevec.h"
-#include "refcount.h"
 #include "Vector.h"
 #include "dx8list.h"
 #include "shader.h"

Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h

@@ -40,7 +40,6 @@
 
 #include "always.h"
 #include "wwdebug.h"
-#include "refcount.h"
 #include "dx8fvf.h"
 
 const unsigned dynamic_fvf_type=D3DFVF_XYZ|D3DFVF_NORMAL|D3DFVF_TEX2|D3DFVF_DIFFUSE;

Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h

@@ -39,10 +39,9 @@
 
 #pragma once
 
-#include "refcount.h"
+#include "always.h"
 #include "w3d_file.h"
 #include "w3derr.h"
-#include "wwdebug.h"
 #include "vector2.h"
 #include "vector3.h"
 #include "ww3d.h"