github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-11-01 00:38:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace ARDUINOJSON_NAMESPACE with an inline namespace (#1820)

Browse Source
This commit is contained in:
Benoit Blanchon
2023-02-14 10:04:48 +01:00
parent 34dd46110b
commit 1b66a217bf
171 changed files with 855 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extras/tests/JsonVariant/as.cpp
View File

@@ -7,7 +7,7 @@
#include <catch.hpp>
namespace my {
using ARDUINOJSON_NAMESPACE::isinf;
using ArduinoJson::detail::isinf;
} // namespace my
enum MY_ENUM { ONE = 1, TWO = 2 };

6
extras/tests/JsonVariant/converters.cpp
View File

@@ -88,7 +88,7 @@ class Complex {
double _real, _imag;
};
namespace ARDUINOJSON_NAMESPACE {
namespace ArduinoJson {
template <>
struct Converter<Complex> {
static void toJson(const Complex& src, JsonVariant dst) {
@@ -104,7 +104,7 @@ struct Converter<Complex> {
return src["real"].is<double>() && src["imag"].is<double>();
}
};
} // namespace ARDUINOJSON_NAMESPACE
} // namespace ArduinoJson
TEST_CASE("Custom converter with specialization") {
DynamicJsonDocument doc(4096);
@@ -142,7 +142,7 @@ TEST_CASE("Custom converter with specialization") {
}
TEST_CASE("ConverterNeedsWriteableRef") {
using namespace ARDUINOJSON_NAMESPACE;
using namespace ArduinoJson::detail;
CHECK(ConverterNeedsWriteableRef<int>::value == false);
CHECK(ConverterNeedsWriteableRef<float>::value == false);
CHECK(ConverterNeedsWriteableRef<JsonVariant>::value == true);

4
extras/tests/JsonVariant/stl_containers.cpp
View File

@@ -10,7 +10,7 @@
#include <string>
#include <vector>
namespace ARDUINOJSON_NAMESPACE {
namespace ArduinoJson {
template <typename T>
struct Converter<std::vector<T> > {
static void toJson(const std::vector<T>& src, JsonVariant dst) {
@@ -63,7 +63,7 @@ struct Converter<std::array<T, N> > {
return result && size == N;
}
};
} // namespace ARDUINOJSON_NAMESPACE
} // namespace ArduinoJson
TEST_CASE("vector<int>") {
SECTION("toJson") {