[ZH] Replacing 'register' keyword by a macro as it is deprecated since c++17 (TheSuperHackers#534)

Author: Bart Roossien

Dependencies/Utility/Utility/CppMacros.h

@@ -8,3 +8,9 @@
 #else
 #define NOEXCEPT_17
 #endif
+
+#if __cplusplus >= 201703L
+#define REGISTER
+#else
+#define REGISTER register
+#endif

GeneralsMD/Code/GameEngine/Include/Common/QuickTrig.h

@@ -35,6 +35,8 @@
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 
+#include "Utility/CppMacros.h"
+
 //-----------------------------------------------------------------------------
 
 extern Real TheQuickSinTable[];
@@ -88,8 +90,8 @@ inline Real QMag(Real x, Real y, Real z)
 //-----------------------------------------------------------------------------
 inline Real QSin(Real a)
 {  
-   register Real angle = a;
-   register long sgn = 1;
+   REGISTER Real angle = a;
+   REGISTER long sgn = 1;
 
    if (angle < 0)       // DO POSITIVE MATH AND PRESERVE SIGN
    {
@@ -108,8 +110,8 @@ inline Real QSin(Real a)
       angle = PI - angle; // FLIP
    }
 
-   register int index = REAL_TO_INT((angle/QUARTER_CIRCLE) * TheQuickTanTableCount);
-   register Real x = TheQuickSinTable[index];
+   REGISTER int index = REAL_TO_INT((angle/QUARTER_CIRCLE) * TheQuickTanTableCount);
+   REGISTER Real x = TheQuickSinTable[index];
 
    return x * sgn;
 

GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp

@@ -52,6 +52,7 @@
 
 #include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.	
 
+#include "Utility/CppMacros.h"
 
 #define no_INTENSE_DEBUG
 
@@ -2641,7 +2642,7 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
 //		//	DEBUG_ASSERTCRASH(map[i][j].getZone() != 0, ("Cleared the zone."));
 //		}
 //	}
-  register UnsignedInt maxZone = m_maxZone;
+  REGISTER UnsignedInt maxZone = m_maxZone;
 	j=globalBounds.lo.y;
   while( j <= globalBounds.hi.y )	
   {
@@ -2754,7 +2755,7 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
   //FLATTEN HIERARCHICAL ZONES
   {
 	  i = 1;
-    register Int zone;  
+    REGISTER Int zone;  
     while ( i < maxZone ) 
     {		// Flatten hierarchical zones.
 		  zone = m_hierarchicalZones[i];

GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/intersec.cpp

@@ -41,6 +41,7 @@
 #include "scene.h"
 #include "intersec.inl"
 
+#include "Utility/CppMacros.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
@@ -190,7 +191,7 @@ bool IntersectionClass::Intersect_Box(Vector3 &Box_Min, Vector3 &Box_Max, Inters
 	float distance[PLANE_COUNT];
 	float candidate_plane[PLANE_COUNT];
 
-	register Vector3 *intersection = &FinalResult->Intersection;
+	REGISTER Vector3 *intersection = &FinalResult->Intersection;
 
 	// Find candidate planes and determine if the ray is outside the box
 	for (counter = 0; counter < PLANE_COUNT; counter++) {