Skip to content

Fix multiply defined symbols. #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lefticus merged 2 commits into from Dec 30, 2015
Merged

Fix multiply defined symbols. #232

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c249bef
Fix multiply defined symbols.
raptorfactor Dec 26, 2015
e60eabb
Fix another multiply defined symbol.
raptorfactor Dec 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions include/chaiscript/utility/json.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,22 +421,22 @@ class JSON
Class Type;
};

JSON Array() {
inline JSON Array() {
return JSON::Make( JSON::Class::Array );
}

template <typename... T>
JSON Array( T... args ) {
inline JSON Array( T... args ) {
JSON arr = JSON::Make( JSON::Class::Array );
arr.append( args... );
return arr;
}

JSON Object() {
inline JSON 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();
return os;
}
Expand Down Expand Up @@ -636,7 +636,7 @@ namespace {
}
}

JSON JSON::Load( const string &str ) {
inline JSON JSON::Load( const string &str ) {
size_t offset = 0;
return parse_next( str, offset );
}
Expand Down