Merge pull request #85 from ahamez/master

Avoid warning with Xcode's clang
nlohmann · Jun 8, 2015 · d3b0f20 · d3b0f20
2 parents adc065d + f17733b
commit d3b0f20
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c
@@ -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;
  }