haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-02 20:36:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed tests for copy assignment

Browse source
This commit is contained in:
Niels 2015-02-10 17:40:47 +01:00
parent d760ff5142
commit 29a8d43d5a
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/json.hpp
View file

@ -445,7 +445,6 @@ class basic_json
/// copy assignment /// copy assignment
inline reference& operator=(basic_json other) noexcept inline reference& operator=(basic_json other) noexcept
{ {
assert(false); // not sure if function will ever be called
std::swap(m_type, other.m_type); std::swap(m_type, other.m_type);
std::swap(m_value, other.m_value); std::swap(m_value, other.m_value);
return *this; return *this;

1
src/json.hpp.re2c
View file

@ -445,7 +445,6 @@ class basic_json
/// copy assignment /// copy assignment
inline reference& operator=(basic_json other) noexcept inline reference& operator=(basic_json other) noexcept
{ {
assert(false); // not sure if function will ever be called
std::swap(m_type, other.m_type); std::swap(m_type, other.m_type);
std::swap(m_value, other.m_value); std::swap(m_value, other.m_value);
return *this; return *this;

21
test/unit.cpp
View file

@ -963,49 +963,56 @@ TEST_CASE("other constructors and destructor")
SECTION("object") SECTION("object")
{ {
json j {{"foo", 1}, {"bar", false}}; json j {{"foo", 1}, {"bar", false}};
json k = j; json k;
k = j;
CHECK(j == k); CHECK(j == k);
} }
SECTION("array") SECTION("array")
{ {
json j {"foo", 1, 42.23, false}; json j {"foo", 1, 42.23, false};
json k = j; json k;
k = j;
CHECK(j == k); CHECK(j == k);
} }
SECTION("null") SECTION("null")
{ {
json j(nullptr); json j(nullptr);
json k = j; json k;
k = j;
CHECK(j == k); CHECK(j == k);
} }
SECTION("boolean") SECTION("boolean")
{ {
json j(true); json j(true);
json k = j; json k;
k = j;
CHECK(j == k); CHECK(j == k);
} }
SECTION("string") SECTION("string")
{ {
json j("Hello world"); json j("Hello world");
json k = j; json k;
k = j;
CHECK(j == k); CHECK(j == k);
} }
SECTION("number (integer)") SECTION("number (integer)")
{ {
json j(42); json j(42);
json k = j; json k;
k = j;
CHECK(j == k); CHECK(j == k);
} }
SECTION("number (floating-point)") SECTION("number (floating-point)")
{ {
json j(42.23); json j(42.23);
json k = j; json k;
k = j;
CHECK(j == k); CHECK(j == k);
} }
} }