Change argument name "subtype" in byte_container_with_subtype

Fix warnings on older g++ 4.8 declaration of ‘subtype’ shadows a member of 'this'

Change argument name "subtype" in byte_container_with_subtype
71cb7d12 · Sergey Linev · fd7a9f60 · 71cb7d12
Commit 71cb7d12 authored Oct 23, 2020 by Sergey Linev
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

byte_container_with_subtype.hpp include/nlohmann/byte_container_with_subtype.hpp +6 -6

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