Skip to content

Commit cf084ae

Browse files
committed
JsonString: move adapter class in the same file
1 parent f02fcc9 commit cf084ae

File tree

4 files changed

+14
-23
lines changed

4 files changed

+14
-23
lines changed

extras/tests/Misc/StringAdapters.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <Arduino.h>
66

77
#include <ArduinoJson/Strings/IsString.hpp>
8+
#include <ArduinoJson/Strings/JsonString.hpp>
89
#include <ArduinoJson/Strings/StringAdapters.hpp>
910

1011
#include <catch.hpp>

src/ArduinoJson/Strings/Adapters/JsonString.hpp

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/ArduinoJson/Strings/JsonString.hpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
#pragma once
66

7+
#include <ArduinoJson/Strings/Adapters/RamString.hpp>
8+
79
#if ARDUINOJSON_ENABLE_STD_STREAM
810
# include <ostream>
911
#endif
@@ -81,4 +83,15 @@ class JsonString {
8183
detail::RamString str_;
8284
};
8385

86+
namespace detail {
87+
template <>
88+
struct StringAdapter<JsonString> {
89+
using AdaptedString = RamString;
90+
91+
static const AdaptedString& adapt(const JsonString& s) {
92+
return s.str_;
93+
}
94+
};
95+
} // namespace detail
96+
8497
ARDUINOJSON_END_PUBLIC_NAMESPACE

src/ArduinoJson/Strings/StringAdapters.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#pragma once
66

77
#include <ArduinoJson/Polyfills/type_traits.hpp>
8-
#include <ArduinoJson/Strings/Adapters/JsonString.hpp>
98
#include <ArduinoJson/Strings/Adapters/RamString.hpp>
109
#include <ArduinoJson/Strings/Adapters/StringObject.hpp>
1110

0 commit comments

Comments
 (0)