Merge pull request #2069 from nlohmann/issue2064

Fix returning reference to local temporary object
nlohmann · Apr 28, 2020 · b1fe6ee · b1fe6ee
2 parents d9d1279 + 9e0180b
commit b1fe6ee
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp
@@ -2757,6 +2757,18 @@ class basic_json
  return is_binary() ? m_value.binary : nullptr;
  }
 
+ /// get a pointer to the value (binary)
+ internal_binary_t* get_impl_ptr(internal_binary_t* /*unused*/) noexcept
+ {
+ return is_binary() ? m_value.binary : nullptr;
+ }
+
+ /// get a pointer to the value (binary)
+ constexpr const internal_binary_t* get_impl_ptr(const internal_binary_t* /*unused*/) const noexcept
+ {
+ return is_binary() ? m_value.binary : nullptr;
+ }
+
  /*!
  @brief helper function to implement get_ref()
 

diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
@@ -18243,6 +18243,18 @@ class basic_json
  return is_binary() ? m_value.binary : nullptr;
  }
 
+ /// get a pointer to the value (binary)
+ internal_binary_t* get_impl_ptr(internal_binary_t* /*unused*/) noexcept
+ {
+ return is_binary() ? m_value.binary : nullptr;
+ }
+
+ /// get a pointer to the value (binary)
+ constexpr const internal_binary_t* get_impl_ptr(const internal_binary_t* /*unused*/) const noexcept
+ {
+ return is_binary() ? m_value.binary : nullptr;
+ }
+
  /*!
  @brief helper function to implement get_ref()
 

diff --git a/test/src/unit-constructor1.cpp b/test/src/unit-constructor1.cpp
@@ -826,7 +826,7 @@ TEST_CASE("constructors")
 
  // check that NaN is serialized to null
  CHECK(j.dump() == "null");
- }
+ }
 
  SECTION("infinity")
  {