generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-04-27 18:30:50 +02:00
Code Issues Projects Releases Wiki Activity

passes

Browse Source
This commit is contained in:
Christopher Dunn 2015-02-10 16:56:49 -06:00
parent 6123bd1505
commit 435d2a2f8d
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib_json/json_reader.cpp
View File

@ -903,7 +903,7 @@ public:
std::string message; std::string message;
}; };
OldReader(OldFeatures const* features); OldReader(Features const& features);
bool parse(const char* beginDoc, bool parse(const char* beginDoc,
const char* endDoc, const char* endDoc,
Value& root, Value& root,
@ -1000,13 +1000,13 @@ private:
Location lastValueEnd_; Location lastValueEnd_;
Value* lastValue_; Value* lastValue_;
std::string commentsBefore_; std::string commentsBefore_;
OldFeatures features_; Features features_;
bool collectComments_; bool collectComments_;
}; // OldReader }; // OldReader
// complete copy of Read impl, for OldReader // complete copy of Read impl, for OldReader
OldReader::Reader(const Features& features) OldReader::OldReader(Features const& features)
: errors_(), document_(), begin_(), end_(), current_(), lastValueEnd_(), : errors_(), document_(), begin_(), end_(), current_(), lastValueEnd_(),
lastValue_(), commentsBefore_(), features_(features), collectComments_() { lastValue_(), commentsBefore_(), features_(features), collectComments_() {
} }
@ -1711,11 +1711,6 @@ std::string OldReader::getLocationLineAndColumn(Location location) const {
return buffer; return buffer;
} }
// Deprecated. Preserved for backward compatibility
std::string OldReader::getFormatedErrorMessages() const {
return getFormattedErrorMessages();
}
std::string OldReader::getFormattedErrorMessages() const { std::string OldReader::getFormattedErrorMessages() const {
std::string formattedMessage; std::string formattedMessage;
for (Errors::const_iterator itError = errors_.begin(); for (Errors::const_iterator itError = errors_.begin();
@ -1793,9 +1788,9 @@ class OldCharReader : public CharReader {
public: public:
OldCharReader( OldCharReader(
bool collectComments, bool collectComments,
Features const* features) Features const& features)
: collectComments_(collectComments) : collectComments_(collectComments)
, reader_(&features) , reader_(features)
{} {}
virtual bool parse( virtual bool parse(
char const* beginDoc, char const* endDoc, char const* beginDoc, char const* endDoc,