feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Added support uint8_t for serializeMsgPack() (closes #1142)

Browse Source
This commit is contained in:
Benoit Blanchon
2019-12-13 14:15:30 +01:00
parent 062c1c13b5
commit 8bf6f6e09f
6 changed files with 80 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ArduinoJson/Json/JsonSerializer.hpp
View File

@ -103,7 +103,7 @@ size_t serializeJson(const TSource &source, TDestination &destination) {
}
template <typename TSource>
size_t serializeJson(const TSource &source, char *buffer, size_t bufferSize) {
size_t serializeJson(const TSource &source, void *buffer, size_t bufferSize) {
return serialize<JsonSerializer>(source, buffer, bufferSize);
}

2
src/ArduinoJson/Json/PrettyJsonSerializer.hpp
View File

@ -70,7 +70,7 @@ size_t serializeJsonPretty(const TSource &source, TDestination &destination) {
}
template <typename TSource>
size_t serializeJsonPretty(const TSource &source, char *buffer,
size_t serializeJsonPretty(const TSource &source, void *buffer,
size_t bufferSize) {
return serialize<PrettyJsonSerializer>(source, buffer, bufferSize);
}

4
src/ArduinoJson/MsgPack/MsgPackSerializer.hpp
View File

@ -172,8 +172,8 @@ inline size_t serializeMsgPack(const TSource& source, TDestination& output) {
return serialize<MsgPackSerializer>(source, output);
}
template <typename TSource, typename TDestination>
inline size_t serializeMsgPack(const TSource& source, TDestination* output,
template <typename TSource>
inline size_t serializeMsgPack(const TSource& source, void* output,
size_t size) {
return serialize<MsgPackSerializer>(source, output, size);
}

16
src/ArduinoJson/Serialization/serialize.hpp
View File

@ -24,14 +24,20 @@ size_t serialize(const TSource &source, TDestination &destination) {
}
template <template <typename> class TSerializer, typename TSource>
size_t serialize(const TSource &source, char *buffer, size_t bufferSize) {
StaticStringWriter writer(buffer, bufferSize);
size_t serialize(const TSource &source, void *buffer, size_t bufferSize) {
StaticStringWriter writer(reinterpret_cast<char *>(buffer), bufferSize);
return doSerialize<TSerializer>(source, writer);
}
template <template <typename> class TSerializer, typename TSource, size_t N>
size_t serialize(const TSource &source, char (&buffer)[N]) {
StaticStringWriter writer(buffer, N);
template <template <typename> class TSerializer, typename TSource,
typename TChar, size_t N>
#if defined _MSC_VER && _MSC_VER < 1900
typename enable_if<sizeof(remove_reference<TChar>::type) == 1, size_t>::type
#else
typename enable_if<sizeof(TChar) == 1, size_t>::type
#endif
serialize(const TSource &source, TChar (&buffer)[N]) {
StaticStringWriter writer(reinterpret_cast<char *>(buffer), N);
return doSerialize<TSerializer>(source, writer);
}