mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-03 18:07:53 +01:00
Code Issues Releases Wiki Activity

Remove Exception::GetMsg()

Browse Source 
We can undef any macro windows.h defines and interferes with our code base. In this case GetMessage
This commit is contained in:
Ted John
2016-09-08 21:37:12 +01:00
parent e4b53630ed
commit 91eb33255b
8 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/NetworkUser.cpp
View File

@@ -112,7 +112,7 @@ void NetworkUserManager::Load()
}
catch (Exception ex)
{
Console::Error::WriteLine("Failed to read %s as JSON. %s", path, ex.GetMsg());
Console::Error::WriteLine("Failed to read %s as JSON. %s", path, ex.GetMessage());
}
}
}

3
src/network/TcpSocket.cpp
View File

@@ -28,6 +28,7 @@
#include <winsock2.h>
#include <ws2tcpip.h>
#undef GetMessage
#define LAST_SOCKET_ERROR() WSAGetLastError()
#undef EWOULDBLOCK
#define EWOULDBLOCK WSAEWOULDBLOCK
@@ -321,7 +322,7 @@ public:
}
catch (Exception ex)
{
req->Socket->_error = std::string(ex.GetMsg());
req->Socket->_error = std::string(ex.GetMessage());
}
SDL_UnlockMutex(req->Socket->_connectMutex);

4
src/network/network.cpp
View File

@@ -291,7 +291,7 @@ bool Network::BeginServer(unsigned short port, const char* address)
}
catch (Exception ex)
{
Console::Error::WriteLine(ex.GetMsg());
Console::Error::WriteLine(ex.GetMessage());
Close();
return false;
}
@@ -754,7 +754,7 @@ void Network::LoadGroups()
try {
json = Json::ReadFromFile(path);
} catch (const Exception& e) {
log_error("Failed to read %s as JSON. Setting default groups. %s", path, e.GetMsg());
log_error("Failed to read %s as JSON. Setting default groups. %s", path, e.GetMessage());
// Hardcoded permission groups
SetupDefaultGroups();
return;