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

Fix redefinition of inline constexpr statics

Browse Source 
Redelcaration of inline constexpr static data members in namespace scope
was deprecated in C++17. Fixes -Werror=deprecated compilation failures.
This commit is contained in:
Florian Albrechtskirchinger 2022-03-08 11:13:57 +01:00
parent 130205e59e
commit d7954b29fc
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/nlohmann/detail/meta/cpp_future.hpp
View File

@ -147,8 +147,12 @@ struct static_const
static constexpr T value{}; static constexpr T value{};
}; };
template<typename T> #ifndef JSON_HAS_CPP_17
constexpr T static_const<T>::value; // NOLINT(readability-redundant-declaration)
template<typename T>
constexpr T static_const<T>::value; // NOLINT(readability-redundant-declaration)
#endif
} // namespace detail } // namespace detail
} // namespace nlohmann } // namespace nlohmann

8
single_include/nlohmann/json.hpp
View File

@ -3191,8 +3191,12 @@ struct static_const
static constexpr T value{}; static constexpr T value{};
}; };
template<typename T> #ifndef JSON_HAS_CPP_17
constexpr T static_const<T>::value; // NOLINT(readability-redundant-declaration)
template<typename T>
constexpr T static_const<T>::value; // NOLINT(readability-redundant-declaration)
#endif
} // namespace detail } // namespace detail
} // namespace nlohmann } // namespace nlohmann