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

6eb37e9b · Anthony VH · d7c0f157 · 6eb37e9b · 6eb37e9b
Commit 6eb37e9b authored Jan 14, 2021 by Anthony VH
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

json.hpp include/nlohmann/json.hpp +4 -1

json.hpp single_include/nlohmann/json.hpp +4 -1

No files found.
--- a/include/nlohmann/json.hpp
+++ b/include/nlohmann/json.hpp
@@ -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> {}))
    {

--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -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> {}))
    {