From a85bdb81e81526d2732f915b7f9216ed77f32442 Mon Sep 17 00:00:00 2001 From: Daniel Friesel 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/Serialization/JsonPrintable.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'include/lib/ArduinoJson/Serialization') 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 printTo(char (&buffer)[N]) const { - return printTo(buffer, N); + template + size_t printTo(char (&buffer)[TN]) const { + return printTo(buffer, TN); } template @@ -72,9 +72,9 @@ class JsonPrintable { return prettyPrintTo(sb); } - template - size_t prettyPrintTo(char (&buffer)[N]) const { - return prettyPrintTo(buffer, N); + template + size_t prettyPrintTo(char (&buffer)[TN]) const { + return prettyPrintTo(buffer, TN); } template -- cgit v1.2.3