Add makeCharReader function to deprecated newCharReader

doc/jsoncpp.dox

@@ -116,7 +116,7 @@ CharReaders and StreamWriters are not thread-safe, but they are re-usable.
 \code
 Json::CharReaderBuilder rbuilder;
 cfg >> rbuilder.settings_;
-std::unique_ptr<Json::CharReader> const reader(rbuilder.newCharReader());
+std::unique_ptr<Json::CharReader> const reader = rbuilder.makeCharReader();
 reader->parse(start, stop, &value1, &errs);
 // ...
 reader->parse(start, stop, &value2, &errs);

include/json/reader.h

@@ -271,6 +271,7 @@ class JSON_API CharReader {
      * \throw std::exception if something goes wrong (e.g. invalid settings)
      */
     virtual CharReader* newCharReader() const = 0;
+    std::unique_ptr<CharReader> makeCharReader() const;
   }; // Factory
 };   // CharReader
 
@@ -337,8 +338,10 @@ class JSON_API CharReaderBuilder : public CharReader::Factory {
   CharReaderBuilder();
   ~CharReaderBuilder() override;
 
+  /*
+   * \deprecated Use makeCharReader.
+   */
   CharReader* newCharReader() const override;
-
   /** \return true if 'settings' are legal and consistent;
    *   otherwise, indicate bad settings via 'invalid'.
    */

src/lib_json/json_reader.cpp

@@ -608,7 +608,7 @@ bool Reader::decodeDouble(Token& token, Value& decoded) {
       value = -std::numeric_limits<double>::infinity();
     else if (!std::isinf(value))
       return addError(
-        "'" + String(token.start_, token.end_) + "' is not a number.", token);
+          "'" + String(token.start_, token.end_) + "' is not a number.", token);
   }
   decoded = value;
   return true;
@@ -1660,7 +1660,7 @@ bool OurReader::decodeDouble(Token& token, Value& decoded) {
       value = -std::numeric_limits<double>::infinity();
     else if (!std::isinf(value))
       return addError(
-        "'" + String(token.start_, token.end_) + "' is not a number.", token);
+          "'" + String(token.start_, token.end_) + "' is not a number.", token);
   }
   decoded = value;
   return true;
@@ -1872,6 +1872,10 @@ std::vector<OurReader::StructuredError> OurReader::getStructuredErrors() const {
   return allErrors;
 }
 
+std::unique_ptr<CharReader> CharReader::Factory::makeCharReader() const {
+  return std::unique_ptr<CharReader>(newCharReader());
+}
+
 class OurCharReader : public CharReader {
   bool const collectComments_;
   OurReader reader_;
@@ -1891,6 +1895,7 @@ class OurCharReader : public CharReader {
 
 CharReaderBuilder::CharReaderBuilder() { setDefaults(&settings_); }
 CharReaderBuilder::~CharReaderBuilder() = default;
+
 CharReader* CharReaderBuilder::newCharReader() const {
   bool collectComments = settings_["collectComments"].asBool();
   OurFeatures features = OurFeatures::all();

src/lib_json/json_writer.cpp

@@ -132,8 +132,9 @@ String valueToString(double value, bool useSpecialFloats,
   if (!isfinite(value)) {
     static const char* const reps[2][3] = {{"NaN", "-Infinity", "Infinity"},
                                            {"null", "-1e+9999", "1e+9999"}};
-    return reps[useSpecialFloats ? 0 : 1]
-               [isnan(value) ? 0 : (value < 0) ? 1 : 2];
+    return reps[useSpecialFloats ? 0 : 1][isnan(value)  ? 0
+                                          : (value < 0) ? 1
+                                                        : 2];
   }
 
   String buffer(size_t(36), '\0');