Fix compatibility with the Blynk libary (fixes #1914)

Ported from 52d8a65

Author: bblanchon

extras/scripts/publish.sh

@@ -46,6 +46,7 @@ update_version_in_source () {
 		-e "s/ARDUINOJSON_VERSION_MAJOR .*$/ARDUINOJSON_VERSION_MAJOR $MAJOR/" \
 		-e "s/ARDUINOJSON_VERSION_MINOR .*$/ARDUINOJSON_VERSION_MINOR $MINOR/" \
 		-e "s/ARDUINOJSON_VERSION_REVISION .*$/ARDUINOJSON_VERSION_REVISION $REVISION/" \
+		-e "s/ARDUINOJSON_VERSION_MACRO .*$/ARDUINOJSON_VERSION_MACRO V$MAJOR$MINOR$REVISION/" \
 		src/ArduinoJson/version.hpp
 	rm src/ArduinoJson/version.hpp*~
 }

extras/tests/Misc/conflicts.cpp

@@ -55,5 +55,8 @@
 // issue #1905
 #define _current
 
+// issue #1914
+#define V7 7
+
 // catch.hpp mutes several warnings, this file also allows to detect them
 #include "ArduinoJson.h"

src/ArduinoJson/Namespace.hpp

@@ -11,9 +11,7 @@
 #ifndef ARDUINOJSON_VERSION_NAMESPACE
 
 #  define ARDUINOJSON_VERSION_NAMESPACE                                    \
-    ARDUINOJSON_CONCAT3(ARDUINOJSON_CONCAT4(V, ARDUINOJSON_VERSION_MAJOR,  \
-                                            ARDUINOJSON_VERSION_MINOR,     \
-                                            ARDUINOJSON_VERSION_REVISION), \
+    ARDUINOJSON_CONCAT3(ARDUINOJSON_VERSION_MACRO,                         \
                         ARDUINOJSON_BIN2ALPHA(ARDUINOJSON_ENABLE_PROGMEM,  \
                                               ARDUINOJSON_USE_LONG_LONG,   \
                                               ARDUINOJSON_USE_DOUBLE, 1),  \

src/ArduinoJson/Polyfills/preprocessor.hpp

@@ -8,8 +8,6 @@
 #define ARDUINOJSON_CONCAT2(A, B) ARDUINOJSON_CONCAT_(A, B)
 #define ARDUINOJSON_CONCAT3(A, B, C) \
   ARDUINOJSON_CONCAT2(ARDUINOJSON_CONCAT2(A, B), C)
-#define ARDUINOJSON_CONCAT4(A, B, C, D) \
-  ARDUINOJSON_CONCAT2(ARDUINOJSON_CONCAT2(A, B), ARDUINOJSON_CONCAT2(C, D))
 
 #define ARDUINOJSON_BIN2ALPHA_0000() A
 #define ARDUINOJSON_BIN2ALPHA_0001() B

src/ArduinoJson/version.hpp

@@ -8,3 +8,4 @@
 #define ARDUINOJSON_VERSION_MAJOR 7
 #define ARDUINOJSON_VERSION_MINOR 0
 #define ARDUINOJSON_VERSION_REVISION 0
+#define ARDUINOJSON_VERSION_MACRO V700