Skip to content

J
json
Commit 6eb37e9b authored by Anthony VH's avatar Anthony VH
Browse files
Options

Only add conditional constexpr to get() for >= C++14 to work around errors on older compilers.

parent d7c0f157
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
include/nlohmann/json.hpp
View file @ 6eb37e9b
......@@ -3063,7 +3063,10 @@ class basic_json
@since version 2.1.0
*/
template < typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>>
constexpr auto get() const noexcept(
#if defined(JSON_HAS_CPP_14)
constexpr
#endif
auto get() const noexcept(
noexcept(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {})))
-> decltype(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {}))
{
......
single_include/nlohmann/json.hpp
View file @ 6eb37e9b
......@@ -19815,7 +19815,10 @@ class basic_json
@since version 2.1.0
*/
template < typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>>
constexpr auto get() const noexcept(
#if defined(JSON_HAS_CPP_14)
constexpr
#endif
auto get() const noexcept(
noexcept(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {})))
-> decltype(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {}))
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment