Skip to content

fix clang-format error for ci #1036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 1, 2019
Merged

fix clang-format error for ci #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b42bf85
fix clang-format error for ci
dota17 Sep 26, 2019
b09fbbb
update
dota17 Sep 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions src/lib_json/json_reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,9 @@ bool Reader::containsNewLine(Reader::Location begin, Reader::Location end) {
// Class Reader
// //////////////////////////////////////////////////////////////////

Reader::Reader()
: features_(Features::all()) {}
Reader::Reader() : features_(Features::all()) {}

Reader::Reader(const Features& features)
: features_(features) {
}
Reader::Reader(const Features& features) : features_(features) {}

bool Reader::parse(const std::string& document,
Value& root,
Expand All @@ -110,7 +107,7 @@ bool Reader::parse(std::istream& is, Value& root, bool collectComments) {
// Since String is reference-counted, this at least does not
// create an extra copy.
String doc;
std::getline(is, doc, static_cast<char>EOF);
std::getline(is, doc, static_cast<char> EOF);
return parse(doc.data(), doc.data() + doc.size(), root, collectComments);
}

Expand Down Expand Up @@ -895,7 +892,7 @@ OurFeatures OurFeatures::all() { return {}; }
class OurReader {
public:
using Char = char;
using Location = const Char *;
using Location = const Char*;
struct StructuredError {
ptrdiff_t offset_start;
ptrdiff_t offset_limit;
Expand Down Expand Up @@ -996,7 +993,7 @@ class OurReader {
static String normalizeEOL(Location begin, Location end);
static bool containsNewLine(Location begin, Location end);

using Nodes = std::stack<Value *>;
using Nodes = std::stack<Value*>;
Nodes nodes_;
Errors errors_;
String document_;
Expand All @@ -1022,9 +1019,8 @@ bool OurReader::containsNewLine(OurReader::Location begin,
}

OurReader::OurReader(OurFeatures const& features)
: begin_(), end_(), current_(), lastValueEnd_(),
lastValue_(), features_(features), collectComments_() {
}
: begin_(), end_(), current_(), lastValueEnd_(), lastValue_(),
features_(features), collectComments_() {}

bool OurReader::parse(const char* beginDoc,
const char* endDoc,
Expand Down
9 changes: 4 additions & 5 deletions src/lib_json/json_value.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1551,16 +1551,15 @@ Value::iterator Value::end() {
// class PathArgument
// //////////////////////////////////////////////////////////////////

PathArgument::PathArgument() {}
PathArgument::PathArgument() {}

PathArgument::PathArgument(ArrayIndex index)
: index_(index), kind_(kindIndex) {}
: index_(index), kind_(kindIndex) {}

PathArgument::PathArgument(const char* key)
: key_(key), kind_(kindKey) {}
PathArgument::PathArgument(const char* key) : key_(key), kind_(kindKey) {}

PathArgument::PathArgument(const String& key)
: key_(key.c_str()), kind_(kindKey) {}
: key_(key.c_str()), kind_(kindKey) {}

// class Path
// //////////////////////////////////////////////////////////////////
Expand Down
4 changes: 2 additions & 2 deletions src/test_lib_json/jsontest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,8 +378,8 @@ void Runner::preventDialogOnCrash() {
_CrtSetReportHook(&msvcrtSilentReportHook);
#endif // if defined(_MSC_VER)

// @todo investigate this handler (for buffer overflow)
// _set_security_error_handler
// @todo investigate this handler (for buffer overflow)
// _set_security_error_handler

#if defined(_WIN32)
// Prevents the system from popping a dialog for debugging if the
Expand Down
9 changes: 5 additions & 4 deletions src/test_lib_json/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1391,8 +1391,10 @@ void ValueTest::checkIs(const Json::Value& value, const IsCheck& check) {

JSONTEST_FIXTURE(ValueTest, compareNull) {
JSONTEST_ASSERT_PRED(checkIsEqual(Json::Value(), Json::Value()));
JSONTEST_ASSERT_PRED(checkIsEqual(Json::Value::nullSingleton(), Json::Value()));
JSONTEST_ASSERT_PRED(checkIsEqual(Json::Value::nullSingleton(), Json::Value::nullSingleton()));
JSONTEST_ASSERT_PRED(
checkIsEqual(Json::Value::nullSingleton(), Json::Value()));
JSONTEST_ASSERT_PRED(
checkIsEqual(Json::Value::nullSingleton(), Json::Value::nullSingleton()));
}

JSONTEST_FIXTURE(ValueTest, compareInt) {
Expand Down Expand Up @@ -2644,8 +2646,7 @@ JSONTEST_FIXTURE(IteratorTest, indexes) {
JSONTEST_FIXTURE(IteratorTest, const) {
Json::Value const v;
JSONTEST_ASSERT_THROWS(
Json::Value::iterator it(v.begin()) // Compile, but throw.
);
Json::Value::iterator it(v.begin())); // Compile, but throw.

Json::Value value;

Expand Down