Skip to content

Commit 1b66a21

Browse files
committed
Replace ARDUINOJSON_NAMESPACE with an inline namespace (#1820)
1 parent 34dd461 commit 1b66a21

File tree

171 files changed

+855
-684
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+855
-684
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ HEAD
55
----
66

77
* Drop support for C++98/C++03. Minimum required is C++11.
8+
* Remove `ARDUINOJSON_NAMESPACE`; use `ArduinoJson` instead.
89

910
v6.20.1 (2023-02-08)
1011
-------

extras/conf_test/avr.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN");
99

1010
static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE");
1111

12-
static_assert(sizeof(ARDUINOJSON_NAMESPACE::VariantSlot) == 8,
12+
static_assert(sizeof(ArduinoJson::detail::VariantSlot) == 8,
1313
"sizeof(VariantSlot)");
1414

1515
void setup() {}

extras/conf_test/esp8266.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN");
99

1010
static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE");
1111

12-
static_assert(sizeof(ARDUINOJSON_NAMESPACE::VariantSlot) == 16,
12+
static_assert(sizeof(ArduinoJson::detail::VariantSlot) == 16,
1313
"sizeof(VariantSlot)");
1414

1515
void setup() {}

extras/conf_test/x64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN");
99

1010
static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE");
1111

12-
static_assert(sizeof(ARDUINOJSON_NAMESPACE::VariantSlot) == 32,
12+
static_assert(sizeof(ArduinoJson::detail::VariantSlot) == 32,
1313
"sizeof(VariantSlot)");
1414

1515
int main() {}

extras/conf_test/x86.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN");
99

1010
static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE");
1111

12-
static_assert(sizeof(ARDUINOJSON_NAMESPACE::VariantSlot) == 16,
12+
static_assert(sizeof(ArduinoJson::detail::VariantSlot) == 16,
1313
"sizeof(VariantSlot)");
1414

1515
int main() {}

extras/scripts/build-single-header.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ process()
5353
}
5454

5555
simplify_namespaces() {
56-
perl -p0i -e 's|\} // namespace ARDUINOJSON_NAMESPACE\r?\nnamespace ARDUINOJSON_NAMESPACE \{\r?\n||igs' "$1"
56+
perl -p0i -e 's|ARDUINOJSON_END_PUBLIC_NAMESPACE\r?\nARDUINOJSON_BEGIN_PUBLIC_NAMESPACE\r?\n||igs' "$1"
57+
perl -p0i -e 's|ARDUINOJSON_END_PRIVATE_NAMESPACE\r?\nARDUINOJSON_BEGIN_PRIVATE_NAMESPACE\r?\n||igs' "$1"
5758
rm -f "$1.bak"
5859
}
5960

extras/tests/Cpp17/string_view.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ TEST_CASE("string_view") {
8686
}
8787
}
8888

89-
using ARDUINOJSON_NAMESPACE::adaptString;
89+
using ArduinoJson::detail::adaptString;
9090

9191
TEST_CASE("StringViewAdapter") {
9292
std::string_view str("bravoXXX", 5);

extras/tests/JsonDeserializer/number.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#include <catch.hpp>
1212

1313
namespace my {
14-
using ARDUINOJSON_NAMESPACE::isinf;
15-
using ARDUINOJSON_NAMESPACE::isnan;
14+
using ArduinoJson::detail::isinf;
15+
using ArduinoJson::detail::isnan;
1616
} // namespace my
1717

1818
TEST_CASE("deserialize an integer") {

extras/tests/JsonDocument/BasicJsonDocument.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
#include <sstream>
99
#include <utility>
1010

11-
using ARDUINOJSON_NAMESPACE::addPadding;
12-
1311
class SpyingAllocator {
1412
public:
1513
SpyingAllocator(const SpyingAllocator& src) : _log(src._log) {}

extras/tests/JsonDocument/DynamicJsonDocument.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <ArduinoJson.h>
66
#include <catch.hpp>
77

8-
using ARDUINOJSON_NAMESPACE::addPadding;
8+
using ArduinoJson::detail::addPadding;
99

1010
static void REQUIRE_JSON(JsonDocument& doc, const std::string& expected) {
1111
std::string json;

0 commit comments

Comments
 (0)