Skip to content

Commit d71d3ad

Browse files
committed
run ninja format
1 parent a256e1e commit d71d3ad

File tree

2 files changed

+31
-13
lines changed

2 files changed

+31
-13
lines changed

.github/workflows/abi-compatibility.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ jobs:
5959
target_link_libraries(abi_test PRIVATE JsonCpp::JsonCpp)
6060
EOF
6161
62-
cp $GITHUB_WORKSPACE/src/test_lib_json/*.cpp example-app/
63-
cp $GITHUB_WORKSPACE/src/test_lib_json/*.h example-app/
62+
cp src/test_lib_json/*.cpp example-app/
63+
cp src/test_lib_json/*.h example-app/
6464
6565
- name: build example app (C++${{ matrix.app_std }})
6666
shell: bash

include/json/value.h

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,8 @@ struct MemberProxy {
10521052
Value& value;
10531053
};
10541054

1055-
/** \brief Proxy struct to enable range-based for loops over const object members.
1055+
/** \brief Proxy struct to enable range-based for loops over const object
1056+
* members.
10561057
*/
10571058
struct ConstMemberProxy {
10581059
const String name;
@@ -1081,8 +1082,12 @@ class ValueMembersIterator {
10811082
++*this;
10821083
return temp;
10831084
}
1084-
bool operator==(ValueMembersIterator const& other) const { return it_ == other.it_; }
1085-
bool operator!=(ValueMembersIterator const& other) const { return it_ != other.it_; }
1085+
bool operator==(ValueMembersIterator const& other) const {
1086+
return it_ == other.it_;
1087+
}
1088+
bool operator!=(ValueMembersIterator const& other) const {
1089+
return it_ != other.it_;
1090+
}
10861091
MemberProxy operator*() const { return MemberProxy{it_.name(), *it_}; }
10871092

10881093
private:
@@ -1100,7 +1105,8 @@ class ValueConstMembersIterator {
11001105
using reference = ConstMemberProxy;
11011106

11021107
ValueConstMembersIterator() = default;
1103-
explicit ValueConstMembersIterator(ValueConstIterator const& iter) : it_(iter) {}
1108+
explicit ValueConstMembersIterator(ValueConstIterator const& iter)
1109+
: it_(iter) {}
11041110

11051111
ValueConstMembersIterator& operator++() {
11061112
++it_;
@@ -1111,9 +1117,15 @@ class ValueConstMembersIterator {
11111117
++*this;
11121118
return temp;
11131119
}
1114-
bool operator==(ValueConstMembersIterator const& other) const { return it_ == other.it_; }
1115-
bool operator!=(ValueConstMembersIterator const& other) const { return it_ != other.it_; }
1116-
ConstMemberProxy operator*() const { return ConstMemberProxy{it_.name(), *it_}; }
1120+
bool operator==(ValueConstMembersIterator const& other) const {
1121+
return it_ == other.it_;
1122+
}
1123+
bool operator!=(ValueConstMembersIterator const& other) const {
1124+
return it_ != other.it_;
1125+
}
1126+
ConstMemberProxy operator*() const {
1127+
return ConstMemberProxy{it_.name(), *it_};
1128+
}
11171129

11181130
private:
11191131
ValueConstIterator it_;
@@ -1123,7 +1135,8 @@ class ValueConstMembersIterator {
11231135
*/
11241136
class ValueMembersView {
11251137
public:
1126-
ValueMembersView(ValueIterator begin, ValueIterator end) : begin_(begin), end_(end) {}
1138+
ValueMembersView(ValueIterator begin, ValueIterator end)
1139+
: begin_(begin), end_(end) {}
11271140
ValueMembersIterator begin() const { return ValueMembersIterator(begin_); }
11281141
ValueMembersIterator end() const { return ValueMembersIterator(end_); }
11291142

@@ -1136,9 +1149,14 @@ class ValueMembersView {
11361149
*/
11371150
class ValueConstMembersView {
11381151
public:
1139-
ValueConstMembersView(ValueConstIterator begin, ValueConstIterator end) : begin_(begin), end_(end) {}
1140-
ValueConstMembersIterator begin() const { return ValueConstMembersIterator(begin_); }
1141-
ValueConstMembersIterator end() const { return ValueConstMembersIterator(end_); }
1152+
ValueConstMembersView(ValueConstIterator begin, ValueConstIterator end)
1153+
: begin_(begin), end_(end) {}
1154+
ValueConstMembersIterator begin() const {
1155+
return ValueConstMembersIterator(begin_);
1156+
}
1157+
ValueConstMembersIterator end() const {
1158+
return ValueConstMembersIterator(end_);
1159+
}
11421160

11431161
private:
11441162
ValueConstIterator begin_;

0 commit comments

Comments
 (0)