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/TypeTraits/IsArray.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/lib/ArduinoJson/TypeTraits/IsArray.hpp') 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 struct IsArray { static const bool value = true; }; -template -struct IsArray { +template +struct IsArray { static const bool value = true; }; } -- cgit v1.2.3