lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-07-28 12:02:00 +03:00
Code Activity

🎨 amalgamate code

Browse Source
This commit is contained in:
Niels Lohmann
2020-12-14 10:38:49 +01:00
parent 97fe455ad5
commit 85ffc85a29
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/nlohmann/detail/json_ref.hpp
View File

@ -57,7 +57,7 @@ class json_ref
value_type const* operator->() const value_type const* operator->() const
{ {
return &**this; return &** this;
} }
private: private:

14
single_include/nlohmann/json.hpp
View File

@ -4515,15 +4515,15 @@ class byte_container_with_subtype : public BinaryType
: container_type(std::move(b)) : container_type(std::move(b))
{} {}
byte_container_with_subtype(const container_type& b, std::uint8_t subtype) noexcept(noexcept(container_type(b))) byte_container_with_subtype(const container_type& b, std::uint8_t subtype_) noexcept(noexcept(container_type(b)))
: container_type(b) : container_type(b)
, m_subtype(subtype) , m_subtype(subtype_)
, m_has_subtype(true) , m_has_subtype(true)
{} {}
byte_container_with_subtype(container_type&& b, std::uint8_t subtype) noexcept(noexcept(container_type(std::move(b)))) byte_container_with_subtype(container_type&& b, std::uint8_t subtype_) noexcept(noexcept(container_type(std::move(b))))
: container_type(std::move(b)) : container_type(std::move(b))
, m_subtype(subtype) , m_subtype(subtype_)
, m_has_subtype(true) , m_has_subtype(true)
{} {}
@ -4556,9 +4556,9 @@ class byte_container_with_subtype : public BinaryType
@since version 3.8.0 @since version 3.8.0
*/ */
void set_subtype(std::uint8_t subtype) noexcept void set_subtype(std::uint8_t subtype_) noexcept
{ {
m_subtype = subtype; m_subtype = subtype_;
m_has_subtype = true; m_has_subtype = true;
} }
@ -12645,7 +12645,7 @@ class json_ref
value_type const* operator->() const value_type const* operator->() const
{ {
return &**this; return &** this;
} }
private: private: