Merge pull request #85 from ahamez/master
Avoid warning with Xcode's clang
This commit is contained in:
commit
d3b0f207b0
1 changed files with 2 additions and 3 deletions
|
@ -1983,15 +1983,14 @@ class basic_json
|
||||||
o.width(0);
|
o.width(0);
|
||||||
|
|
||||||
// do the actual serialization
|
// do the actual serialization
|
||||||
j.dump(o, prettyPrint, indentation);
|
j.dump(o, prettyPrint, static_cast<int>(indentation));
|
||||||
return o;
|
return o;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// serialize to stream
|
/// serialize to stream
|
||||||
friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
|
friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
|
||||||
{
|
{
|
||||||
o << j;
|
return o << j;
|
||||||
return o;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue