commit d5bd1a771631950264f65a01b9c4255f0f2324a6
author Jordan Bayles <jophba@chromium.org> Mon Jun 24 14:06:45 2019 -0700
committer Jordan Bayles <jophba@chromium.org> Mon Jun 24 14:06:45 2019 -0700
tree ab1106e94b8f5ae36395416eaf50f489c818d5e7
parent f7182a0fdc72404a9722388f1d59adecef8d93d6

Run clang format

Clang format hasn't been run on some recent checkins. This patch updates
the repository with clang format properly run on all files.

include/json/config.h

diff --git a/include/json/config.h b/include/json/config.h
index cba6102..eca9e8c 100644
--- a/include/json/config.h
+++ b/include/json/config.h
@@ -108,8 +108,9 @@
 #define JSONCPP_DEPRECATED(message) __attribute__((deprecated(message)))
 #elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
 #define JSONCPP_DEPRECATED(message) __attribute__((__deprecated__))
-#endif // GNUC version
-#elif defined(_MSC_VER) // MSVC (after clang because clang on Windows emulates MSVC)
+#endif                  // GNUC version
+#elif defined(_MSC_VER) // MSVC (after clang because clang on Windows emulates
+                        // MSVC)
 #define JSONCPP_DEPRECATED(message) __declspec(deprecated(message))
 #endif // __clang__ || __GNUC__ || _MSC_VER
 

include/json/value.h

diff --git a/include/json/value.h b/include/json/value.h
index 06d89ae..59bae07 100644
--- a/include/json/value.h
+++ b/include/json/value.h
@@ -612,7 +612,9 @@
   ptrdiff_t getOffsetLimit() const;
 
 private:
-  void setType(ValueType v) { bits_.value_type_ = static_cast<unsigned char> (v); }
+  void setType(ValueType v) {
+    bits_.value_type_ = static_cast<unsigned char>(v);
+  }
   bool isAllocated() const { return bits_.allocated_; }
   void setIsAllocated(bool v) { bits_.allocated_ = v; }
 

src/lib_json/json_value.cpp

diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
index cc92d44..c0840eb 100644
--- a/src/lib_json/json_value.cpp
+++ b/src/lib_json/json_value.cpp
@@ -238,13 +238,9 @@
 JSONCPP_NORETURN void throwLogicError(String const& msg) {
   throw LogicError(msg);
 }
-# else // !JSON_USE_EXCEPTION
-JSONCPP_NORETURN void throwRuntimeError(String const& msg) {
-  abort();
-}
-JSONCPP_NORETURN void throwLogicError(String const& msg) {
-  abort();
-}
+#else // !JSON_USE_EXCEPTION
+JSONCPP_NORETURN void throwRuntimeError(String const& msg) { abort(); }
+JSONCPP_NORETURN void throwLogicError(String const& msg) { abort(); }
 #endif
 
 // //////////////////////////////////////////////////////////////////
@@ -1445,8 +1441,7 @@
 Value::Comments::Comments(const Comments& that)
     : ptr_{cloneUnique(that.ptr_)} {}
 
-Value::Comments::Comments(Comments&& that)
-    : ptr_{std::move(that.ptr_)} {}
+Value::Comments::Comments(Comments&& that) : ptr_{std::move(that.ptr_)} {}
 
 Value::Comments& Value::Comments::operator=(const Comments& that) {
   ptr_ = cloneUnique(that.ptr_);

src/test_lib_json/main.cpp

diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
index 280f7ea..10e1ca9 100644
--- a/src/test_lib_json/main.cpp
+++ b/src/test_lib_json/main.cpp
@@ -211,14 +211,17 @@
   JSONTEST_ASSERT_EQUAL(Json::Value(1234), *foundId);
 
   const char unknownIdKey[] = "unknown id";
-  const Json::Value* foundUnknownId = object1_.find(unknownIdKey, unknownIdKey + strlen(unknownIdKey));
+  const Json::Value* foundUnknownId =
+      object1_.find(unknownIdKey, unknownIdKey + strlen(unknownIdKey));
   JSONTEST_ASSERT_EQUAL(nullptr, foundUnknownId);
 
   // Access through demand()
   const char yetAnotherIdKey[] = "yet another id";
-  const Json::Value* foundYetAnotherId = object1_.find(yetAnotherIdKey, yetAnotherIdKey + strlen(yetAnotherIdKey));
+  const Json::Value* foundYetAnotherId =
+      object1_.find(yetAnotherIdKey, yetAnotherIdKey + strlen(yetAnotherIdKey));
   JSONTEST_ASSERT_EQUAL(nullptr, foundYetAnotherId);
-  Json::Value* demandedYetAnotherId = object1_.demand(yetAnotherIdKey, yetAnotherIdKey + strlen(yetAnotherIdKey));
+  Json::Value* demandedYetAnotherId = object1_.demand(
+      yetAnotherIdKey, yetAnotherIdKey + strlen(yetAnotherIdKey));
   JSONTEST_ASSERT(demandedYetAnotherId != nullptr);
   *demandedYetAnotherId = "baz";