summaryrefslogtreecommitdiff
path: root/include/lib/ArduinoJson/TypeTraits/IsArray.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/TypeTraits/IsArray.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/TypeTraits/IsArray.hpp')
-rw-r--r--include/lib/ArduinoJson/TypeTraits/IsArray.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/lib/ArduinoJson/TypeTraits/IsArray.hpp b/include/lib/ArduinoJson/TypeTraits/IsArray.hpp
index 2599231..da42072 100644
--- a/include/lib/ArduinoJson/TypeTraits/IsArray.hpp
+++ b/include/lib/ArduinoJson/TypeTraits/IsArray.hpp
@@ -16,8 +16,8 @@ template <typename T>
struct IsArray<T[]> {
static const bool value = true;
};
-template <typename T, size_t N>
-struct IsArray<T[N]> {
+template <typename T, size_t TN>
+struct IsArray<T[TN]> {
static const bool value = true;
};
}