Skip to content

Commit

Permalink
🎨 cleanup after #1228
Browse files Browse the repository at this point in the history
  • Loading branch information
nlohmann committed Sep 9, 2018
1 parent d3428b3 commit ebb3c03
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions include/nlohmann/detail/conversions/from_json.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@ template <typename BasicJsonType, typename CompatibleArrayType,

auto from_json(const BasicJsonType& j, CompatibleArrayType& arr)
-> decltype(from_json_array_impl(j, arr, priority_tag<3> {}),
j.template get<typename CompatibleArrayType::value_type>(),
void())
j.template get<typename CompatibleArrayType::value_type>(),
void())
{
if (JSON_UNLIKELY(not j.is_array()))
{
Expand Down
4 changes: 2 additions & 2 deletions single_include/nlohmann/json.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1232,8 +1232,8 @@ template <typename BasicJsonType, typename CompatibleArrayType,

auto from_json(const BasicJsonType& j, CompatibleArrayType& arr)
-> decltype(from_json_array_impl(j, arr, priority_tag<3> {}),
j.template get<typename CompatibleArrayType::value_type>(),
void())
j.template get<typename CompatibleArrayType::value_type>(),
void())
{
if (JSON_UNLIKELY(not j.is_array()))
{
Expand Down
4 changes: 2 additions & 2 deletions test/src/unit-inspection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,8 @@ TEST_CASE("object inspection")
SECTION("round trips")
{
for (const auto& s :
{"3.141592653589793", "1000000000000000010E5"
})
{"3.141592653589793", "1000000000000000010E5"
})
{
json j1 = json::parse(s);
std::string s1 = j1.dump();
Expand Down

0 comments on commit ebb3c03

Please sign in to comment.