diff --git a/extras/tests/JsonDocument/BasicJsonDocument.cpp b/extras/tests/JsonDocument/BasicJsonDocument.cpp index d2074401..57e9e629 100644 --- a/extras/tests/JsonDocument/BasicJsonDocument.cpp +++ b/extras/tests/JsonDocument/BasicJsonDocument.cpp @@ -72,7 +72,6 @@ TEST_CASE("BasicJsonDocument") { REQUIRE(log.str() == "A4096A4096FF"); } -#if ARDUINOJSON_HAS_RVALUE_REFERENCES SECTION("Move construct") { { BasicJsonDocument doc1(4096, log); @@ -87,7 +86,6 @@ TEST_CASE("BasicJsonDocument") { } REQUIRE(log.str() == "A4096F"); } -#endif SECTION("Copy assign larger") { { @@ -134,7 +132,6 @@ TEST_CASE("BasicJsonDocument") { REQUIRE(log.str() == "A1024A1024FF"); } -#if ARDUINOJSON_HAS_RVALUE_REFERENCES SECTION("Move assign") { { BasicJsonDocument doc1(4096, log); @@ -150,7 +147,6 @@ TEST_CASE("BasicJsonDocument") { } REQUIRE(log.str() == "A4096A8FF"); } -#endif SECTION("garbageCollect()") { BasicJsonDocument doc(4096); diff --git a/src/ArduinoJson/Configuration.hpp b/src/ArduinoJson/Configuration.hpp index 3ebdab5c..374cf760 100644 --- a/src/ArduinoJson/Configuration.hpp +++ b/src/ArduinoJson/Configuration.hpp @@ -4,12 +4,6 @@ #pragma once -#if __cplusplus >= 201103L -# define ARDUINOJSON_HAS_RVALUE_REFERENCES 1 -#else -# define ARDUINOJSON_HAS_RVALUE_REFERENCES 0 -#endif - #ifndef ARDUINOJSON_HAS_NULLPTR # if __cplusplus >= 201103L # define ARDUINOJSON_HAS_NULLPTR 1 diff --git a/src/ArduinoJson/Document/BasicJsonDocument.hpp b/src/ArduinoJson/Document/BasicJsonDocument.hpp index 7a32f6f2..1eb18f3c 100644 --- a/src/ArduinoJson/Document/BasicJsonDocument.hpp +++ b/src/ArduinoJson/Document/BasicJsonDocument.hpp @@ -52,11 +52,9 @@ class BasicJsonDocument : AllocatorOwner, public JsonDocument { } // Move-constructor -#if ARDUINOJSON_HAS_RVALUE_REFERENCES BasicJsonDocument(BasicJsonDocument&& src) : AllocatorOwner(src) { moveAssignFrom(src); } -#endif BasicJsonDocument(const JsonDocument& src) { copyAssignFrom(src); @@ -90,12 +88,10 @@ class BasicJsonDocument : AllocatorOwner, public JsonDocument { return *this; } -#if ARDUINOJSON_HAS_RVALUE_REFERENCES BasicJsonDocument& operator=(BasicJsonDocument&& src) { moveAssignFrom(src); return *this; } -#endif template BasicJsonDocument& operator=(const T& src) {