AuroraMiddleware/nlohmannjson
1
0
Fork 0
mirror of https://github.com/nlohmann/json synced 2024-11-27 14:20:07 +00:00
Code Issues Releases Wiki Activity

💄 cleanup after #508

Browse Source
This commit is contained in:
Niels Lohmann 2017-03-16 19:02:05 +01:00
parent 773b33e016
commit cd43600e6f
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
3 changed files with 991 additions and 441 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1411
src/json.hpp
View File

File diff suppressed because it is too large Load Diff

5
src/json.hpp.re2c
View File

@ -802,8 +802,9 @@ template <typename BasicJsonType, typename T, std::size_t N,
enable_if_t<not std::is_constructible<
typename BasicJsonType::string_t, T (&)[N]>::value,
int> = 0>
void to_json(BasicJsonType &j, T (&arr)[N]) {
external_constructor<value_t::array>::construct(j, arr);
void to_json(BasicJsonType& j, T (&arr)[N])
{
external_constructor<value_t::array>::construct(j, arr);
}
///////////////

16
test/src/unit-conversions.cpp
View File

@ -192,16 +192,16 @@ TEST_CASE("value conversion")
SECTION("built-in arrays")
{
const char str[] = "a string";
const int nbs[] = {0, 1, 2};
const char str[] = "a string";
const int nbs[] = {0, 1, 2};
json j2 = nbs;
json j3 = str;
json j2 = nbs;
json j3 = str;
auto v = j2.get<std::vector<int>>();
auto s = j3.get<std::string>();
CHECK(std::equal(v.begin(), v.end(), std::begin(nbs)));
CHECK(s == str);
auto v = j2.get<std::vector<int>>();
auto s = j3.get<std::string>();
CHECK(std::equal(v.begin(), v.end(), std::begin(nbs)));
CHECK(s == str);
}
SECTION("std::deque<json>")