mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-01-20 00:03:02 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #2707 from raduteo/patch-2

Browse Source 
Update json.hpp
This commit is contained in:
Niels Lohmann 2021-04-23 09:48:38 +02:00 committed by GitHub
commit 9774e53cd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/nlohmann/json.hpp
View File

@ -1256,9 +1256,8 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
})); }));
} }
JSON_CATCH(...) {} // LCOV_EXCL_LINE JSON_CATCH(...) {} // LCOV_EXCL_LINE
#else
static_cast<void>(check_parents);
#endif #endif
static_cast<void>(check_parents);
} }
void set_parents() void set_parents()

3
single_include/nlohmann/json.hpp
View File

@ -18145,9 +18145,8 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
})); }));
} }
JSON_CATCH(...) {} // LCOV_EXCL_LINE JSON_CATCH(...) {} // LCOV_EXCL_LINE
#else
static_cast<void>(check_parents);
#endif #endif
static_cast<void>(check_parents);
} }
void set_parents() void set_parents()