Merge pull request #191 from cortex-command-community/C++17

garethyr · web-flow · commit 5d05e5ceb002 · 2020-09-09T20:08:14.000-03:00
C++17
diff --git a/Activities/GameActivity.h b/Activities/GameActivity.h
@@ -951,9 +951,7 @@ class GameActivity:
 
 
     // Comparison functor for sorting objective points by their y pos using STL's sort
-    struct ObjPointYPosComparison:
-        public std::binary_function<ObjectivePoint &, ObjectivePoint &, bool>
-    {
+    struct ObjPointYPosComparison {
         bool operator()(ObjectivePoint &rhs, ObjectivePoint &lhs) { return rhs.m_ScenePos.m_Y < lhs.m_ScenePos.m_Y; }
     };
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -137,6 +137,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Changed
 
+- Codebase now uses the C++17 standard.
+
 - Updated game framework from Allegro 4.2.3.1 to Allegro 4.4.3.1.
 
 - Major cleanup and reformatting in the `Managers` folder.
diff --git a/Main.cpp b/Main.cpp
@@ -1802,7 +1802,7 @@ int main(int argc, char *argv[]) {
 	InitMainMenu();
 
 	std::string screenshotSaveDir = g_System.GetWorkingDirectory() + "/" + c_ScreenshotDirectory;
-	if (!std::experimental::filesystem::exists(screenshotSaveDir)) { g_System.MakeDirectory(screenshotSaveDir); }
+	if (!std::filesystem::exists(screenshotSaveDir)) { g_System.MakeDirectory(screenshotSaveDir); }
 
 	if (g_ConsoleMan.LoadWarningsExist()) {
 		g_ConsoleMan.PrintString("WARNING: References to files that could not be located or failed to load detected during module loading!\nSee \"LoadWarningLog.txt\" for a list of bad references.");
@@ -1811,7 +1811,7 @@ int main(int argc, char *argv[]) {
 		g_ConsoleMan.SetEnabled(true);
 	} else {
 		// Delete an existing log if there are no warnings so there's less junk in the root folder.
-		if (std::experimental::filesystem::exists(g_System.GetWorkingDirectory() + "/LogLoadingWarning.txt")) { std::remove("LogLoadingWarning.txt"); }
+		if (std::filesystem::exists(g_System.GetWorkingDirectory() + "/LogLoadingWarning.txt")) { std::remove("LogLoadingWarning.txt"); }
 	}
 
     if (!g_NetworkServer.IsServerModeEnabled()) {
diff --git a/Managers/FrameMan.cpp b/Managers/FrameMan.cpp
@@ -660,7 +660,7 @@ namespace RTE {
 			// Check for the file namebase001.bmp; if it exists, try 002, etc.
 			char *fileExtension = { (modeToSave == SaveBitmapMode::SingleBitmap || modeToSave == SaveBitmapMode::ScenePreviewDump) ? ".bmp" : ".png" };
 			sprintf_s(fullFileName, sizeof(fullFileName), "%s/%s%03i%s", c_ScreenshotDirectory, nameBase, fileNumber++, fileExtension);
-			if (!std::experimental::filesystem::exists(fullFileName)) {
+			if (!std::filesystem::exists(fullFileName)) {
 				break;
 			}
 		}
diff --git a/Managers/MovableMan.cpp b/Managers/MovableMan.cpp
@@ -31,9 +31,7 @@ const string MovableMan::m_ClassName = "MovableMan";
 
 
 // Comparison functor for sorting movable objects by their X position using STL's sort
-struct MOXPosComparison:
-    public std::binary_function<MovableObject *, MovableObject *, bool>
-{
+struct MOXPosComparison {
     bool operator()(MovableObject *pRhs, MovableObject *pLhs) { return pRhs->GetPos().m_X < pLhs->GetPos().m_X; }
 };
 
@@ -1862,7 +1860,7 @@ void MovableMan::Update()
 
         // DEATH //////////////////////////////////////////////////////////
         // Transfer dead actors from Actor list to particle list
-        aIt = partition(m_Actors.begin(), m_Actors.end(), std::not1(std::mem_fun(&Actor::IsDead)));
+        aIt = partition(m_Actors.begin(), m_Actors.end(), std::not_fn(std::mem_fn(&Actor::IsDead)));
         amidIt = aIt;
 
         // Move dead Actor to particles list
@@ -1889,7 +1887,7 @@ void MovableMan::Update()
 
         // ITEM SETTLE //////////////////////////////////////////////////////////
         // Transfer excess items to particle list - use stable partition, item orde is important
-        iIt = stable_partition(m_Items.begin(), m_Items.end(), std::not1(std::mem_fun(&MovableObject::ToSettle)));
+        iIt = stable_partition(m_Items.begin(), m_Items.end(), std::not_fn(std::mem_fn(&MovableObject::ToSettle)));
         imidIt = iIt;
 
         // Move force-settled items to particles list
@@ -1909,7 +1907,7 @@ void MovableMan::Update()
         // DELETE //////////////////////////////////////////////////////////
         // Only delete after all travels & updates are done
         // Actors
-        aIt = partition(m_Actors.begin(), m_Actors.end(), std::not1(std::mem_fun(&MovableObject::ToDelete)));
+        aIt = partition(m_Actors.begin(), m_Actors.end(), std::not_fn(std::mem_fn(&MovableObject::ToDelete)));
         amidIt = aIt;
 
         while (aIt != m_Actors.end())
@@ -1938,15 +1936,15 @@ void MovableMan::Update()
         m_Actors.erase(amidIt, m_Actors.end());
 
         // Items
-        iIt = stable_partition(m_Items.begin(), m_Items.end(), std::not1(std::mem_fun(&MovableObject::ToDelete)));
+        iIt = stable_partition(m_Items.begin(), m_Items.end(), std::not_fn(std::mem_fn(&MovableObject::ToDelete)));
         imidIt = iIt;
 
         while (iIt != m_Items.end())
             delete *(iIt++);
         m_Items.erase(imidIt, m_Items.end());
 
         // Particles
-        parIt = partition(m_Particles.begin(), m_Particles.end(), std::not1(std::mem_fun(&MovableObject::ToDelete)));
+        parIt = partition(m_Particles.begin(), m_Particles.end(), std::not_fn(std::mem_fn(&MovableObject::ToDelete)));
         midIt = parIt;
 
         while (parIt != m_Particles.end())
@@ -1958,7 +1956,7 @@ void MovableMan::Update()
     // Only settle after all updates and deletions are done
     if (m_SettlingEnabled)
     {
-        parIt = partition(m_Particles.begin(), m_Particles.end(), std::not1(std::mem_fun(&MovableObject::ToSettle)));
+        parIt = partition(m_Particles.begin(), m_Particles.end(), std::not_fn(std::mem_fn(&MovableObject::ToSettle)));
         midIt = parIt;
 
         while (parIt != m_Particles.end())
diff --git a/Menus/BuyMenuGUI.cpp b/Menus/BuyMenuGUI.cpp
@@ -1876,7 +1876,7 @@ void BuyMenuGUI::CategoryChange(bool focusOnCategoryTabs)
                     pItemBitmap = pModule->GetIcon() ? new AllegroBitmap(pModule->GetIcon()) : 0;
                     // Passing in ownership of the bitmap, making uppercase the name
                     string name = pModule->GetFriendlyName();
-                    transform(name.begin(), name.end(), name.begin(), std::pointer_to_unary_function<int, int>(toupper));
+                    transform(name.begin(), name.end(), name.begin(), ::toupper);
                     m_pShopList->AddItem(name, m_aExpandedModules[moduleID] ? "-" : "+", pItemBitmap, 0, moduleID);
                 }
 
diff --git a/Menus/LoadingGUI.cpp b/Menus/LoadingGUI.cpp
@@ -195,7 +195,7 @@ namespace RTE {
 					if (slashPos) { *(++slashPos) = 0; }
 
 					// If that file's directory doesn't exist yet, then create it, and all its parent directories above if need be
-					for (int nested = 0; !std::experimental::filesystem::exists(outputDirName) && slashPos; ++nested) {
+					for (int nested = 0; !std::filesystem::exists(outputDirName) && slashPos; ++nested) {
 						// Keep making new working copies of the path that we can dice up
 						strcpy_s(parentDirName, sizeof(parentDirName), outputDirName[0] == '.' ? &(outputDirName[2]) : outputDirName);
 						// Start off at the beginning
@@ -224,7 +224,7 @@ namespace RTE {
 					} else {
 						// Validate so only certain file types are extracted:  .ini .txt .lua .cfg .bmp .png .jpg .jpeg .wav .ogg .mp3
 						// Get the file extension
-						std::string fileExtension = std::experimental::filesystem::path(outputFileName).extension().string();
+						std::string fileExtension = std::filesystem::path(outputFileName).extension().string();
 						std::transform(fileExtension.begin(), fileExtension.end(), fileExtension.begin(), ::tolower);
 						const char *ext = fileExtension.c_str();
 						// Validate only certain file types to be included! .ini .txt .lua .cfg .bmp .png .jpg .jpeg .wav .ogg .mp3
diff --git a/Menus/ObjectPickerGUI.cpp b/Menus/ObjectPickerGUI.cpp
@@ -1279,7 +1279,7 @@ void ObjectPickerGUI::UpdateObjectsList(bool selectTop)
                     pItemBitmap = pModule->GetIcon() ? new AllegroBitmap(pModule->GetIcon()) : 0;
                     // Passing in ownership of the bitmap, making uppercase the name
                     string name = pModule->GetFriendlyName();
-                    transform(name.begin(), name.end(), name.begin(), std::pointer_to_unary_function<int, int>(toupper));
+                    transform(name.begin(), name.end(), name.begin(), ::toupper);
                     m_pObjectsList->AddItem(name, m_aExpandedModules[moduleID] ? "-" : "+", pItemBitmap, 0, moduleID);
                 }
 
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ First you need to download the necessary files:
 
 1. Install the necessary tools.  
 You'll probably want [Visual Studio Community Edition](https://visualstudio.microsoft.com/downloads/) (we mostly use 2017 but 2019 should be fine).  
-You also need to have [Visual C++ Redistributable for Visual Studio 2015 (x86)](https://www.microsoft.com/en-us/download/confirmation.aspx?id=48145&6B49FDFB-8E5B-4B07-BC31-15695C5A2143=1) installed in order to run the compiled builds.  
+You also need to have [Visual C++ Redistributable for Visual Studio 2017 (x86)](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) installed in order to run the compiled builds.  
 You may also want to check out the list of recommended Visual Studio plugins [here](https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/wiki/Information,-Recommended-Plugins-and-Useful-Links).
 
 2. Clone this Source Repository and the [Data Repository](https://github.com/cortex-command-community/Cortex-Command-Community-Project-Data) in neighboring folders.  
diff --git a/RTEA.vcxproj b/RTEA.vcxproj
@@ -93,7 +93,7 @@
       <ForcedIncludeFiles>%(ForcedIncludeFiles);StandardIncludes.h;</ForcedIncludeFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PrecompiledHeaderFile>StandardIncludes.h</PrecompiledHeaderFile>
-      <LanguageStandard>stdcpp14</LanguageStandard>
+      <LanguageStandard>stdcpp17</LanguageStandard>
       <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>
     <Link>
@@ -138,7 +138,7 @@
       <ForcedIncludeFiles>%(ForcedIncludeFiles);StandardIncludes.h;</ForcedIncludeFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PrecompiledHeaderFile>StandardIncludes.h</PrecompiledHeaderFile>
-      <LanguageStandard>stdcpp14</LanguageStandard>
+      <LanguageStandard>stdcpp17</LanguageStandard>
       <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>
     <Link>
@@ -191,7 +191,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PrecompiledHeaderFile>StandardIncludes.h</PrecompiledHeaderFile>
-      <LanguageStandard>stdcpp14</LanguageStandard>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;ole32.lib;dinput8.lib;ddraw.lib;dxguid.lib;winmm.lib;dsound.lib;ws2_32.lib;legacy_stdio_definitions.lib;zlibwapi.lib;libpng16_static.lib;liblz4.lib;fmod_vc.lib;alleg.lib;loadpng.lib;lua51.lib;luabind.x86.release.lib;RakNet_LibStatic_Release_Win32.lib;libboost_thread-vc141-mt-x32-1_55.lib;libboost_date_time-vc141-mt-x32-1_55.lib;libboost_system-vc141-mt-x32-1_55.lib;libboost_chrono-vc141-mt-x32-1_55.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/System/ContentFile.cpp b/System/ContentFile.cpp
@@ -83,7 +83,7 @@ namespace RTE {
 
 	void ContentFile::SetDataPath(const std::string &newDataPath) {
 		m_DataPath = newDataPath;
-		m_DataPathExtension = std::experimental::filesystem::path(newDataPath).extension().string();
+		m_DataPathExtension = std::filesystem::path(newDataPath).extension().string();
 
 		RTEAssert(!m_DataPathExtension.empty(), "Failed to find file extension when trying to find file with path and name:\n\n" + m_DataPath + "\n" + GetFormattedReaderPosition());
 
@@ -155,15 +155,15 @@ namespace RTE {
 		SetFormattedReaderPosition(GetFormattedReaderPosition());
 		const std::string altFileExtension = (m_DataPathExtension == ".png") ? ".bmp" : ".png";
 
-		if (!std::experimental::filesystem::exists(m_DataPath)) {
+		if (!std::filesystem::exists(m_DataPath)) {
 			// Check for 000 in the file name in case it is part of an animation but the FrameCount was set to 1. Do not warn about this because it's normal operation.
-			if (std::experimental::filesystem::exists(m_DataPathWithoutExtension + "000" + m_DataPathExtension)) {
+			if (std::filesystem::exists(m_DataPathWithoutExtension + "000" + m_DataPathExtension)) {
 				SetDataPath(m_DataPathWithoutExtension + "000" + m_DataPathExtension);
 			} else {
-				if (std::experimental::filesystem::exists(m_DataPathWithoutExtension + altFileExtension)) {
+				if (std::filesystem::exists(m_DataPathWithoutExtension + altFileExtension)) {
 					g_ConsoleMan.AddLoadWarningLogEntry(m_DataPath, m_FormattedReaderPosition, altFileExtension);
 					SetDataPath(m_DataPathWithoutExtension + altFileExtension);
-				} else if (std::experimental::filesystem::exists(m_DataPathWithoutExtension + "000" + altFileExtension)) {
+				} else if (std::filesystem::exists(m_DataPathWithoutExtension + "000" + altFileExtension)) {
 					g_ConsoleMan.AddLoadWarningLogEntry(m_DataPath, m_FormattedReaderPosition, altFileExtension);
 					SetDataPath(m_DataPathWithoutExtension + "000" + altFileExtension);
 				} else {
@@ -211,8 +211,8 @@ namespace RTE {
 		}
 		const std::string altFileExtension = (m_DataPathExtension == ".wav") ? ".ogg" : ".wav";
 
-		if (!std::experimental::filesystem::exists(m_DataPath)) {
-			if (std::experimental::filesystem::exists(m_DataPathWithoutExtension + altFileExtension)) {
+		if (!std::filesystem::exists(m_DataPath)) {
+			if (std::filesystem::exists(m_DataPathWithoutExtension + altFileExtension)) {
 				g_ConsoleMan.AddLoadWarningLogEntry(m_DataPath, m_FormattedReaderPosition, altFileExtension);
 				SetDataPath(m_DataPathWithoutExtension + altFileExtension);
 			} else {
diff --git a/System/DataModule.cpp b/System/DataModule.cpp
@@ -47,9 +47,9 @@ namespace RTE {
 		std::string mergedIndexPath(m_FileName + "/MergedIndex.ini");
 
 		// NOTE: This looks for the MergedIndex.ini generated by the index merger tool. The tool is mostly superseded by disabling loading visuals, but still provides some benefit.
-		if (std::experimental::filesystem::exists(mergedIndexPath.c_str())) { indexPath = mergedIndexPath; }
+		if (std::filesystem::exists(mergedIndexPath.c_str())) { indexPath = mergedIndexPath; }
 
-		if (std::experimental::filesystem::exists(indexPath.c_str()) && reader.Create(indexPath.c_str(), true, progressCallback) >= 0) {
+		if (std::filesystem::exists(indexPath.c_str()) && reader.Create(indexPath.c_str(), true, progressCallback) >= 0) {
 			int result = Serializable::Create(reader);
 
 			// Print an empty line to separate the end of a module from the beginning of the next one in the loading progress log.
@@ -67,7 +67,7 @@ namespace RTE {
 					// Make sure we're not adding Index.ini again
 					if (std::strlen(fileInfo.name) > 0 && std::string(fileInfo.name) != "Index.ini") {
 						std::string iniPath(m_FileName + "/" + fileInfo.name);
-						if (std::experimental::filesystem::exists(iniPath.c_str()) && iniReader.Create(iniPath.c_str(), false, progressCallback) >= 0) {
+						if (std::filesystem::exists(iniPath.c_str()) && iniReader.Create(iniPath.c_str(), false, progressCallback) >= 0) {
 							result = Serializable::Create(iniReader, false, true);
 
 							// Report loading result
@@ -115,7 +115,7 @@ namespace RTE {
 		Reader reader;
 		std::string indexPath(m_FileName + "/Index.ini");
 
-		if (std::experimental::filesystem::exists(indexPath.c_str()) && reader.Create(indexPath.c_str(), true, progressCallback) >= 0) {
+		if (std::filesystem::exists(indexPath.c_str()) && reader.Create(indexPath.c_str(), true, progressCallback) >= 0) {
 			reader.SetSkipIncludes(true);
 			int result = Serializable::Create(reader);
 			return result;
diff --git a/System/StandardIncludes.h b/System/StandardIncludes.h
@@ -1,6 +1,9 @@
 #ifndef _RTEINCLUDES_
 #define _RTEINCLUDES_
 
+// This restores features removed from the C++17 standard (auto_ptr and some other stuff). This is needed for LuaBind to work because it relies on it heavily.
+#define _HAS_AUTO_PTR_ETC 1
+
 // Inclusion of relevant C++ Standard Library headers.
 #include <cstdlib>
 #include <cstdarg>
@@ -32,8 +35,7 @@
 #include <limits>
 #include <random>
 #include <array>
-// TODO: don't forget to replace with <filesystem> when eventually enable ++17 standard.
-#include <experimental/filesystem>
+#include <filesystem>
 
 // TODO: Get rid of these once alias qualifiers are added.
 using std::string;

Original file line number	Diff line number	Diff line change
`@@ -660,7 +660,7 @@ namespace RTE {`
`660`	`660`	`// Check for the file namebase001.bmp; if it exists, try 002, etc.`
`661`	`661`	`char *fileExtension = { (modeToSave == SaveBitmapMode::SingleBitmap \|\| modeToSave == SaveBitmapMode::ScenePreviewDump) ? ".bmp" : ".png" };`
`662`	`662`	`sprintf_s(fullFileName, sizeof(fullFileName), "%s/%s%03i%s", c_ScreenshotDirectory, nameBase, fileNumber++, fileExtension);`
`663`		`- if (!std::experimental::filesystem::exists(fullFileName)) {`
	`663`	`+ if (!std::filesystem::exists(fullFileName)) {`
`664`	`664`	`break;`
`665`	`665`	`}`
`666`	`666`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1876,7 +1876,7 @@ void BuyMenuGUI::CategoryChange(bool focusOnCategoryTabs)`
`1876`	`1876`	`pItemBitmap = pModule->GetIcon() ? new AllegroBitmap(pModule->GetIcon()) : 0;`
`1877`	`1877`	`// Passing in ownership of the bitmap, making uppercase the name`
`1878`	`1878`	`string name = pModule->GetFriendlyName();`
`1879`		`- transform(name.begin(), name.end(), name.begin(), std::pointer_to_unary_function<int, int>(toupper));`
	`1879`	`+ transform(name.begin(), name.end(), name.begin(), ::toupper);`
`1880`	`1880`	`m_pShopList->AddItem(name, m_aExpandedModules[moduleID] ? "-" : "+", pItemBitmap, 0, moduleID);`
`1881`	`1881`	`}`
`1882`	`1882`
Original file line number	Diff line number	Diff line change
`@@ -1279,7 +1279,7 @@ void ObjectPickerGUI::UpdateObjectsList(bool selectTop)`
`1279`	`1279`	`pItemBitmap = pModule->GetIcon() ? new AllegroBitmap(pModule->GetIcon()) : 0;`
`1280`	`1280`	`// Passing in ownership of the bitmap, making uppercase the name`
`1281`	`1281`	`string name = pModule->GetFriendlyName();`
`1282`		`- transform(name.begin(), name.end(), name.begin(), std::pointer_to_unary_function<int, int>(toupper));`
	`1282`	`+ transform(name.begin(), name.end(), name.begin(), ::toupper);`
`1283`	`1283`	`m_pObjectsList->AddItem(name, m_aExpandedModules[moduleID] ? "-" : "+", pItemBitmap, 0, moduleID);`
`1284`	`1284`	`}`
`1285`	`1285`