lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-07-27 00:41:05 +03:00
Code Activity

🎨 cleanup after #1228

Browse Source
This commit is contained in:
Niels Lohmann
2018-09-09 18:19:33 +02:00
parent d3428b35c5
commit ebb3c03293
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/nlohmann/detail/conversions/from_json.hpp
View File

@ -218,8 +218,8 @@ template <typename BasicJsonType, typename CompatibleArrayType,
auto from_json(const BasicJsonType& j, CompatibleArrayType& arr) auto from_json(const BasicJsonType& j, CompatibleArrayType& arr)
-> decltype(from_json_array_impl(j, arr, priority_tag<3> {}), -> decltype(from_json_array_impl(j, arr, priority_tag<3> {}),
j.template get<typename CompatibleArrayType::value_type>(), j.template get<typename CompatibleArrayType::value_type>(),
void()) void())
{ {
if (JSON_UNLIKELY(not j.is_array())) if (JSON_UNLIKELY(not j.is_array()))
{ {

4
single_include/nlohmann/json.hpp
View File

@ -1232,8 +1232,8 @@ template <typename BasicJsonType, typename CompatibleArrayType,
auto from_json(const BasicJsonType& j, CompatibleArrayType& arr) auto from_json(const BasicJsonType& j, CompatibleArrayType& arr)
-> decltype(from_json_array_impl(j, arr, priority_tag<3> {}), -> decltype(from_json_array_impl(j, arr, priority_tag<3> {}),
j.template get<typename CompatibleArrayType::value_type>(), j.template get<typename CompatibleArrayType::value_type>(),
void()) void())
{ {
if (JSON_UNLIKELY(not j.is_array())) if (JSON_UNLIKELY(not j.is_array()))
{ {