From 015a9f4dc89dec52ee0edda050e110074c2f71f0 Mon Sep 17 00:00:00 2001 From: Calvin Balke Date: Wed, 6 Jul 2016 18:38:32 -0700 Subject: [PATCH] Updated to Visual C++ 2015 but kept old vcxproj files --- CommonAPI/Common/source/DXAPI/Move.cpp | 1 + Mod Sources/TSExtension/TSExtension/source/DXConCmds.cpp | 7 ++++--- .../TSExtension/TSExtension/source/DXTCPObjects.cpp | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CommonAPI/Common/source/DXAPI/Move.cpp b/CommonAPI/Common/source/DXAPI/Move.cpp index f5464eb..be50176 100644 --- a/CommonAPI/Common/source/DXAPI/Move.cpp +++ b/CommonAPI/Common/source/DXAPI/Move.cpp @@ -1,3 +1,4 @@ +#include #include #define M_PI 3.14159265358979323846 #define M_2PI 6.28318530717958647692528676655900576 diff --git a/Mod Sources/TSExtension/TSExtension/source/DXConCmds.cpp b/Mod Sources/TSExtension/TSExtension/source/DXConCmds.cpp index 209c60b..d0dab2c 100644 --- a/Mod Sources/TSExtension/TSExtension/source/DXConCmds.cpp +++ b/Mod Sources/TSExtension/TSExtension/source/DXConCmds.cpp @@ -399,9 +399,9 @@ bool reMatch(Linker::SimObject* obj, S32 argc, const char* argv[]) try { std::smatch match; - + std::string tmps = std::string(argv[2]); std::regex sequence(argv[1], std::regex::extended); - std::regex_match(std::string(argv[2]), match, sequence); + std::regex_match(tmps, match, sequence); return !match.empty() && match.size() != 0; } @@ -421,7 +421,8 @@ bool reSearch(Linker::SimObject* obj, S32 argc, const char* argv[]) std::smatch match; std::regex sequence(argv[1], std::regex::extended); - std::regex_search(std::string(argv[2]), match, sequence); + std::string tmps = std::string(argv[2]); + std::regex_search(tmps, match, sequence); return !match.empty() && match.size() != 0; } diff --git a/Mod Sources/TSExtension/TSExtension/source/DXTCPObjects.cpp b/Mod Sources/TSExtension/TSExtension/source/DXTCPObjects.cpp index 0a2a0a2..c37ea3f 100644 --- a/Mod Sources/TSExtension/TSExtension/source/DXTCPObjects.cpp +++ b/Mod Sources/TSExtension/TSExtension/source/DXTCPObjects.cpp @@ -250,7 +250,7 @@ bool conTSExtensionUpdate(Linker::SimObject *obj, S32 argc, const char *argv[]) } connectionInfo->is_connected = false; - disconnections.insert(disconnections.end(), currentConnection.get()); + disconnections.insert(disconnections.end(), std::unique_ptr(currentConnection.get())); Con::errorf(0,"Got a send error! SimID: %u - Error %u", currentConnection->identifier, wsa_error); break; @@ -276,14 +276,14 @@ bool conTSExtensionUpdate(Linker::SimObject *obj, S32 argc, const char *argv[]) { Con::errorf(0, "Got an error! %u - SimID %u", currentError, currentConnection.get()->identifier); - disconnections.insert(disconnections.end(), currentConnection.get()); + disconnections.insert(disconnections.end(), std::unique_ptr(currentConnection.get())); } else if (data_length == 0) { Con::errorf(0, "Finished receiving?"); // Put us on the D/C list - disconnections.insert(disconnections.end(), currentConnection.get()); + disconnections.insert(disconnections.end(), std::unique_ptr(currentConnection.get())); // Stream the data into ::onLine unsigned int current_start = 0;