1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 12:33:17 +01:00

Fix the build for GCC

This commit is contained in:
Ted John
2019-10-27 17:19:35 +00:00
parent b3969cf1fe
commit a3351efd49
3 changed files with 15 additions and 4 deletions

View File

@@ -866,7 +866,10 @@ int32_t scenario_save(const utf8* path, int32_t flags)
class ParkFileImporter : public IParkImporter
{
private:
[[maybe_unused]] const IObjectRepository& _objectRepository;
#ifdef __clang__
[[maybe_unused]]
#endif
const IObjectRepository& _objectRepository;
std::unique_ptr<OpenRCT2::ParkFile> _parkFile;
public:

View File

@@ -253,9 +253,14 @@ namespace OpenRCT2
return v;
}
#if defined(_MSC_VER) || defined(__clang__)
template<> void ReadWrite(std::string_view& v) = delete;
#endif
template<> void ReadWrite(std::string& v)
#if defined(_MSC_VER) || defined(__clang__)
template<>
#endif
void ReadWrite(std::string& v)
{
if (_mode == Mode::READING)
{
@@ -280,7 +285,10 @@ namespace OpenRCT2
}
}
template<> void Write(const std::string_view& v)
#if defined(_MSC_VER) || defined(__clang__)
template<>
#endif
void Write(const std::string_view& v)
{
if (_mode == Mode::READING)
{

View File

@@ -1815,7 +1815,7 @@ enum : uint32_t
* rct2: 0x006754F5
* @param flags bit 0: pack objects, 1: save as scenario
*/
int32_t scenario_save_old(const utf8* path, int32_t flags)
[[maybe_unused]] static int32_t scenario_save_old(const utf8* path, int32_t flags)
{
if (flags & S6_SAVE_FLAG_SCENARIO)
{