apply the C++11 style change in .clang-format
diff --git a/include/json/config.h b/include/json/config.h
index 2b60376..1af8681 100644
--- a/include/json/config.h
+++ b/include/json/config.h
@@ -176,9 +176,8 @@
template <typename T>
using Allocator = typename std::conditional<JSONCPP_USING_SECURE_MEMORY,
SecureAllocator<T>,
- std::allocator<T> >::type;
-using String =
- std::basic_string<char, std::char_traits<char>, Allocator<char> >;
+ std::allocator<T>>::type;
+using String = std::basic_string<char, std::char_traits<char>, Allocator<char>>;
using IStringStream = std::basic_istringstream<String::value_type,
String::traits_type,
String::allocator_type>;
diff --git a/include/json/features.h b/include/json/features.h
index 8cbe172..ba25e8d 100644
--- a/include/json/features.h
+++ b/include/json/features.h
@@ -41,17 +41,17 @@
Features();
/// \c true if comments are allowed. Default: \c true.
- bool allowComments_{ true };
+ bool allowComments_{true};
/// \c true if root must be either an array or an object value. Default: \c
/// false.
- bool strictRoot_{ false };
+ bool strictRoot_{false};
/// \c true if dropped null placeholders are allowed. Default: \c false.
- bool allowDroppedNullPlaceholders_{ false };
+ bool allowDroppedNullPlaceholders_{false};
/// \c true if numeric object key are allowed. Default: \c false.
- bool allowNumericKeys_{ false };
+ bool allowNumericKeys_{false};
};
} // namespace Json
diff --git a/include/json/value.h b/include/json/value.h
index 9df8a3b..1036d32 100644
--- a/include/json/value.h
+++ b/include/json/value.h
@@ -630,7 +630,7 @@
void setComment(const char* text, size_t len);
- char* comment_{ nullptr };
+ char* comment_{nullptr};
};
// struct MemberNamesTransform
@@ -679,7 +679,7 @@
enum Kind { kindNone = 0, kindIndex, kindKey };
String key_;
ArrayIndex index_{};
- Kind kind_{ kindNone };
+ Kind kind_{kindNone};
};
/** \brief Experimental and untested: represents a "path" to access a node.
@@ -780,7 +780,7 @@
private:
Value::ObjectValues::iterator current_;
// Indicates that iterator is for a null value.
- bool isNull_{ true };
+ bool isNull_{true};
public:
// For some reason, BORLAND needs these at the end, rather
diff --git a/include/json/writer.h b/include/json/writer.h
index b809483..12fd36a 100644
--- a/include/json/writer.h
+++ b/include/json/writer.h
@@ -189,9 +189,9 @@
void writeValue(const Value& value);
String document_;
- bool yamlCompatibilityEnabled_{ false };
- bool dropNullPlaceholders_{ false };
- bool omitEndingLineFeed_{ false };
+ bool yamlCompatibilityEnabled_{false};
+ bool dropNullPlaceholders_{false};
+ bool omitEndingLineFeed_{false};
};
#if defined(_MSC_VER)
#pragma warning(pop)
@@ -257,9 +257,9 @@
ChildValues childValues_;
String document_;
String indentString_;
- unsigned int rightMargin_{ 74 };
- unsigned int indentSize_{ 3 };
- bool addChildValues_{ false };
+ unsigned int rightMargin_{74};
+ unsigned int indentSize_{3};
+ bool addChildValues_{false};
};
#if defined(_MSC_VER)
#pragma warning(pop)
@@ -331,7 +331,7 @@
ChildValues childValues_;
OStream* document_;
String indentString_;
- unsigned int rightMargin_{ 74 };
+ unsigned int rightMargin_{74};
String indentation_;
bool addChildValues_ : 1;
bool indented_ : 1;