fix c++17 build errors with VS2019

chcg · chcg · commit eec85d0ea7b1 · 2021-12-27T13:16:56.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,7 @@
 *.opensdf
 *.VC.db
 BuildLog.htm
+packages/
 bin/
 obj/
 Debug/
diff --git a/PythonScript.Tests/stdafx.h b/PythonScript.Tests/stdafx.h
@@ -19,6 +19,7 @@
 #include <algorithm>
 #include <fstream>
 
+#include <boost/bind/bind.hpp>
 #include <boost/regex.hpp>
 #include <boost/python.hpp>
 
diff --git a/PythonScript.Tests/tests/TestMenuManager.cpp b/PythonScript.Tests/tests/TestMenuManager.cpp
@@ -218,7 +218,7 @@ TEST_P(MenuManagerFindMenuCommandTest, testFindOptionFindsCorrectOption) {
 }
 
 
-INSTANTIATE_TEST_CASE_P(findMenuCommand, MenuManagerFindMenuCommandTest,
+INSTANTIATE_TEST_SUITE_P(findMenuCommand, MenuManagerFindMenuCommandTest,
 	::testing::Values(MenuTestCase(L"File", L"Open", MENUID_FILE_OPEN),                     // First option
                       MenuTestCase(L"File", L"Close", MENUID_FILE_CLOSE),                   // First menu, middle option
                       MenuTestCase(L"Edit", L"Copy", MENUID_EDIT_COPY),                     // Mid menu, first option
@@ -245,7 +245,7 @@ TEST_P(MenuManagerFindPluginCommandTest, testFindPluginCommand) {
 }
     
 
-INSTANTIATE_TEST_CASE_P(findPluginMenuCommand, MenuManagerFindPluginCommandTest,
+INSTANTIATE_TEST_SUITE_P(findPluginMenuCommand, MenuManagerFindPluginCommandTest,
 	::testing::Values(MenuTestCase(L"XML Tools", L"About", MENUID_XMLTOOLS_ABOUT),                  // First plugin, last option
                       MenuTestCase(L"Second Plugin", L"About", MENUID_SECONDPLUGIN_ABOUT),          // Second plugin, repeated option name from other plugin
                       MenuTestCase(L"XML Tools", L"Recent 1", MENUID_XMLTOOLS_RECENT_1),            // First plugin, repeated option name from main menu
diff --git a/PythonScript/src/DynamicIDManager.h b/PythonScript/src/DynamicIDManager.h
@@ -41,7 +41,7 @@ class DynamicIDManager
 	bool inRange(idx_t id);
 
 private:
-	DynamicIDManager(); // default constructor disabled
+	DynamicIDManager() = delete; // default constructor disabled
 
 	// Methods
 	bool allocateIDs(size_t quantity, idx_t *start);
diff --git a/PythonScript/src/IDAllocator.h b/PythonScript/src/IDAllocator.h
@@ -5,6 +5,7 @@
 class IDAllocator
 {
 public:
+	virtual ~IDAllocator() = default;
 	virtual bool allocate(size_t quantity, idx_t *start) = 0;
 };
 
diff --git a/PythonScript/src/ProcessExecute.cpp b/PythonScript/src/ProcessExecute.cpp
@@ -26,7 +26,7 @@ ProcessExecute::~ProcessExecute()
 
 bool ProcessExecute::isWindowsNT()
 {
-	OSVERSIONINFO osv;
+	OSVERSIONINFO osv{};
 	osv.dwOSVersionInfoSize = sizeof(osv);
 	::GetVersionEx(&osv);
 	return (osv.dwPlatformId >= VER_PLATFORM_WIN32_NT);
@@ -42,18 +42,18 @@ DWORD ProcessExecute::execute(const TCHAR *commandLine, boost::python::object py
 		throw process_start_exception("stderr cannot be None");
 
 	// Create out, err, and in pipes (ignore in, initially)
-	SECURITY_DESCRIPTOR sd;
-	SECURITY_ATTRIBUTES sa;
+	SECURITY_DESCRIPTOR sd{};
+	SECURITY_ATTRIBUTES sa{};
 	process_start_exception exceptionThrown("");
 	
 	bool thrown = false;
 	
-	PipeReaderArgs stdoutReaderArgs;
-	PipeReaderArgs stderrReaderArgs;
+	PipeReaderArgs stdoutReaderArgs{};
+	PipeReaderArgs stderrReaderArgs{};
 	// Only used if spooling, but we need to delete it later.
 	TCHAR tmpFilename[MAX_PATH] = {0};
-	HANDLE hStdOutReadPipe, hStdOutWritePipe;
-	HANDLE hStdErrReadPipe, hStdErrWritePipe;
+	HANDLE hStdOutReadPipe = nullptr, hStdOutWritePipe = nullptr;
+	HANDLE hStdErrReadPipe = nullptr, hStdErrWritePipe = nullptr;
 
 	Py_BEGIN_ALLOW_THREADS
 	try
@@ -180,8 +180,8 @@ DWORD ProcessExecute::execute(const TCHAR *commandLine, boost::python::object py
 		::ZeroMemory( &pi, sizeof(PROCESS_INFORMATION) );
 	
 		size_t commandLineLength = _tcslen(commandLine) + 1;
-		// We use an auto_ptr here because of a potential early out due to an exception thrown.
-		std::auto_ptr<TCHAR> cmdLine(new TCHAR[commandLineLength]);
+		// We use an unique_ptr here because of a potential early out due to an exception thrown.
+		std::unique_ptr<TCHAR> cmdLine(new TCHAR[commandLineLength]);
 		_tcscpy_s(cmdLine.get(), commandLineLength, commandLine);
 		bool processStartSuccess;
 
@@ -283,7 +283,7 @@ DWORD WINAPI ProcessExecute::pipeReader(void *args)
 
 	DWORD bytesRead;
 	
-	char buffer[PIPE_READBUFSIZE];
+	char buffer[PIPE_READBUFSIZE]{};
 	BOOL processFinished = FALSE;
 
 	for(;;)

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ TEST_P(MenuManagerFindMenuCommandTest, testFindOptionFindsCorrectOption) {`
`218`	`218`	`}`
`219`	`219`
`220`	`220`
`221`		`-INSTANTIATE_TEST_CASE_P(findMenuCommand, MenuManagerFindMenuCommandTest,`
	`221`	`+INSTANTIATE_TEST_SUITE_P(findMenuCommand, MenuManagerFindMenuCommandTest,`
`222`	`222`	`::testing::Values(MenuTestCase(L"File", L"Open", MENUID_FILE_OPEN), // First option`
`223`	`223`	`MenuTestCase(L"File", L"Close", MENUID_FILE_CLOSE), // First menu, middle option`
`224`	`224`	`MenuTestCase(L"Edit", L"Copy", MENUID_EDIT_COPY), // Mid menu, first option`
`@@ -245,7 +245,7 @@ TEST_P(MenuManagerFindPluginCommandTest, testFindPluginCommand) {`
`245`	`245`	`}`
`246`	`246`
`247`	`247`
`248`		`-INSTANTIATE_TEST_CASE_P(findPluginMenuCommand, MenuManagerFindPluginCommandTest,`
	`248`	`+INSTANTIATE_TEST_SUITE_P(findPluginMenuCommand, MenuManagerFindPluginCommandTest,`
`249`	`249`	`::testing::Values(MenuTestCase(L"XML Tools", L"About", MENUID_XMLTOOLS_ABOUT), // First plugin, last option`
`250`	`250`	`MenuTestCase(L"Second Plugin", L"About", MENUID_SECONDPLUGIN_ABOUT), // Second plugin, repeated option name from other plugin`
`251`	`251`	`MenuTestCase(L"XML Tools", L"Recent 1", MENUID_XMLTOOLS_RECENT_1), // First plugin, repeated option name from main menu`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`class IDAllocator`
`6`	`6`	`{`
`7`	`7`	`public:`
	`8`	`+ virtual ~IDAllocator() = default;`
`8`	`9`	`virtual bool allocate(size_t quantity, idx_t *start) = 0;`
`9`	`10`	`};`
`10`	`11`