[ZH] Upgrade to c++17 (#426)

Author: xezon

CMakeLists.txt

@@ -74,13 +74,21 @@ include(cmake/gamespy.cmake)
 include(cmake/lzhl.cmake)
 include(cmake/zlib.cmake)
 add_subdirectory(Dependencies/Benchmark)
-add_subdirectory(Dependencies/SafeDisc)
 add_subdirectory(Dependencies/MaxSDK)
+add_subdirectory(Dependencies/SafeDisc)
+add_subdirectory(Dependencies/Utility)
 
 if (NOT IS_VS6_BUILD)
+    # Set C++ standard
+    set(CMAKE_CXX_STANDARD 17)
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+    set(CMAKE_CXX_EXTENSIONS OFF)  # Ensures only ISO features are used
+
     if (MSVC)
         # Multithreaded build.
         add_compile_options(/MP)
+        # Enforce strict __cplusplus version
+        add_compile_options(/Zc:__cplusplus)
     endif()
 endif()
 

Dependencies/Utility/CMakeLists.txt

@@ -0,0 +1,3 @@
+add_library(gz_utility INTERFACE)
+
+target_include_directories(gz_utility INTERFACE ".")

Dependencies/Utility/Utility/CppMacros.h

@@ -0,0 +1,10 @@
+// TheSuperHackers
+// This file contains macros to help upgrade the code for newer cpp standards.
+
+#pragma once
+
+#if __cplusplus >= 201703L
+#define NOEXCEPT_17 noexcept
+#else
+#define NOEXCEPT_17
+#endif

GeneralsMD/Code/GameEngine/CMakeLists.txt

@@ -1165,6 +1165,7 @@ target_link_libraries(z_gameengine PUBLIC
     d3d8lib
     gamespy::gamespy
     gz_config
+    gz_utility
     stlport
     z_browserdispatch
     z_compression

GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h

@@ -51,6 +51,7 @@
 #include <Common/GameMemory.h>
 #include "EABrowserDispatch/BrowserDispatch.h"
 #include "FEBDispatch.h"
+#include <Utility/CppMacros.h>
 
 class GameWindow;
 
@@ -112,9 +113,9 @@ class WebBrowser :
 	// IUnknown methods
 	//---------------------------------------------------------------------------
 	protected:
-		HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
-		ULONG STDMETHODCALLTYPE AddRef(void);
-		ULONG STDMETHODCALLTYPE Release(void);
+		HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) NOEXCEPT_17;
+		ULONG STDMETHODCALLTYPE AddRef(void) NOEXCEPT_17;
+		ULONG STDMETHODCALLTYPE Release(void) NOEXCEPT_17;
 
 	//---------------------------------------------------------------------------
 	// IBrowserDispatch methods

GeneralsMD/Code/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp

@@ -237,7 +237,7 @@ WebBrowserURL * WebBrowser::makeNewURL(AsciiString tag)
 *
 ******************************************************************************/
 
-STDMETHODIMP WebBrowser::QueryInterface(REFIID iid, void** ppv)
+STDMETHODIMP WebBrowser::QueryInterface(REFIID iid, void** ppv) NOEXCEPT_17
 {
 	*ppv = NULL;
 
@@ -270,7 +270,7 @@ STDMETHODIMP WebBrowser::QueryInterface(REFIID iid, void** ppv)
 *
 ******************************************************************************/
 
-ULONG STDMETHODCALLTYPE WebBrowser::AddRef(void)
+ULONG STDMETHODCALLTYPE WebBrowser::AddRef(void) NOEXCEPT_17
 {
 	return ++mRefCount;
 }
@@ -290,7 +290,7 @@ ULONG STDMETHODCALLTYPE WebBrowser::AddRef(void)
 *
 ******************************************************************************/
 
-ULONG STDMETHODCALLTYPE WebBrowser::Release(void)
+ULONG STDMETHODCALLTYPE WebBrowser::Release(void) NOEXCEPT_17
 {
 	DEBUG_ASSERTCRASH(mRefCount > 0, ("Negative reference count"));
 	--mRefCount;

GeneralsMD/Code/Libraries/Source/WWVegas/CMakeLists.txt

@@ -9,6 +9,7 @@ target_compile_definitions(z_wwcommon INTERFACE
 target_link_libraries(z_wwcommon INTERFACE
     d3d8lib
     gz_config
+    gz_utility
     milesstub
     stlport
 )