generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #232 from RaptorFactor/develop

Browse Source 
Fix multiply defined symbols.
This commit is contained in:
Jason Turner 2015-12-30 13:09:57 -07:00
commit e638d450ed
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/chaiscript/utility/json.hpp
View File

@ -421,22 +421,22 @@ class JSON
Class Type; Class Type;
}; };
JSON Array() { inline JSON Array() {
return JSON::Make( JSON::Class::Array ); return JSON::Make( JSON::Class::Array );
} }
template <typename... T> template <typename... T>
JSON Array( T... args ) { inline JSON Array( T... args ) {
JSON arr = JSON::Make( JSON::Class::Array ); JSON arr = JSON::Make( JSON::Class::Array );
arr.append( args... ); arr.append( args... );
return arr; return arr;
} }
JSON Object() { inline JSON Object() {
return JSON::Make( JSON::Class::Object ); return JSON::Make( JSON::Class::Object );
} }
std::ostream& operator<<( std::ostream &os, const JSON &json ) { inline std::ostream& operator<<( std::ostream &os, const JSON &json ) {
os << json.dump(); os << json.dump();
return os; return os;
} }
@ -636,7 +636,7 @@ namespace {
} }
} }
JSON JSON::Load( const string &str ) { inline JSON JSON::Load( const string &str ) {
size_t offset = 0; size_t offset = 0;
return parse_next( str, offset ); return parse_next( str, offset );
} }