From a85bdb81e81526d2732f915b7f9216ed77f32442 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Mon, 12 Nov 2018 16:00:10 +0100
Subject: 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.
---
 include/lib/ArduinoJson/JsonArray.hpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'include/lib/ArduinoJson/JsonArray.hpp')

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
-- 
cgit v1.2.3