Skip to content

Commit ac586c0

Browse files
committed
upd: updated the single_include file with amalgamation changes
Signed-off-by: Vaibhav Sharma <48472541+GhostVaibhav@users.noreply.github.com>
1 parent e6241ad commit ac586c0

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

single_include/nlohmann/json.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2917,7 +2917,7 @@ JSON_HEDLEY_DIAGNOSTIC_POP
29172917
template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
29182918
friend void to_json(BasicJsonType& nlohmann_json_j, const Type&) { nlohmann_json_j = BasicJsonType::object(); } \
29192919
template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
2920-
friend void from_json(const BasicJsonType&, Type&) noexcept { }
2920+
friend void from_json(const BasicJsonType&, Type&) noexcept { } /* NOLINT(bugprone-macro-parentheses) */
29212921

29222922
/*!
29232923
@brief macro
@@ -2928,7 +2928,7 @@ JSON_HEDLEY_DIAGNOSTIC_POP
29282928
template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
29292929
void to_json(BasicJsonType& nlohmann_json_j, const Type&) { nlohmann_json_j = BasicJsonType::object(); } \
29302930
template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
2931-
void from_json(const BasicJsonType&, Type&) noexcept { }
2931+
void from_json(const BasicJsonType&, Type&) noexcept { } /* NOLINT(bugprone-macro-parentheses) */
29322932

29332933
// inspired from https://stackoverflow.com/a/26745591
29342934
// allows calling any std function as if (e.g., with begin):

0 commit comments

Comments
 (0)