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

🔨 another try to fix #714

Browse source 
adding std::ios_base::binary when opening all_unicode.json.cbor
This commit is contained in:
Niels Lohmann 2017-10-31 15:04:14 +01:00
parent c4d6626745
commit 5696660eba
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 34 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/json.hpp
View file

@ -6789,7 +6789,7 @@ class json_ref
{} {}
template <class... Args> template <class... Args>
json_ref(Args&&... args) json_ref(Args&& ... args)
: owned_value(std::forward<Args>(args)...), : owned_value(std::forward<Args>(args)...),
value_ref(&owned_value), value_ref(&owned_value),
is_rvalue(true) is_rvalue(true)

67
test/src/unit-regression.cpp
View file

@ -38,18 +38,18 @@ using nlohmann::json;
namespace namespace
{ {
struct nocopy struct nocopy
{ {
nocopy() = default; nocopy() = default;
nocopy(const nocopy &) = delete; nocopy(const nocopy&) = delete;
int val = 0; int val = 0;
friend void to_json(json& j, const nocopy& n) friend void to_json(json& j, const nocopy& n)
{ {
j = {{"val", n.val}}; j = {{"val", n.val}};
} }
}; };
} }
TEST_CASE("regression tests") TEST_CASE("regression tests")
@ -1270,40 +1270,39 @@ TEST_CASE("regression tests")
} }
} }
/* SECTION("issue #714 - throw std::ios_base::failure exception when failbit set to true")
SECTION("issue #714 - throw std::ios_base::failure exception when failbit set to true") {
{ {
{ std::ifstream is;
std::ifstream is; is.exceptions(
is.exceptions( is.exceptions()
is.exceptions() | std::ios_base::failbit
| std::ios_base::failbit | std::ios_base::badbit
| std::ios_base::badbit ); // handle different exceptions as 'file not found', 'permission denied'
); // handle different exceptions as 'file not found', 'permission denied'
is.open("test/data/regression/working_file.json"); is.open("test/data/regression/working_file.json");
CHECK_NOTHROW(nlohmann::json::parse(is)); CHECK_NOTHROW(nlohmann::json::parse(is));
}
{
std::ifstream is;
is.exceptions(
is.exceptions()
| std::ios_base::failbit
| std::ios_base::badbit
); // handle different exceptions as 'file not found', 'permission denied'
is.open("test/data/json_nlohmann_tests/all_unicode.json.cbor");
CHECK_NOTHROW(nlohmann::json::from_cbor(is));
}
} }
*/
{
std::ifstream is;
is.exceptions(
is.exceptions()
| std::ios_base::failbit
| std::ios_base::badbit
); // handle different exceptions as 'file not found', 'permission denied'
is.open("test/data/json_nlohmann_tests/all_unicode.json.cbor",
std::ios_base::in | std::ios_base::binary);
CHECK_NOTHROW(nlohmann::json::from_cbor(is));
}
}
SECTION("issue #805 - copy constructor is used with std::initializer_list constructor.") SECTION("issue #805 - copy constructor is used with std::initializer_list constructor.")
{ {
nocopy n; nocopy n;
json j; json j;
j = {{"nocopy", n}}; j = {{"nocopy", n}};
CHECK(j["nocopy"]["val"] == 0); CHECK(j["nocopy"]["val"] == 0);
} }
} }