haraldwolff
/
json
mirror of https://github.com/nlohmann/json.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change argument name "subtype" in byte_container_with_subtype 

Fix warnings on older g++ 4.8

declaration of ‘subtype’ shadows a member of 'this'
pull/2444/head
Sergey Linev 2020-10-23 13:52:24 +02:00
parent fd7a9f6007
commit 71cb7d12da
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))
{}
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)
, m_subtype(subtype)
, m_subtype(_subtype)
, 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))
, m_subtype(subtype)
, m_subtype(_subtype)
, m_has_subtype(true)
{}
@ -80,9 +80,9 @@ class byte_container_with_subtype : public BinaryType
@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;
}