From 3d589fd032316b67681b68a15eb6dcbb78377387 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Wed, 26 Jul 2017 23:59:56 +0200 Subject: [PATCH] :hammer: fixed compilation error --- src/json.hpp | 2 +- test/src/unit-class_const_iterator.cpp | 14 +++++++------- test/src/unit-class_iterator.cpp | 14 +++++++------- test/src/unit-convenience.cpp | 18 +++++++++--------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/json.hpp b/src/json.hpp index 69ecab0f2..78212af0f 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -3618,7 +3618,7 @@ class primitive_iterator_t 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; } diff --git a/test/src/unit-class_const_iterator.cpp b/test/src/unit-class_const_iterator.cpp index 781798826..573e773bb 100644 --- a/test/src/unit-class_const_iterator.cpp +++ b/test/src/unit-class_const_iterator.cpp @@ -182,32 +182,32 @@ TEST_CASE("const_iterator class") { json j(json::value_t::null); json::const_iterator it = j.cbegin(); - CHECK_THROWS_AS(it->type_name(), json::invalid_iterator&); - CHECK_THROWS_WITH(it->type_name(), "[json.exception.invalid_iterator.214] cannot get value"); + CHECK_THROWS_AS(std::string(it->type_name()), json::invalid_iterator&); + CHECK_THROWS_WITH(std::string(it->type_name()), "[json.exception.invalid_iterator.214] cannot get value"); } SECTION("number") { json j(17); json::const_iterator it = j.cbegin(); - CHECK(it->type_name() == "number"); + CHECK(std::string(it->type_name()) == "number"); it = j.cend(); - CHECK_THROWS_AS(it->type_name(), json::invalid_iterator&); - CHECK_THROWS_WITH(it->type_name(), "[json.exception.invalid_iterator.214] cannot get value"); + CHECK_THROWS_AS(std::string(it->type_name()), json::invalid_iterator&); + CHECK_THROWS_WITH(std::string(it->type_name()), "[json.exception.invalid_iterator.214] cannot get value"); } SECTION("object") { json j({{"foo", "bar"}}); json::const_iterator it = j.cbegin(); - CHECK(it->type_name() == "string"); + CHECK(std::string(it->type_name()) == "string"); } SECTION("array") { json j({1, 2, 3, 4}); json::const_iterator it = j.cbegin(); - CHECK(it->type_name() == "number"); + CHECK(std::string(it->type_name()) == "number"); } } } diff --git a/test/src/unit-class_iterator.cpp b/test/src/unit-class_iterator.cpp index 7057d9679..1ef4a5389 100644 --- a/test/src/unit-class_iterator.cpp +++ b/test/src/unit-class_iterator.cpp @@ -166,32 +166,32 @@ TEST_CASE("iterator class") { json j(json::value_t::null); json::iterator it = j.begin(); - CHECK_THROWS_AS(it->type_name(), json::invalid_iterator&); - CHECK_THROWS_WITH(it->type_name(), "[json.exception.invalid_iterator.214] cannot get value"); + CHECK_THROWS_AS(std::string(it->type_name()), json::invalid_iterator&); + CHECK_THROWS_WITH(std::string(it->type_name()), "[json.exception.invalid_iterator.214] cannot get value"); } SECTION("number") { json j(17); json::iterator it = j.begin(); - CHECK(it->type_name() == "number"); + CHECK(std::string(it->type_name()) == "number"); it = j.end(); - CHECK_THROWS_AS(it->type_name(), json::invalid_iterator&); - CHECK_THROWS_WITH(it->type_name(), "[json.exception.invalid_iterator.214] cannot get value"); + CHECK_THROWS_AS(std::string(it->type_name()), json::invalid_iterator&); + CHECK_THROWS_WITH(std::string(it->type_name()), "[json.exception.invalid_iterator.214] cannot get value"); } SECTION("object") { json j({{"foo", "bar"}}); json::iterator it = j.begin(); - CHECK(it->type_name() == "string"); + CHECK(std::string(it->type_name()) == "string"); } SECTION("array") { json j({1, 2, 3, 4}); json::iterator it = j.begin(); - CHECK(it->type_name() == "number"); + CHECK(std::string(it->type_name()) == "number"); } } } diff --git a/test/src/unit-convenience.cpp b/test/src/unit-convenience.cpp index 1faecce87..9a416a84e 100644 --- a/test/src/unit-convenience.cpp +++ b/test/src/unit-convenience.cpp @@ -45,15 +45,15 @@ TEST_CASE("convenience functions") { SECTION("type name as string") { - CHECK(json(json::value_t::null).type_name() == "null"); - CHECK(json(json::value_t::object).type_name() == "object"); - CHECK(json(json::value_t::array).type_name() == "array"); - CHECK(json(json::value_t::number_integer).type_name() == "number"); - CHECK(json(json::value_t::number_unsigned).type_name() == "number"); - CHECK(json(json::value_t::number_float).type_name() == "number"); - CHECK(json(json::value_t::boolean).type_name() == "boolean"); - CHECK(json(json::value_t::string).type_name() == "string"); - CHECK(json(json::value_t::discarded).type_name() == "discarded"); + CHECK(std::string(json(json::value_t::null).type_name()) == "null"); + CHECK(std::string(json(json::value_t::object).type_name()) == "object"); + CHECK(std::string(json(json::value_t::array).type_name()) == "array"); + CHECK(std::string(json(json::value_t::number_integer).type_name()) == "number"); + CHECK(std::string(json(json::value_t::number_unsigned).type_name()) == "number"); + CHECK(std::string(json(json::value_t::number_float).type_name()) == "number"); + CHECK(std::string(json(json::value_t::boolean).type_name()) == "boolean"); + CHECK(std::string(json(json::value_t::string).type_name()) == "string"); + CHECK(std::string(json(json::value_t::discarded).type_name()) == "discarded"); } SECTION("string escape")