External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🚨 fix -fpermissive warnings

Browse Source
This commit is contained in:
Niels Lohmann 2021-11-03 21:25:51 +01:00
parent 5663bfa6c6
commit 04d2020ea8
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
single_include/nlohmann/json.hpp
View File

@ -22208,9 +22208,12 @@ std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j)
// nonmember support // // nonmember support //
/////////////////////// ///////////////////////
namespace std
{
/// hash value for JSON objects /// hash value for JSON objects
NLOHMANN_BASIC_JSON_TPL_DECLARATION NLOHMANN_BASIC_JSON_TPL_DECLARATION
struct std::hash<nlohmann::NLOHMANN_BASIC_JSON_TPL> struct hash<nlohmann::NLOHMANN_BASIC_JSON_TPL>
{ {
/*! /*!
@brief return a hash value for a JSON object @brief return a hash value for a JSON object
@ -22227,7 +22230,7 @@ struct std::hash<nlohmann::NLOHMANN_BASIC_JSON_TPL>
/// @note: do not remove the space after '<', /// @note: do not remove the space after '<',
/// see https://github.com/nlohmann/json/pull/679 /// see https://github.com/nlohmann/json/pull/679
template<> template<>
struct std::less< ::nlohmann::detail::value_t> struct less< ::nlohmann::detail::value_t>
{ {
/*! /*!
@brief compare two value_t enum values @brief compare two value_t enum values
@ -22243,9 +22246,6 @@ struct std::less< ::nlohmann::detail::value_t>
// C++20 prohibit function specialization in the std namespace. // C++20 prohibit function specialization in the std namespace.
#ifndef JSON_HAS_CPP_20 #ifndef JSON_HAS_CPP_20
namespace std
{
/*! /*!
@brief exchanges the values of two JSON objects @brief exchanges the values of two JSON objects
@ -22259,10 +22259,10 @@ inline void swap<nlohmann::json>(nlohmann::json& j1, nlohmann::json& j2) noexcep
j1.swap(j2); j1.swap(j2);
} }
} // namespace std
#endif #endif
} // namespace std
/// @brief user-defined string literal for JSON values /// @brief user-defined string literal for JSON values
/// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json/ /// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json/
JSON_HEDLEY_NON_NULL(1) JSON_HEDLEY_NON_NULL(1)