File tree Expand file tree Collapse file tree 16 files changed +32
-32
lines changed Expand file tree Collapse file tree 16 files changed +32
-32
lines changed Original file line number Diff line number Diff line change 1
1
# http://clang.llvm.org/docs/ClangFormatStyleOptions.html
2
2
3
3
BasedOnStyle : Google
4
- Standard : Cpp03
4
+ Standard : c++11
5
5
AllowShortFunctionsOnASingleLine : Empty
6
6
IncludeBlocks : Preserve
7
7
IndentPPDirectives : AfterHash
Original file line number Diff line number Diff line change 12
12
13
13
namespace ArduinoJson {
14
14
template <typename T>
15
- struct Converter <std::vector<T> > {
15
+ struct Converter <std::vector<T>> {
16
16
static void toJson (const std::vector<T>& src, JsonVariant dst) {
17
17
JsonArray array = dst.to <JsonArray>();
18
18
for (T item : src)
@@ -36,7 +36,7 @@ struct Converter<std::vector<T> > {
36
36
};
37
37
38
38
template <typename T, size_t N>
39
- struct Converter <std::array<T, N> > {
39
+ struct Converter <std::array<T, N>> {
40
40
static void toJson (const std::array<T, N>& src, JsonVariant dst) {
41
41
JsonArray array = dst.to <JsonArray>();
42
42
for (T item : src)
@@ -79,22 +79,22 @@ TEST_CASE("vector<int>") {
79
79
doc.add (1 );
80
80
doc.add (2 );
81
81
82
- auto v = doc.as <std::vector<int > >();
82
+ auto v = doc.as <std::vector<int >>();
83
83
REQUIRE (v.size () == 2 );
84
84
CHECK (v[0 ] == 1 );
85
85
CHECK (v[1 ] == 2 );
86
86
}
87
87
88
88
SECTION (" checkJson" ) {
89
89
StaticJsonDocument<128 > doc;
90
- CHECK (doc.is <std::vector<int > >() == false );
90
+ CHECK (doc.is <std::vector<int >>() == false );
91
91
92
92
doc.add (1 );
93
93
doc.add (2 );
94
- CHECK (doc.is <std::vector<int > >() == true );
94
+ CHECK (doc.is <std::vector<int >>() == true );
95
95
96
96
doc.add (" foo" );
97
- CHECK (doc.is <std::vector<int > >() == false );
97
+ CHECK (doc.is <std::vector<int >>() == false );
98
98
}
99
99
}
100
100
Original file line number Diff line number Diff line change @@ -91,13 +91,13 @@ struct EmptyStruct {};
91
91
92
92
TEST_CASE (" IsString<T>" ) {
93
93
CHECK (IsString<std::string>::value == true );
94
- CHECK (IsString<std::basic_string<wchar_t > >::value == false );
94
+ CHECK (IsString<std::basic_string<wchar_t >>::value == false );
95
95
CHECK (IsString<custom_string>::value == true );
96
96
CHECK (IsString<const __FlashStringHelper*>::value == true );
97
97
CHECK (IsString<const char *>::value == true );
98
98
CHECK (IsString<const char [8 ]>::value == true );
99
- CHECK (IsString< ::String>::value == true );
100
- CHECK (IsString< ::StringSumHelper>::value == true );
99
+ CHECK (IsString<::String>::value == true );
100
+ CHECK (IsString<::StringSumHelper>::value == true );
101
101
CHECK (IsString<const EmptyStruct*>::value == false );
102
102
}
103
103
Original file line number Diff line number Diff line change @@ -65,7 +65,7 @@ TEST_CASE("Writer<std::string>") {
65
65
66
66
TEST_CASE (" Writer<String>" ) {
67
67
::String output;
68
- Writer< ::String> writer (output);
68
+ Writer<::String> writer (output);
69
69
70
70
SECTION (" write(char)" ) {
71
71
SECTION (" writes to temporary buffer" ) {
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ template <typename TFloat>
17
17
void check (TFloat input, const std::string& expected) {
18
18
std::string output;
19
19
Writer<std::string> sb (output);
20
- TextFormatter<Writer<std::string> > writer (sb);
20
+ TextFormatter<Writer<std::string>> writer (sb);
21
21
writer.writeFloat (input);
22
22
REQUIRE (writer.bytesWritten () == output.size ());
23
23
CHECK (expected == output);
Original file line number Diff line number Diff line change @@ -11,8 +11,8 @@ ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
11
11
// A proxy class to get or set an element of an array.
12
12
// https://arduinojson.org/v6/api/jsonarray/subscript/
13
13
template <typename TUpstream>
14
- class ElementProxy : public VariantRefBase <ElementProxy<TUpstream> >,
15
- public VariantOperators<ElementProxy<TUpstream> > {
14
+ class ElementProxy : public VariantRefBase <ElementProxy<TUpstream>>,
15
+ public VariantOperators<ElementProxy<TUpstream>> {
16
16
friend class VariantAttorney ;
17
17
18
18
public:
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
10
10
11
11
template <typename TSource>
12
12
struct Reader <TSource,
13
- typename enable_if<is_base_of< ::String, TSource>::value>::type>
13
+ typename enable_if<is_base_of<::String, TSource>::value>::type>
14
14
: BoundedReader<const char *> {
15
15
explicit Reader (const ::String& s)
16
16
: BoundedReader<const char*>(s.c_str(), s.length()) {}
Original file line number Diff line number Diff line change @@ -173,7 +173,7 @@ class JsonDocument : public detail::VariantOperators<const JsonDocument&> {
173
173
template <typename TString>
174
174
FORCE_INLINE typename detail::enable_if<
175
175
detail::IsString<TString>::value,
176
- detail::MemberProxy<JsonDocument&, TString> >::type
176
+ detail::MemberProxy<JsonDocument&, TString>>::type
177
177
operator [](const TString& key) {
178
178
return {*this , key};
179
179
}
@@ -183,7 +183,7 @@ class JsonDocument : public detail::VariantOperators<const JsonDocument&> {
183
183
template <typename TChar>
184
184
FORCE_INLINE typename detail::enable_if<
185
185
detail::IsString<TChar*>::value,
186
- detail::MemberProxy<JsonDocument&, TChar*> >::type
186
+ detail::MemberProxy<JsonDocument&, TChar*>>::type
187
187
operator [](TChar* key) {
188
188
return {*this , key};
189
189
}
Original file line number Diff line number Diff line change @@ -108,10 +108,10 @@ class JsonObject : public detail::VariantOperators<JsonObject> {
108
108
// Gets or sets the member with specified key.
109
109
// https://arduinojson.org/v6/api/jsonobject/subscript/
110
110
template <typename TString>
111
- FORCE_INLINE typename detail::enable_if<
112
- detail::IsString<TString>::value,
113
- detail::MemberProxy<JsonObject, TString> >::type
114
- operator [](const TString& key) const {
111
+ FORCE_INLINE
112
+ typename detail::enable_if< detail::IsString<TString>::value,
113
+ detail::MemberProxy<JsonObject, TString>>::type
114
+ operator [](const TString& key) const {
115
115
return {*this , key};
116
116
}
117
117
@@ -120,7 +120,7 @@ class JsonObject : public detail::VariantOperators<JsonObject> {
120
120
template <typename TChar>
121
121
FORCE_INLINE
122
122
typename detail::enable_if<detail::IsString<TChar*>::value,
123
- detail::MemberProxy<JsonObject, TChar*> >::type
123
+ detail::MemberProxy<JsonObject, TChar*>>::type
124
124
operator [](TChar* key) const {
125
125
return {*this , key};
126
126
}
Original file line number Diff line number Diff line change @@ -69,15 +69,15 @@ VariantRefBase<TDerived>::containsKey(TChar* key) const {
69
69
template <typename TDerived>
70
70
template <typename TString>
71
71
inline typename enable_if<IsString<TString*>::value,
72
- MemberProxy<TDerived, TString*> >::type
72
+ MemberProxy<TDerived, TString*>>::type
73
73
VariantRefBase<TDerived>::operator [](TString* key) const {
74
74
return MemberProxy<TDerived, TString*>(derived (), key);
75
75
}
76
76
77
77
template <typename TDerived>
78
78
template <typename TString>
79
79
inline typename enable_if<IsString<TString>::value,
80
- MemberProxy<TDerived, TString> >::type
80
+ MemberProxy<TDerived, TString>>::type
81
81
VariantRefBase<TDerived>::operator [](const TString& key) const {
82
82
return MemberProxy<TDerived, TString>(derived (), key);
83
83
}
You can’t perform that action at this time.
0 commit comments