j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

🔨 fixed compilation error

Browse source
This commit is contained in:
Niels Lohmann 2017-07-26 23:59:56 +02:00
parent e6aa700360
commit 3d589fd032
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
4 changed files with 24 additions and 24 deletions

2
src/json.hpp
View file

@ -3618,7 +3618,7 @@ class primitive_iterator_t
return lhs.m_it - rhs.m_it; return lhs.m_it - rhs.m_it;
} }
friend constexpr std::ostream& operator<<(std::ostream& os, primitive_iterator_t it) friend std::ostream& operator<<(std::ostream& os, primitive_iterator_t it)
{ {
return os << it.m_it; return os << it.m_it;
} }

14
test/src/unit-class_const_iterator.cpp
View file

@ -182,32 +182,32 @@ TEST_CASE("const_iterator class")
{ {
json j(json::value_t::null); json j(json::value_t::null);
json::const_iterator it = j.cbegin(); json::const_iterator it = j.cbegin();
CHECK_THROWS_AS(it->type_name(), json::invalid_iterator&); CHECK_THROWS_AS(std::string(it->type_name()), json::invalid_iterator&);
CHECK_THROWS_WITH(it->type_name(), "[json.exception.invalid_iterator.214] cannot get value"); CHECK_THROWS_WITH(std::string(it->type_name()), "[json.exception.invalid_iterator.214] cannot get value");
} }
SECTION("number") SECTION("number")
{ {
json j(17); json j(17);
json::const_iterator it = j.cbegin(); json::const_iterator it = j.cbegin();
CHECK(it->type_name() == "number"); CHECK(std::string(it->type_name()) == "number");
it = j.cend(); it = j.cend();
CHECK_THROWS_AS(it->type_name(), json::invalid_iterator&); CHECK_THROWS_AS(std::string(it->type_name()), json::invalid_iterator&);
CHECK_THROWS_WITH(it->type_name(), "[json.exception.invalid_iterator.214] cannot get value"); CHECK_THROWS_WITH(std::string(it->type_name()), "[json.exception.invalid_iterator.214] cannot get value");
} }
SECTION("object") SECTION("object")
{ {
json j({{"foo", "bar"}}); json j({{"foo", "bar"}});
json::const_iterator it = j.cbegin(); json::const_iterator it = j.cbegin();
CHECK(it->type_name() == "string"); CHECK(std::string(it->type_name()) == "string");
} }
SECTION("array") SECTION("array")
{ {
json j({1, 2, 3, 4}); json j({1, 2, 3, 4});
json::const_iterator it = j.cbegin(); json::const_iterator it = j.cbegin();
CHECK(it->type_name() == "number"); CHECK(std::string(it->type_name()) == "number");
} }
} }
} }

14
test/src/unit-class_iterator.cpp
View file

@ -166,32 +166,32 @@ TEST_CASE("iterator class")
{ {
json j(json::value_t::null); json j(json::value_t::null);
json::iterator it = j.begin(); json::iterator it = j.begin();
CHECK_THROWS_AS(it->type_name(), json::invalid_iterator&); CHECK_THROWS_AS(std::string(it->type_name()), json::invalid_iterator&);
CHECK_THROWS_WITH(it->type_name(), "[json.exception.invalid_iterator.214] cannot get value"); CHECK_THROWS_WITH(std::string(it->type_name()), "[json.exception.invalid_iterator.214] cannot get value");
} }
SECTION("number") SECTION("number")
{ {
json j(17); json j(17);
json::iterator it = j.begin(); json::iterator it = j.begin();
CHECK(it->type_name() == "number"); CHECK(std::string(it->type_name()) == "number");
it = j.end(); it = j.end();
CHECK_THROWS_AS(it->type_name(), json::invalid_iterator&); CHECK_THROWS_AS(std::string(it->type_name()), json::invalid_iterator&);
CHECK_THROWS_WITH(it->type_name(), "[json.exception.invalid_iterator.214] cannot get value"); CHECK_THROWS_WITH(std::string(it->type_name()), "[json.exception.invalid_iterator.214] cannot get value");
} }
SECTION("object") SECTION("object")
{ {
json j({{"foo", "bar"}}); json j({{"foo", "bar"}});
json::iterator it = j.begin(); json::iterator it = j.begin();
CHECK(it->type_name() == "string"); CHECK(std::string(it->type_name()) == "string");
} }
SECTION("array") SECTION("array")
{ {
json j({1, 2, 3, 4}); json j({1, 2, 3, 4});
json::iterator it = j.begin(); json::iterator it = j.begin();
CHECK(it->type_name() == "number"); CHECK(std::string(it->type_name()) == "number");
} }
} }
} }

18
test/src/unit-convenience.cpp
View file

@ -45,15 +45,15 @@ TEST_CASE("convenience functions")
{ {
SECTION("type name as string") SECTION("type name as string")
{ {
CHECK(json(json::value_t::null).type_name() == "null"); CHECK(std::string(json(json::value_t::null).type_name()) == "null");
CHECK(json(json::value_t::object).type_name() == "object"); CHECK(std::string(json(json::value_t::object).type_name()) == "object");
CHECK(json(json::value_t::array).type_name() == "array"); CHECK(std::string(json(json::value_t::array).type_name()) == "array");
CHECK(json(json::value_t::number_integer).type_name() == "number"); CHECK(std::string(json(json::value_t::number_integer).type_name()) == "number");
CHECK(json(json::value_t::number_unsigned).type_name() == "number"); CHECK(std::string(json(json::value_t::number_unsigned).type_name()) == "number");
CHECK(json(json::value_t::number_float).type_name() == "number"); CHECK(std::string(json(json::value_t::number_float).type_name()) == "number");
CHECK(json(json::value_t::boolean).type_name() == "boolean"); CHECK(std::string(json(json::value_t::boolean).type_name()) == "boolean");
CHECK(json(json::value_t::string).type_name() == "string"); CHECK(std::string(json(json::value_t::string).type_name()) == "string");
CHECK(json(json::value_t::discarded).type_name() == "discarded"); CHECK(std::string(json(json::value_t::discarded).type_name()) == "discarded");
} }
SECTION("string escape") SECTION("string escape")