bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-31 03:07:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'std::string_view' has not been declared (issue #1967)

Browse Source
This commit is contained in:
Benoit Blanchon
2023-09-13 18:12:18 +02:00
parent 259855a87b
commit 49e2a8d421
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -5,6 +5,7 @@ HEAD
---- ----
* Fix error `'std::string' has not been declared` (issue #1967) * Fix error `'std::string' has not been declared` (issue #1967)
* Fix error `'std::string_view' has not been declared` (issue #1967)
v6.21.3 (2023-07-23) v6.21.3 (2023-07-23)
------- -------

14
extras/tests/Cpp17/string_view.cpp
View File

@ -1,8 +1,16 @@
// ArduinoJson - https://arduinojson.org
// Copyright © 2014-2023, Benoit BLANCHON
// MIT License
// we expect ArduinoJson.h to include <string_view>
// but we don't want it to included accidentally
#undef ARDUINO
#define ARDUINOJSON_ENABLE_STD_STREAM 0
#define ARDUINOJSON_ENABLE_STD_STRING 0
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include <catch.hpp> #include <catch.hpp>
#include <string_view>
#if !ARDUINOJSON_ENABLE_STRING_VIEW #if !ARDUINOJSON_ENABLE_STRING_VIEW
# error ARDUINOJSON_ENABLE_STRING_VIEW must be set to 1 # error ARDUINOJSON_ENABLE_STRING_VIEW must be set to 1
#endif #endif
@ -19,7 +27,7 @@ TEST_CASE("string_view") {
SECTION("JsonDocument::set()") { SECTION("JsonDocument::set()") {
doc.set(std::string_view("123", 2)); doc.set(std::string_view("123", 2));
REQUIRE(doc.as<std::string>() == "12"); REQUIRE(doc.as<std::string_view>() == "12");
} }
SECTION("JsonDocument::operator[]() const") { SECTION("JsonDocument::operator[]() const") {

4
src/ArduinoJson/Variant/ConverterImpl.hpp
View File

@ -12,6 +12,10 @@
# include <string> # include <string>
#endif #endif
#if ARDUINOJSON_ENABLE_STRING_VIEW
# include <string_view>
#endif
ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
template <typename T, typename Enable> template <typename T, typename Enable>