github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-10-31 16:14:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renamed StdStringAdapter to StlStringAdapter (internal use only)

Browse Source
This commit is contained in:
Benoit Blanchon
2020-10-01 10:01:33 +02:00
parent 8385d5fa3a
commit f3f44d7812
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extras/tests/Misc/StringAdapters.cpp
View File

@@ -10,7 +10,7 @@
#include <ArduinoJson/Strings/ConstRamStringAdapter.hpp> #include <ArduinoJson/Strings/ConstRamStringAdapter.hpp>
#include <ArduinoJson/Strings/FlashStringAdapter.hpp> #include <ArduinoJson/Strings/FlashStringAdapter.hpp>
#include <ArduinoJson/Strings/SizedRamStringAdapter.hpp> #include <ArduinoJson/Strings/SizedRamStringAdapter.hpp>
#include <ArduinoJson/Strings/StlStringAdapter.hpp> #include <ArduinoJson/Strings/StdStringAdapter.hpp>
#include <catch.hpp> #include <catch.hpp>
@@ -102,7 +102,7 @@ TEST_CASE("FlashStringAdapter") {
TEST_CASE("std::string") { TEST_CASE("std::string") {
std::string str("bravo"); std::string str("bravo");
StlStringAdapter<std::string> adapter = adaptString(str); StdStringAdapter<std::string> adapter = adaptString(str);
CHECK(adapter.compare(NULL) > 0); CHECK(adapter.compare(NULL) > 0);
CHECK(adapter.compare("alpha") > 0); CHECK(adapter.compare("alpha") > 0);
@@ -132,7 +132,7 @@ TEST_CASE("Arduino String") {
TEST_CASE("custom_string") { TEST_CASE("custom_string") {
custom_string str("bravo"); custom_string str("bravo");
StlStringAdapter<custom_string> adapter = adaptString(str); StdStringAdapter<custom_string> adapter = adaptString(str);
CHECK(adapter.compare(NULL) > 0); CHECK(adapter.compare(NULL) > 0);
CHECK(adapter.compare("alpha") > 0); CHECK(adapter.compare("alpha") > 0);

8
src/ArduinoJson/Strings/StlStringAdapter.hpp → src/ArduinoJson/Strings/StdStringAdapter.hpp
View File

@@ -13,9 +13,9 @@
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {
template <typename TString> template <typename TString>
class StlStringAdapter { class StdStringAdapter {
public: public:
StlStringAdapter(const TString& str) : _str(&str) {} StdStringAdapter(const TString& str) : _str(&str) {}
void copyTo(char* p, size_t n) const { void copyTo(char* p, size_t n) const {
memcpy(p, _str->c_str(), n); memcpy(p, _str->c_str(), n);
@@ -56,9 +56,9 @@ struct IsString<std::basic_string<char, TCharTraits, TAllocator> > : true_type {
}; };
template <typename TCharTraits, typename TAllocator> template <typename TCharTraits, typename TAllocator>
inline StlStringAdapter<std::basic_string<char, TCharTraits, TAllocator> > inline StdStringAdapter<std::basic_string<char, TCharTraits, TAllocator> >
adaptString(const std::basic_string<char, TCharTraits, TAllocator>& str) { adaptString(const std::basic_string<char, TCharTraits, TAllocator>& str) {
return StlStringAdapter<std::basic_string<char, TCharTraits, TAllocator> >( return StdStringAdapter<std::basic_string<char, TCharTraits, TAllocator> >(
str); str);
} }

2
src/ArduinoJson/Strings/StringAdapters.hpp
View File

@@ -9,7 +9,7 @@
#include <ArduinoJson/Strings/SizedRamStringAdapter.hpp> #include <ArduinoJson/Strings/SizedRamStringAdapter.hpp>
#if ARDUINOJSON_ENABLE_STD_STRING #if ARDUINOJSON_ENABLE_STD_STRING
#include <ArduinoJson/Strings/StlStringAdapter.hpp> #include <ArduinoJson/Strings/StdStringAdapter.hpp>
#endif #endif
#if ARDUINOJSON_ENABLE_ARDUINO_STRING #if ARDUINOJSON_ENABLE_ARDUINO_STRING