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

Merge pull request #2444 from linev/fix_gcc48_warn

Browse Source 
Change argument name "subtype" in byte_container_with_subtype
This commit is contained in:
Niels Lohmann 2020-12-11 13:46:41 +01:00 committed by GitHub
commit 5026acd70c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/nlohmann/byte_container_with_subtype.hpp
View File

@ -39,15 +39,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)
{} {}
@ -80,9 +80,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;
} }