mirror of
https://github.com/open-source-parsers/jsoncpp.git
synced 2025-10-26 10:32:56 +01:00
STYLE: Use default member initialization
Converts a default constructor’s member initializers into the new default member initializers in C++11. Other member initializers that match the default member initializer are removed. This can reduce repeated code or allow use of ‘= default’. SRCDIR=/Users/johnsonhj/src/jsoncpp/ #My local SRC BLDDIR=/Users/johnsonhj/src/jsoncpp/cmake-build-debug/ #My local BLD cd /Users/johnsonhj/src/jsoncpp/cmake-build-debug/ run-clang-tidy.py -extra-arg=-D__clang__ -checks=-*,modernize-use-default-member-init -header-filter=.* -fix
This commit is contained in:
committed by
Hans Johnson
parent
b5093e8122
commit
e817e4fc25
@@ -60,8 +60,7 @@ typedef std::auto_ptr<CharReader> CharReaderPtr;
|
||||
// ////////////////////////////////
|
||||
|
||||
Features::Features()
|
||||
: allowComments_(true), strictRoot_(false),
|
||||
allowDroppedNullPlaceholders_(false), allowNumericKeys_(false) {}
|
||||
{}
|
||||
|
||||
Features Features::all() { return {}; }
|
||||
|
||||
|
||||
@@ -233,7 +233,7 @@ JSONCPP_NORETURN void throwLogicError(JSONCPP_STRING const& msg) {
|
||||
// //////////////////////////////////////////////////////////////////
|
||||
// //////////////////////////////////////////////////////////////////
|
||||
|
||||
Value::CommentInfo::CommentInfo() : comment_(nullptr) {}
|
||||
Value::CommentInfo::CommentInfo() {}
|
||||
|
||||
Value::CommentInfo::~CommentInfo() {
|
||||
if (comment_)
|
||||
@@ -1575,7 +1575,7 @@ Value::iterator Value::end() {
|
||||
// class PathArgument
|
||||
// //////////////////////////////////////////////////////////////////
|
||||
|
||||
PathArgument::PathArgument() : key_(), index_(), kind_(kindNone) {}
|
||||
PathArgument::PathArgument() : key_() {}
|
||||
|
||||
PathArgument::PathArgument(ArrayIndex index)
|
||||
: key_(), index_(index), kind_(kindIndex) {}
|
||||
|
||||
@@ -16,7 +16,7 @@ namespace Json {
|
||||
// //////////////////////////////////////////////////////////////////
|
||||
|
||||
ValueIteratorBase::ValueIteratorBase()
|
||||
: current_(), isNull_(true) {
|
||||
: current_() {
|
||||
}
|
||||
|
||||
ValueIteratorBase::ValueIteratorBase(
|
||||
|
||||
@@ -352,8 +352,8 @@ Writer::~Writer() {}
|
||||
// //////////////////////////////////////////////////////////////////
|
||||
|
||||
FastWriter::FastWriter()
|
||||
: yamlCompatibilityEnabled_(false), dropNullPlaceholders_(false),
|
||||
omitEndingLineFeed_(false) {}
|
||||
|
||||
{}
|
||||
|
||||
void FastWriter::enableYAMLCompatibility() { yamlCompatibilityEnabled_ = true; }
|
||||
|
||||
@@ -428,7 +428,7 @@ void FastWriter::writeValue(const Value& value) {
|
||||
// //////////////////////////////////////////////////////////////////
|
||||
|
||||
StyledWriter::StyledWriter()
|
||||
: rightMargin_(74), indentSize_(3), addChildValues_(false) {}
|
||||
{}
|
||||
|
||||
JSONCPP_STRING StyledWriter::write(const Value& root) {
|
||||
document_.clear();
|
||||
|
||||
@@ -74,7 +74,7 @@ namespace JsonTest {
|
||||
// //////////////////////////////////////////////////////////////////
|
||||
|
||||
TestResult::TestResult()
|
||||
: predicateId_(1), lastUsedPredicateId_(0), messageTarget_(nullptr) {
|
||||
{
|
||||
// The root predicate has id 0
|
||||
rootPredicateNode_.id_ = 0;
|
||||
rootPredicateNode_.next_ = nullptr;
|
||||
@@ -205,7 +205,7 @@ TestResult& TestResult::operator<<(bool value) {
|
||||
// class TestCase
|
||||
// //////////////////////////////////////////////////////////////////
|
||||
|
||||
TestCase::TestCase() : result_(nullptr) {}
|
||||
TestCase::TestCase() {}
|
||||
|
||||
TestCase::~TestCase() {}
|
||||
|
||||
|
||||
@@ -60,7 +60,7 @@ public:
|
||||
/// Not encapsulated to prevent step into when debugging failed assertions
|
||||
/// Incremented by one on assertion predicate entry, decreased by one
|
||||
/// by addPredicateContext().
|
||||
PredicateContext::Id predicateId_;
|
||||
PredicateContext::Id predicateId_{1};
|
||||
|
||||
/// \internal Implementation detail for predicate macros
|
||||
PredicateContext* predicateStackTail_;
|
||||
@@ -109,9 +109,9 @@ private:
|
||||
Failures failures_;
|
||||
JSONCPP_STRING name_;
|
||||
PredicateContext rootPredicateNode_;
|
||||
PredicateContext::Id lastUsedPredicateId_;
|
||||
PredicateContext::Id lastUsedPredicateId_{0};
|
||||
/// Failure which is the target of the messages added using operator <<
|
||||
Failure* messageTarget_;
|
||||
Failure* messageTarget_{nullptr};
|
||||
};
|
||||
|
||||
class TestCase {
|
||||
@@ -125,7 +125,7 @@ public:
|
||||
virtual const char* testName() const = 0;
|
||||
|
||||
protected:
|
||||
TestResult* result_;
|
||||
TestResult* result_{nullptr};
|
||||
|
||||
private:
|
||||
virtual void runTestCase() = 0;
|
||||
|
||||
@@ -82,19 +82,19 @@ struct ValueTest : JsonTest::TestCase {
|
||||
/// Initialize all checks to \c false by default.
|
||||
IsCheck();
|
||||
|
||||
bool isObject_;
|
||||
bool isArray_;
|
||||
bool isBool_;
|
||||
bool isString_;
|
||||
bool isNull_;
|
||||
bool isObject_{false};
|
||||
bool isArray_{false};
|
||||
bool isBool_{false};
|
||||
bool isString_{false};
|
||||
bool isNull_{false};
|
||||
|
||||
bool isInt_;
|
||||
bool isInt64_;
|
||||
bool isUInt_;
|
||||
bool isUInt64_;
|
||||
bool isIntegral_;
|
||||
bool isDouble_;
|
||||
bool isNumeric_;
|
||||
bool isInt_{false};
|
||||
bool isInt64_{false};
|
||||
bool isUInt_{false};
|
||||
bool isUInt64_{false};
|
||||
bool isIntegral_{false};
|
||||
bool isDouble_{false};
|
||||
bool isNumeric_{false};
|
||||
};
|
||||
|
||||
void checkConstMemberCount(const Json::Value& value,
|
||||
@@ -1331,10 +1331,8 @@ void ValueTest::checkMemberCount(Json::Value& value,
|
||||
}
|
||||
|
||||
ValueTest::IsCheck::IsCheck()
|
||||
: isObject_(false), isArray_(false), isBool_(false), isString_(false),
|
||||
isNull_(false), isInt_(false), isInt64_(false), isUInt_(false),
|
||||
isUInt64_(false), isIntegral_(false), isDouble_(false),
|
||||
isNumeric_(false) {}
|
||||
|
||||
{}
|
||||
|
||||
void ValueTest::checkIs(const Json::Value& value, const IsCheck& check) {
|
||||
JSONTEST_ASSERT_EQUAL(check.isObject_, value.isObject());
|
||||
|
||||
Reference in New Issue
Block a user