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

Fixed error when both ARDUINOJSON_ENABLE_STD_STREAM and ARDUINOJSON_ENABLE_ARDUINO_STREAM are set to 1

Browse Source
This commit is contained in:
Benoit Blanchon
2017-01-15 15:18:59 +01:00
parent 8499f0b960
commit ec6cbc5135
16 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/ArduinoJson/StringTraits/CharPointer.hpp
View File

@@ -10,7 +10,7 @@
namespace ArduinoJson {
namespace Internals {
struct CharPtrFuncs {
struct CharPointerTraits {
class Iterator {
const char* _ptr;
@@ -43,9 +43,9 @@ struct CharPtrFuncs {
};
template <>
struct StringFuncs<const char*, void> : CharPtrFuncs {};
struct StringTraits<const char*, void> : CharPointerTraits {};
template <>
struct StringFuncs<char*, void> : CharPtrFuncs {};
struct StringTraits<char*, void> : CharPointerTraits {};
}
}