Skip to content

Fix clang format issues #1555

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.

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 1 commit into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion include/json/allocator.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ template <typename T> class SecureAllocator {
// 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>
Expand Down
6 changes: 3 additions & 3 deletions include/json/reader.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ class JSON_API Reader {
};

/** \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);

Expand Down Expand Up @@ -272,7 +272,7 @@ class JSON_API CharReader {
*/
virtual CharReader* newCharReader() const = 0;
}; // Factory
}; // CharReader
}; // CharReader

/** \brief Build a CharReader implementation.
*
Expand Down
12 changes: 8 additions & 4 deletions include/json/value.h
Original file line number Diff line number Diff line change
Expand Up @@ -586,19 +586,23 @@ class JSON_API Value {
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
Expand Down
11 changes: 4 additions & 7 deletions include/json/writer.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class JSON_API StreamWriter {
*/
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.
Expand Down Expand Up @@ -168,8 +168,7 @@ class JSON_API Writer {
#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;
Expand Down Expand Up @@ -228,8 +227,7 @@ class JSON_API FastWriter
#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;
Expand Down Expand Up @@ -297,8 +295,7 @@ class JSON_API
#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.
Expand Down
4 changes: 2 additions & 2 deletions src/lib_json/json_reader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ bool Reader::decodeDouble(Token& token, Value& decoded) {
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;
Expand Down Expand Up @@ -1660,7 +1660,7 @@ bool OurReader::decodeDouble(Token& token, Value& decoded) {
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;
Expand Down
5 changes: 3 additions & 2 deletions src/lib_json/json_writer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,9 @@ String valueToString(double value, bool useSpecialFloats,
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');
Expand Down