haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-02 20:36:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #85 from ahamez/master

Browse source 
Avoid warning with Xcode's clang
This commit is contained in:
Niels 2015-06-08 16:32:37 +02:00
parent adc065d328 f17733b859
commit d3b0f207b0
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/json.hpp.re2c
View file

@ -1983,15 +1983,14 @@ class basic_json
o.width(0);
// do the actual serialization
j.dump(o, prettyPrint, indentation);
j.dump(o, prettyPrint, static_cast<int>(indentation));
return o;
}
/// serialize to stream
friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
{
o << j;
return o;
return o << j;
}