diff options
author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2015-06-07 22:11:30 +0200 |
---|---|---|
committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2015-06-07 22:11:30 +0200 |
commit | 441ff982764017c26ae2b1ae474e5ac91f3a1d7c (patch) | |
tree | 142b5ad27b69f0ba8393f80089ffbd28d3ede991 /src | |
parent | 375e935324f0d0c63089fe7dc6d1c10d61a599cd (diff) | |
download | manaserv-441ff982764017c26ae2b1ae474e5ac91f3a1d7c.tar.gz manaserv-441ff982764017c26ae2b1ae474e5ac91f3a1d7c.tar.bz2 manaserv-441ff982764017c26ae2b1ae474e5ac91f3a1d7c.tar.xz manaserv-441ff982764017c26ae2b1ae474e5ac91f3a1d7c.zip |
Fixing some compilation issues when using GCC 5.1
For whatever reason, GCC 5.1 no longer finds an operator<< overload
for streaming a std::ostringstream into a std::ostringstream.
Diffstat (limited to 'src')
-rw-r--r-- | src/account-server/storage.cpp | 2 | ||||
-rw-r--r-- | src/dal/sqlitedataprovider.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/account-server/storage.cpp b/src/account-server/storage.cpp index 656dfad9..fd9160d3 100644 --- a/src/account-server/storage.cpp +++ b/src/account-server/storage.cpp @@ -1948,7 +1948,7 @@ void Storage::syncDatabase() std::ostringstream errMsg; errMsg << "Item Manager: Error while loading item database" << "(" << DEFAULT_ITEM_FILE << ")!"; - LOG_ERROR(errMsg); + LOG_ERROR(errMsg.str()); return; } diff --git a/src/dal/sqlitedataprovider.cpp b/src/dal/sqlitedataprovider.cpp index 2a08e9be..73df8f76 100644 --- a/src/dal/sqlitedataprovider.cpp +++ b/src/dal/sqlitedataprovider.cpp @@ -232,7 +232,7 @@ void SqLiteDataProvider::beginTransaction() { std::ostringstream error; error << "SQL ERROR while trying to start a transaction: " << e.what(); - LOG_ERROR(error); + LOG_ERROR(error.str()); throw std::runtime_error(error.str()); } } @@ -266,7 +266,7 @@ void SqLiteDataProvider::commitTransaction() { std::ostringstream error; error << "SQL ERROR while trying to commit a transaction: " << e.what(); - LOG_ERROR(error); + LOG_ERROR(error.str()); throw std::runtime_error(error.str()); } } @@ -300,7 +300,7 @@ void SqLiteDataProvider::rollbackTransaction() { std::ostringstream error; error << "SQL ERROR while trying to rollback a transaction: " << e.what(); - LOG_ERROR(error); + LOG_ERROR(error.str()); throw std::runtime_error(error.str()); } } |