Unverified Commit 825d3230 authored by Maarten Becker's avatar Maarten Becker Committed by GitHub

Fix: Warning for shadowed variables (#3188) (#3193)

* Rename variable count to resolve shadowing (#3188)

* Amalgamate: Rename variable count to resolve shadowing (#3188)
Co-authored-by: default avatarMaarten Becker <maarten.becker@nuc-eng.com>
parent 76030463
...@@ -1278,15 +1278,15 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec ...@@ -1278,15 +1278,15 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
#endif #endif
} }
iterator set_parents(iterator it, typename iterator::difference_type count) iterator set_parents(iterator it, typename iterator::difference_type count_set_parents)
{ {
#if JSON_DIAGNOSTICS #if JSON_DIAGNOSTICS
for (typename iterator::difference_type i = 0; i < count; ++i) for (typename iterator::difference_type i = 0; i < count_set_parents; ++i)
{ {
(it + i)->m_parent = this; (it + i)->m_parent = this;
} }
#else #else
static_cast<void>(count); static_cast<void>(count_set_parents);
#endif #endif
return it; return it;
} }
......
...@@ -18818,15 +18818,15 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec ...@@ -18818,15 +18818,15 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
#endif #endif
} }
iterator set_parents(iterator it, typename iterator::difference_type count) iterator set_parents(iterator it, typename iterator::difference_type count_set_parents)
{ {
#if JSON_DIAGNOSTICS #if JSON_DIAGNOSTICS
for (typename iterator::difference_type i = 0; i < count; ++i) for (typename iterator::difference_type i = 0; i < count_set_parents; ++i)
{ {
(it + i)->m_parent = this; (it + i)->m_parent = this;
} }
#else #else
static_cast<void>(count); static_cast<void>(count_set_parents);
#endif #endif
return it; return it;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment