Merge pull request #364 from ya1gaurav/patch-28

Have default ctor for OurFeatures
This commit is contained in:
Christopher Dunn 2015-09-23 09:41:17 -05:00
commit 2e625dd9af

View File

@ -889,7 +889,7 @@ bool Reader::good() const {
class OurFeatures { class OurFeatures {
public: public:
static OurFeatures all(); static OurFeatures all();
OurFeatures(); OurFeatures() = default;
bool allowComments_; bool allowComments_;
bool strictRoot_; bool strictRoot_;
bool allowDroppedNullPlaceholders_; bool allowDroppedNullPlaceholders_;
@ -904,15 +904,6 @@ public:
// exact copy of Implementation of class Features // exact copy of Implementation of class Features
// //////////////////////////////// // ////////////////////////////////
OurFeatures::OurFeatures()
: allowComments_(true), strictRoot_(false)
, allowDroppedNullPlaceholders_(false), allowNumericKeys_(false)
, allowSingleQuotes_(false)
, failIfExtra_(false)
, allowSpecialFloats_(false)
{
}
OurFeatures OurFeatures::all() { return OurFeatures(); } OurFeatures OurFeatures::all() { return OurFeatures(); }
// Implementation of class Reader // Implementation of class Reader
@ -1979,6 +1970,7 @@ void CharReaderBuilder::strictMode(Json::Value* settings)
(*settings)["allowDroppedNullPlaceholders"] = false; (*settings)["allowDroppedNullPlaceholders"] = false;
(*settings)["allowNumericKeys"] = false; (*settings)["allowNumericKeys"] = false;
(*settings)["allowSingleQuotes"] = false; (*settings)["allowSingleQuotes"] = false;
(*settings)["stackLimit"] = 1000;
(*settings)["failIfExtra"] = true; (*settings)["failIfExtra"] = true;
(*settings)["rejectDupKeys"] = true; (*settings)["rejectDupKeys"] = true;
(*settings)["allowSpecialFloats"] = false; (*settings)["allowSpecialFloats"] = false;