mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-02 19:56:13 +01:00
Code Issues Releases Wiki Activity

Remove custom base Exception class

Browse Source
This commit is contained in:
Ted John
2018-01-02 19:23:22 +00:00
parent 61dfb3dac7
commit 02c58a6c5a
41 changed files with 143 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/FileClassifier.cpp
View File

@@ -34,7 +34,7 @@ bool TryClassifyFile(const std::string &path, ClassifiedFileInfo * result)
auto fs = FileStream(path, FILE_MODE_OPEN);
return TryClassifyFile(&fs, result);
}
catch (Exception)
catch (const std::exception &)
{
return false;
}
@@ -87,10 +87,10 @@ static bool TryClassifyAsS6(IStream * stream, ClassifiedFileInfo * result)
result->Version = s6Header.version;
success = true;
}
catch (const Exception& e)
catch (const std::exception &e)
{
// Exceptions are likely to occur if file is not S6 format
log_verbose(e.GetMessage());
log_verbose(e.what());
}
stream->SetPosition(originalPosition);
return success;
@@ -123,9 +123,9 @@ static bool TryClassifyAsS4(IStream * stream, ClassifiedFileInfo * result)
success = true;
}
}
catch (const Exception& e)
catch (const std::exception &e)
{
Console::Error::WriteLine(e.GetMessage());
Console::Error::WriteLine(e.what());
}
stream->SetPosition(originalPosition);
@@ -158,9 +158,9 @@ static bool TryClassifyAsTD4_TD6(IStream * stream, ClassifiedFileInfo * result)
}
}
}
catch (const Exception& e)
catch (const std::exception& e)
{
Console::Error::WriteLine(e.GetMessage());
Console::Error::WriteLine(e.what());
}
return success;