Commit d3b0f207 authored by Niels's avatar Niels

Merge pull request #85 from ahamez/master

Avoid warning with Xcode's clang
parents adc065d3 f17733b8
......@@ -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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment