3party/jsoncpp
0
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-01-14 18:07:56 +08:00
Code Issues Projects Releases Wiki Activity

fix clang-format error for ci (#1036)

Browse Source 
* fix clang-format error for ci

* update
This commit is contained in:
dota17 2019-10-02 03:54:07 +08:00 committed by Jordan Bayles
parent 7e97345e26
commit 736409f1b5
4 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib_json/json_reader.cpp
View File

@ -85,12 +85,9 @@ bool Reader::containsNewLine(Reader::Location begin, Reader::Location end) {
// Class Reader // Class Reader
// ////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////
Reader::Reader() Reader::Reader() : features_(Features::all()) {}
: features_(Features::all()) {}
Reader::Reader(const Features& features) Reader::Reader(const Features& features) : features_(features) {}
: features_(features) {
}
bool Reader::parse(const std::string& document, bool Reader::parse(const std::string& document,
Value& root, Value& root,
@ -1022,9 +1019,8 @@ bool OurReader::containsNewLine(OurReader::Location begin,
} }
OurReader::OurReader(OurFeatures const& features) OurReader::OurReader(OurFeatures const& features)
: begin_(), end_(), current_(), lastValueEnd_(), : begin_(), end_(), current_(), lastValueEnd_(), lastValue_(),
lastValue_(), features_(features), collectComments_() { features_(features), collectComments_() {}
}
bool OurReader::parse(const char* beginDoc, bool OurReader::parse(const char* beginDoc,
const char* endDoc, const char* endDoc,

3
src/lib_json/json_value.cpp
View File

@ -1556,8 +1556,7 @@ PathArgument::PathArgument() {}
PathArgument::PathArgument(ArrayIndex index) PathArgument::PathArgument(ArrayIndex index)
: index_(index), kind_(kindIndex) {} : index_(index), kind_(kindIndex) {}
PathArgument::PathArgument(const char* key) PathArgument::PathArgument(const char* key) : key_(key), kind_(kindKey) {}
: key_(key), kind_(kindKey) {}
PathArgument::PathArgument(const String& key) PathArgument::PathArgument(const String& key)
: key_(key.c_str()), kind_(kindKey) {} : key_(key.c_str()), kind_(kindKey) {}

9
src/test_lib_json/main.cpp
View File

@ -1391,8 +1391,10 @@ void ValueTest::checkIs(const Json::Value& value, const IsCheck& check) {
JSONTEST_FIXTURE(ValueTest, compareNull) { JSONTEST_FIXTURE(ValueTest, compareNull) {
JSONTEST_ASSERT_PRED(checkIsEqual(Json::Value(), Json::Value())); JSONTEST_ASSERT_PRED(checkIsEqual(Json::Value(), Json::Value()));
JSONTEST_ASSERT_PRED(checkIsEqual(Json::Value::nullSingleton(), Json::Value())); JSONTEST_ASSERT_PRED(
JSONTEST_ASSERT_PRED(checkIsEqual(Json::Value::nullSingleton(), Json::Value::nullSingleton())); checkIsEqual(Json::Value::nullSingleton(), Json::Value()));
JSONTEST_ASSERT_PRED(
checkIsEqual(Json::Value::nullSingleton(), Json::Value::nullSingleton()));
} }
JSONTEST_FIXTURE(ValueTest, compareInt) { JSONTEST_FIXTURE(ValueTest, compareInt) {
@ -2644,8 +2646,7 @@ JSONTEST_FIXTURE(IteratorTest, indexes) {
JSONTEST_FIXTURE(IteratorTest, const) { JSONTEST_FIXTURE(IteratorTest, const) {
Json::Value const v; Json::Value const v;
JSONTEST_ASSERT_THROWS( JSONTEST_ASSERT_THROWS(
Json::Value::iterator it(v.begin()) // Compile, but throw. Json::Value::iterator it(v.begin())); // Compile, but throw.
);
Json::Value value; Json::Value value;