CSSZombieEscape/demboyz
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed compilation of jsonfile on gcc/clang

Browse Source
This commit is contained in:
Jordan Cristiano 2015-08-31 22:16:06 -04:00
parent 4d4a751e75
commit efab1c3707
1 changed files with 45 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
demboyz/base/jsonfile.h
View File

@ -52,12 +52,13 @@ namespace base
FILE* m_fp; FILE* m_fp;
}; };
class JsonReaderObject; class JsonReaderObject
class JsonReaderIterator
{ {
public: public:
using JsonValue = rapidjson::GenericValue<rapidjson::ASCII<>>; using JsonValue = rapidjson::GenericValue<rapidjson::ASCII<>>;
class JsonReaderIterator
{
public: public:
explicit JsonReaderIterator(JsonValue* value, bool& hasReadError); explicit JsonReaderIterator(JsonValue* value, bool& hasReadError);
@ -73,9 +74,6 @@ namespace base
class JsonReaderArray class JsonReaderArray
{ {
public:
using JsonValue = rapidjson::GenericValue<rapidjson::ASCII<>>;
public: public:
explicit JsonReaderArray(JsonValue& value, bool& parseError); explicit JsonReaderArray(JsonValue& value, bool& parseError);
@ -101,11 +99,6 @@ namespace base
bool& m_hasReadError; bool& m_hasReadError;
}; };
class JsonReaderObject
{
public:
using JsonValue = rapidjson::GenericValue<rapidjson::ASCII<>>;
public: public:
explicit JsonReaderObject(JsonValue& value, bool& parseError); explicit JsonReaderObject(JsonValue& value, bool& parseError);
@ -132,6 +125,9 @@ namespace base
bool& m_hasReadError; bool& m_hasReadError;
}; };
using JsonReaderIterator = JsonReaderObject::JsonReaderIterator;
using JsonReaderArray = JsonReaderObject::JsonReaderArray;
class JsonReaderFile class JsonReaderFile
{ {
public: public: