summaryrefslogtreecommitdiff
path: root/include/lib/ArduinoJson/Serialization
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2018-11-12 16:00:10 +0100
committerDaniel Friesel <derf@finalrewind.org>2018-11-12 16:00:10 +0100
commita85bdb81e81526d2732f915b7f9216ed77f32442 (patch)
treedb4fb609891c180a9a1d78a7f13a298201030baa /include/lib/ArduinoJson/Serialization
parentff5cca72f077dea1a4ae927dff82acbe939b1261 (diff)
Make ArduinoJson work with msp430.h
msp430.h defines the preprocessor variable "N", which is a frequently used template parameter name. These two do not go together.
Diffstat (limited to 'include/lib/ArduinoJson/Serialization')
-rw-r--r--include/lib/ArduinoJson/Serialization/JsonPrintable.hpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/lib/ArduinoJson/Serialization/JsonPrintable.hpp b/include/lib/ArduinoJson/Serialization/JsonPrintable.hpp
index 43d413a..e73f8fb 100644
--- a/include/lib/ArduinoJson/Serialization/JsonPrintable.hpp
+++ b/include/lib/ArduinoJson/Serialization/JsonPrintable.hpp
@@ -49,9 +49,9 @@ class JsonPrintable {
return printTo(sb);
}
- template <size_t N>
- size_t printTo(char (&buffer)[N]) const {
- return printTo(buffer, N);
+ template <size_t TN>
+ size_t printTo(char (&buffer)[TN]) const {
+ return printTo(buffer, TN);
}
template <typename TString>
@@ -72,9 +72,9 @@ class JsonPrintable {
return prettyPrintTo(sb);
}
- template <size_t N>
- size_t prettyPrintTo(char (&buffer)[N]) const {
- return prettyPrintTo(buffer, N);
+ template <size_t TN>
+ size_t prettyPrintTo(char (&buffer)[TN]) const {
+ return prettyPrintTo(buffer, TN);
}
template <typename Print>