Fix clang format issues (#1555)
diff --git a/include/json/allocator.h b/include/json/allocator.h
index 7540642..f4fcc1c 100644
--- a/include/json/allocator.h
+++ b/include/json/allocator.h
@@ -69,7 +69,9 @@
// Boilerplate
SecureAllocator() {}
template <typename U> SecureAllocator(const SecureAllocator<U>&) {}
- template <typename U> struct rebind { using other = SecureAllocator<U>; };
+ template <typename U> struct rebind {
+ using other = SecureAllocator<U>;
+ };
};
template <typename T, typename U>
diff --git a/include/json/reader.h b/include/json/reader.h
index 46975d8..10c6a4f 100644
--- a/include/json/reader.h
+++ b/include/json/reader.h
@@ -51,12 +51,12 @@
};
/** \brief Constructs a Reader allowing all features for parsing.
- * \deprecated Use CharReader and CharReaderBuilder.
+ * \deprecated Use CharReader and CharReaderBuilder.
*/
Reader();
/** \brief Constructs a Reader allowing the specified feature set for parsing.
- * \deprecated Use CharReader and CharReaderBuilder.
+ * \deprecated Use CharReader and CharReaderBuilder.
*/
Reader(const Features& features);
@@ -272,7 +272,7 @@
*/
virtual CharReader* newCharReader() const = 0;
}; // Factory
-}; // CharReader
+}; // CharReader
/** \brief Build a CharReader implementation.
*
diff --git a/include/json/value.h b/include/json/value.h
index 9a302c1..120dea8 100644
--- a/include/json/value.h
+++ b/include/json/value.h
@@ -586,19 +586,23 @@
iterator end();
/// \brief Returns a reference to the first element in the `Value`.
- /// Requires that this value holds an array or json object, with at least one element.
+ /// Requires that this value holds an array or json object, with at least one
+ /// element.
const Value& front() const;
/// \brief Returns a reference to the first element in the `Value`.
- /// Requires that this value holds an array or json object, with at least one element.
+ /// Requires that this value holds an array or json object, with at least one
+ /// element.
Value& front();
/// \brief Returns a reference to the last element in the `Value`.
- /// Requires that value holds an array or json object, with at least one element.
+ /// Requires that value holds an array or json object, with at least one
+ /// element.
const Value& back() const;
/// \brief Returns a reference to the last element in the `Value`.
- /// Requires that this value holds an array or json object, with at least one element.
+ /// Requires that this value holds an array or json object, with at least one
+ /// element.
Value& back();
// Accessors for the [start, limit) range of bytes within the JSON text from
diff --git a/include/json/writer.h b/include/json/writer.h
index 7d8cf4d..655ebff 100644
--- a/include/json/writer.h
+++ b/include/json/writer.h
@@ -64,7 +64,7 @@
*/
virtual StreamWriter* newStreamWriter() const = 0;
}; // Factory
-}; // StreamWriter
+}; // StreamWriter
/** \brief Write into stringstream, then return string, for convenience.
* A StreamWriter will be created from the factory, used, and then deleted.
@@ -168,8 +168,7 @@
#pragma warning(push)
#pragma warning(disable : 4996) // Deriving from deprecated class
#endif
-class JSON_API FastWriter
- : public Writer {
+class JSON_API FastWriter : public Writer {
public:
FastWriter();
~FastWriter() override = default;
@@ -228,8 +227,7 @@
#pragma warning(push)
#pragma warning(disable : 4996) // Deriving from deprecated class
#endif
-class JSON_API
- StyledWriter : public Writer {
+class JSON_API StyledWriter : public Writer {
public:
StyledWriter();
~StyledWriter() override = default;
@@ -297,8 +295,7 @@
#pragma warning(push)
#pragma warning(disable : 4996) // Deriving from deprecated class
#endif
-class JSON_API
- StyledStreamWriter {
+class JSON_API StyledStreamWriter {
public:
/**
* \param indentation Each level will be indented by this amount extra.
diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp
index 1ac5e81..8dcd2b5 100644
--- a/src/lib_json/json_reader.cpp
+++ b/src/lib_json/json_reader.cpp
@@ -608,7 +608,7 @@
value = -std::numeric_limits<double>::infinity();
else if (!std::isinf(value))
return addError(
- "'" + String(token.start_, token.end_) + "' is not a number.", token);
+ "'" + String(token.start_, token.end_) + "' is not a number.", token);
}
decoded = value;
return true;
@@ -1660,7 +1660,7 @@
value = -std::numeric_limits<double>::infinity();
else if (!std::isinf(value))
return addError(
- "'" + String(token.start_, token.end_) + "' is not a number.", token);
+ "'" + String(token.start_, token.end_) + "' is not a number.", token);
}
decoded = value;
return true;
diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
index 0dd160e..239c429 100644
--- a/src/lib_json/json_writer.cpp
+++ b/src/lib_json/json_writer.cpp
@@ -132,8 +132,9 @@
if (!isfinite(value)) {
static const char* const reps[2][3] = {{"NaN", "-Infinity", "Infinity"},
{"null", "-1e+9999", "1e+9999"}};
- return reps[useSpecialFloats ? 0 : 1]
- [isnan(value) ? 0 : (value < 0) ? 1 : 2];
+ return reps[useSpecialFloats ? 0 : 1][isnan(value) ? 0
+ : (value < 0) ? 1
+ : 2];
}
String buffer(size_t(36), '\0');
