summaryrefslogtreecommitdiff
path: root/include/lib/ArduinoJson/JsonArray.hpp
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/JsonArray.hpp
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/JsonArray.hpp')
-rw-r--r--include/lib/ArduinoJson/JsonArray.hpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/lib/ArduinoJson/JsonArray.hpp b/include/lib/ArduinoJson/JsonArray.hpp
index 2acd2a1..4431e7a 100644
--- a/include/lib/ArduinoJson/JsonArray.hpp
+++ b/include/lib/ArduinoJson/JsonArray.hpp
@@ -141,9 +141,9 @@ class JsonArray : public Internals::JsonPrintable<JsonArray>,
}
// Imports a 1D array
- template <typename T, size_t N>
- bool copyFrom(T (&array)[N]) {
- return copyFrom(array, N);
+ template <typename T, size_t TN>
+ bool copyFrom(T (&array)[TN]) {
+ return copyFrom(array, TN);
}
// Imports a 1D array
@@ -170,9 +170,9 @@ class JsonArray : public Internals::JsonPrintable<JsonArray>,
}
// Exports a 1D array
- template <typename T, size_t N>
- size_t copyTo(T (&array)[N]) const {
- return copyTo(array, N);
+ template <typename T, size_t TN>
+ size_t copyTo(T (&array)[TN]) const {
+ return copyTo(array, TN);
}
// Exports a 1D array