diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index ee0dd98742..bc9606b2ee 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -1118,7 +1118,6 @@ F76C837B1EC4E7CC00FA49E2 /* Console.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Console.hpp; sourceTree = ""; }; F76C837C1EC4E7CC00FA49E2 /* Diagnostics.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Diagnostics.cpp; sourceTree = ""; }; F76C837D1EC4E7CC00FA49E2 /* Diagnostics.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Diagnostics.hpp; sourceTree = ""; }; - F76C837E1EC4E7CC00FA49E2 /* Exception.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Exception.hpp; sourceTree = ""; }; F76C837F1EC4E7CC00FA49E2 /* File.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = File.cpp; sourceTree = ""; }; F76C83801EC4E7CC00FA49E2 /* File.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = File.h; sourceTree = ""; }; F76C83811EC4E7CC00FA49E2 /* FileScanner.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FileScanner.cpp; sourceTree = ""; }; @@ -1942,7 +1941,6 @@ F76C837C1EC4E7CC00FA49E2 /* Diagnostics.cpp */, F76C837D1EC4E7CC00FA49E2 /* Diagnostics.hpp */, C6352B831F477022006CCEE3 /* Endianness.h */, - F76C837E1EC4E7CC00FA49E2 /* Exception.hpp */, F76C837F1EC4E7CC00FA49E2 /* File.cpp */, F76C83801EC4E7CC00FA49E2 /* File.h */, F76C83811EC4E7CC00FA49E2 /* FileScanner.cpp */, diff --git a/src/openrct2/core/Json.hpp b/src/openrct2/core/Json.hpp index f31f22a2ea..3264d446fb 100644 --- a/src/openrct2/core/Json.hpp +++ b/src/openrct2/core/Json.hpp @@ -17,6 +17,7 @@ #pragma once #include +#include #include #include "../common.h" @@ -38,7 +39,7 @@ private: public: explicit JsonException(const std::string &message) : std::runtime_error(message) { } - explicit JsonException(const json_error_t * jsonError) : JsonException(jsonError->text) + explicit JsonException(const json_error_t * jsonError) : JsonException(std::string(jsonError->text)) { _jsonError = *jsonError; }