mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix compilation on Xcode

This commit is contained in:
Michael Steenbeek 2018-01-05 19:47:41 +01:00
parent 02c58a6c5a
commit 6450cce829
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRCT2.xcodeproj/project.pbxproj
View File

@ -1118,7 +1118,6 @@
F76C837B1EC4E7CC00FA49E2 /* Console.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Console.hpp; sourceTree = "<group>"; };
F76C837C1EC4E7CC00FA49E2 /* Diagnostics.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Diagnostics.cpp; sourceTree = "<group>"; };
F76C837D1EC4E7CC00FA49E2 /* Diagnostics.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Diagnostics.hpp; sourceTree = "<group>"; };
F76C837E1EC4E7CC00FA49E2 /* Exception.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Exception.hpp; sourceTree = "<group>"; };
F76C837F1EC4E7CC00FA49E2 /* File.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = File.cpp; sourceTree = "<group>"; };
F76C83801EC4E7CC00FA49E2 /* File.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = File.h; sourceTree = "<group>"; };
F76C83811EC4E7CC00FA49E2 /* FileScanner.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FileScanner.cpp; sourceTree = "<group>"; };
@ -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 */,

3
src/openrct2/core/Json.hpp
View File

@ -17,6 +17,7 @@
#pragma once
#include <stdexcept>
#include <string>
#include <jansson.h>
#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;
}