External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

⏪ revert fix

Browse Source
This commit is contained in:
Niels Lohmann 2022-09-11 13:11:15 +02:00
parent f048eeb870
commit 9dbd679dbb
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
tests/src/unit-constructor1.cpp
View File

@ -1119,9 +1119,9 @@ TEST_CASE("constructors")
SECTION("constructor with implicit types (object)") SECTION("constructor with implicit types (object)")
{ {
// This should break through any short string optimization in std::string // This should break through any short string optimization in std::string
std::string const source(1024, '!'); std::string source(1024, '!');
const auto* source_addr = source.data(); const auto* source_addr = source.data();
json const j = {{"key", std::move(source)}}; json j = {{"key", std::move(source)}};
const auto* target_addr = j["key"].get_ref<std::string const&>().data(); const auto* target_addr = j["key"].get_ref<std::string const&>().data();
const bool success = (target_addr == source_addr); const bool success = (target_addr == source_addr);
CHECK(success); CHECK(success);
@ -1130,7 +1130,7 @@ TEST_CASE("constructors")
SECTION("constructor with implicit types (object key)") SECTION("constructor with implicit types (object key)")
{ {
// This should break through any short string optimization in std::string // This should break through any short string optimization in std::string
std::string const source(1024, '!'); std::string source(1024, '!');
const auto* source_addr = source.data(); const auto* source_addr = source.data();
json j = {{std::move(source), 42}}; json j = {{std::move(source), 42}};
const auto* target_addr = j.get_ref<json::object_t&>().begin()->first.data(); const auto* target_addr = j.get_ref<json::object_t&>().begin()->first.data();
@ -1143,9 +1143,9 @@ TEST_CASE("constructors")
{ {
SECTION("constructor with implicit types (array)") SECTION("constructor with implicit types (array)")
{ {
json::array_t const source = {1, 2, 3}; json::array_t source = {1, 2, 3};
const auto* source_addr = source.data(); const auto* source_addr = source.data();
json const j {std::move(source)}; json j {std::move(source)};
const auto* target_addr = j[0].get_ref<json::array_t const&>().data(); const auto* target_addr = j[0].get_ref<json::array_t const&>().data();
const bool success = (target_addr == source_addr); const bool success = (target_addr == source_addr);
CHECK(success); CHECK(success);
@ -1153,8 +1153,8 @@ TEST_CASE("constructors")
SECTION("constructor with implicit types (object)") SECTION("constructor with implicit types (object)")
{ {
json::array_t const source = {1, 2, 3}; json::array_t source = {1, 2, 3};
const auto* source_addr = source.data(); auto* source_addr = source.data();
json const j {{"key", std::move(source)}}; json const j {{"key", std::move(source)}};
const auto* target_addr = j["key"].get_ref<json::array_t const&>().data(); const auto* target_addr = j["key"].get_ref<json::array_t const&>().data();
const bool success = (target_addr == source_addr); const bool success = (target_addr == source_addr);
@ -1163,9 +1163,9 @@ TEST_CASE("constructors")
SECTION("assignment with implicit types (array)") SECTION("assignment with implicit types (array)")
{ {
json::array_t const source = {1, 2, 3}; json::array_t source = {1, 2, 3};
const auto* source_addr = source.data(); const auto* source_addr = source.data();
json const j = {std::move(source)}; json j = {std::move(source)};
const auto* target_addr = j[0].get_ref<json::array_t const&>().data(); const auto* target_addr = j[0].get_ref<json::array_t const&>().data();
const bool success = (target_addr == source_addr); const bool success = (target_addr == source_addr);
CHECK(success); CHECK(success);
@ -1173,9 +1173,9 @@ TEST_CASE("constructors")
SECTION("assignment with implicit types (object)") SECTION("assignment with implicit types (object)")
{ {
json::array_t const source = {1, 2, 3}; json::array_t source = {1, 2, 3};
const auto* source_addr = source.data(); const auto* source_addr = source.data();
json const j = {{"key", std::move(source)}}; json j = {{"key", std::move(source)}};
const auto* target_addr = j["key"].get_ref<json::array_t const&>().data(); const auto* target_addr = j["key"].get_ref<json::array_t const&>().data();
const bool success = (target_addr == source_addr); const bool success = (target_addr == source_addr);
CHECK(success); CHECK(success);
@ -1186,17 +1186,17 @@ TEST_CASE("constructors")
{ {
SECTION("constructor with implicit types (array)") SECTION("constructor with implicit types (array)")
{ {
json::object_t const source = {{"hello", "world"}}; json::object_t source = {{"hello", "world"}};
const json* source_addr = &source.at("hello"); const json* source_addr = &source.at("hello");
json const j {std::move(source)}; json j {std::move(source)};
CHECK(&(j[0].get_ref<json::object_t const&>().at("hello")) == source_addr); CHECK(&(j[0].get_ref<json::object_t const&>().at("hello")) == source_addr);
} }
SECTION("constructor with implicit types (object)") SECTION("constructor with implicit types (object)")
{ {
json::object_t const source = {{"hello", "world"}}; json::object_t source = {{"hello", "world"}};
const json* source_addr = &source.at("hello"); const json* source_addr = &source.at("hello");
json const j {{"key", std::move(source)}}; json j {{"key", std::move(source)}};
CHECK(&(j["key"].get_ref<json::object_t const&>().at("hello")) == source_addr); CHECK(&(j["key"].get_ref<json::object_t const&>().at("hello")) == source_addr);
} }
@ -1210,9 +1210,9 @@ TEST_CASE("constructors")
SECTION("assignment with implicit types (object)") SECTION("assignment with implicit types (object)")
{ {
json::object_t const source = {{"hello", "world"}}; json::object_t source = {{"hello", "world"}};
const json* source_addr = &source.at("hello"); const json* source_addr = &source.at("hello");
json const j = {{"key", std::move(source)}}; json j = {{"key", std::move(source)}};
CHECK(&(j["key"].get_ref<json::object_t const&>().at("hello")) == source_addr); CHECK(&(j["key"].get_ref<json::object_t const&>().at("hello")) == source_addr);
} }
} }
@ -1221,33 +1221,33 @@ TEST_CASE("constructors")
{ {
SECTION("constructor with implicit types (array)") SECTION("constructor with implicit types (array)")
{ {
json const source {1, 2, 3}; json source {1, 2, 3};
const json* source_addr = &source[0]; const json* source_addr = &source[0];
json const j {std::move(source), {}}; json j {std::move(source), {}};
CHECK(&j[0][0] == source_addr); CHECK(&j[0][0] == source_addr);
} }
SECTION("constructor with implicit types (object)") SECTION("constructor with implicit types (object)")
{ {
json const source {1, 2, 3}; json source {1, 2, 3};
const json* source_addr = &source[0]; const json* source_addr = &source[0];
json const j {{"key", std::move(source)}}; json j {{"key", std::move(source)}};
CHECK(&j["key"][0] == source_addr); CHECK(&j["key"][0] == source_addr);
} }
SECTION("assignment with implicit types (array)") SECTION("assignment with implicit types (array)")
{ {
json const source {1, 2, 3}; json source {1, 2, 3};
const json* source_addr = &source[0]; const json* source_addr = &source[0];
json const j = {std::move(source), {}}; json j = {std::move(source), {}};
CHECK(&j[0][0] == source_addr); CHECK(&j[0][0] == source_addr);
} }
SECTION("assignment with implicit types (object)") SECTION("assignment with implicit types (object)")
{ {
json const source {1, 2, 3}; json source {1, 2, 3};
const json* source_addr = &source[0]; const json* source_addr = &source[0];
json const j = {{"key", std::move(source)}}; json j = {{"key", std::move(source)}};
CHECK(&j["key"][0] == source_addr); CHECK(&j["key"][0] == source_addr);
} }
} }