Replace ARDUINOJSON_USE_ARDUINO_STRING by ARDUINOJSON_ENABLE_STD_STRI…

…NG and ARDUINOJSON_ENABLE_ARDUINO_STRING

CHANGELOG.md

@@ -4,23 +4,28 @@ ArduinoJson: change log
 HEAD
 ----
 
-* Increased default nesting limit to 50 when compiled for a computer (issue #349)
+* Removed `ArduinoJson::String`
 * Templatized all functions using `String` or `std::string`
+* Replaced `ARDUINOJSON_USE_ARDUINO_STRING` by `ARDUINOJSON_ENABLE_STD_STRING` and `ARDUINOJSON_ENABLE_ARDUINO_STRING`
+* Increased default nesting limit to 50 when compiled for a computer (issue #349)
 
-**BREAKING CHANGE**:
+**BREAKING CHANGES**:
 
 The non-template function `JsonObject::get()` and `JsonArray.get()` have been removed. This means that you need to explicitely tell the type you expect in return.
 
 Old code:
 
 ```c++
+#define ARDUINOJSON_USE_ARDUINO_STRING 0
 JsonVariant value1 = myObject.get("myKey");
 JsonVariant value2 = myArray.get(0);
 ```
 
 New code:
 
 ```c++
+#define ARDUINOJSON_ENABLE_ARDUINO_STRING 0
+#define ARDUINOJSON_ENABLE_STD_STRING 1
 JsonVariant value1 = myObject.get<JsonVariant>("myKey");
 JsonVariant value2 = myArray.get<JsonVariant>(0);
 ```

include/ArduinoJson/Configuration.hpp

@@ -22,12 +22,17 @@
 #define ARDUINOJSON_USE_INT64 0
 #endif
 
-// arduino has its own implementation of String to replace std::string
-#ifndef ARDUINOJSON_USE_ARDUINO_STRING
-#define ARDUINOJSON_USE_ARDUINO_STRING 1
+// Arduino has its own implementation of String to replace std::string
+#ifndef ARDUINOJSON_ENABLE_ARDUINO_STRING
+#define ARDUINOJSON_ENABLE_ARDUINO_STRING 1
 #endif
 
-// arduino doesn't support STL stream
+// Arduino doesn't have std::string
+#ifndef ARDUINOJSON_ENABLE_STD_STRING
+#define ARDUINOJSON_ENABLE_STD_STRING 1
+#endif
+
+// Arduino doesn't support STL stream
 #ifndef ARDUINOJSON_ENABLE_STD_STREAM
 #define ARDUINOJSON_ENABLE_STD_STREAM 0
 #endif
@@ -73,8 +78,13 @@
 #endif
 
 // on a computer, we can use std::string
-#ifndef ARDUINOJSON_USE_ARDUINO_STRING
-#define ARDUINOJSON_USE_ARDUINO_STRING 0
+#ifndef ARDUINOJSON_ENABLE_STD_STRING
+#define ARDUINOJSON_ENABLE_STD_STRING 1
+#endif
+
+// on a computer, there is no reason to beleive Arduino String is available
+#ifndef ARDUINOJSON_ENABLE_ARDUINO_STRING
+#define ARDUINOJSON_ENABLE_ARDUINO_STRING 0
 #endif
 
 // on a computer, we can assume that the STL is there

include/ArduinoJson/JsonString.hpp

@@ -9,9 +9,11 @@
 
 #include "Configuration.hpp"
 
-#if ARDUINOJSON_USE_ARDUINO_STRING
+#if ARDUINOJSON_ENABLE_ARDUINO_STRING
 #include <WString.h>
-#else
+#endif
+
+#if ARDUINOJSON_ENABLE_STD_STRING
 #include <string>
 #endif
 
@@ -102,22 +104,20 @@ class StandardJsonString {
   static const bool should_copy = true;
 };
 
-#if ARDUINOJSON_USE_ARDUINO_STRING
-
+#if ARDUINOJSON_ENABLE_ARDUINO_STRING
 template <>
 class JsonString<String> : public StandardJsonString<String> {
  public:
   JsonString(const String& str) : StandardJsonString(str) {}
 };
+#endif
 
-#else
-
+#if ARDUINOJSON_ENABLE_STD_STRING
 template <>
 class JsonString<std::string> : public StandardJsonString<std::string> {
  public:
   JsonString(const std::string& str) : StandardJsonString(str) {}
 };
-
 #endif
 
 template <typename TString>