Skip to content

Commit 9234007

Browse files
SebanisuSebanisu
committed
-Wshadow
Rename local variables so they don't shadow.
1 parent 82ce68b commit 9234007

File tree

5 files changed

+36
-36
lines changed

5 files changed

+36
-36
lines changed

‎include/unicode-db/unicode-db.hpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace uni
1414
enum class block;
1515

1616
struct script_extensions_view {
17-
constexpr script_extensions_view(char32_t c);
17+
constexpr script_extensions_view(char32_t);
1818

1919
struct sentinel {};
2020
struct iterator {
@@ -171,9 +171,9 @@ struct compact_range {
171171
std::uint32_t _data[N];
172172
constexpr T value(char32_t cp, T default_value) const {
173173
const auto end = std::end(_data);
174-
auto it = detail::upper_bound(std::begin(_data), end, cp, [](char32_t cp, uint32_t v) {
174+
auto it = detail::upper_bound(std::begin(_data), end, cp, [](char32_t local_cp, uint32_t v) {
175175
char32_t c = (v >> 8);
176-
return cp < c;
176+
return local_cp < c;
177177
});
178178
if(it == end)
179179
return default_value;
@@ -190,9 +190,9 @@ struct compact_list {
190190
std::uint32_t _data[N];
191191
constexpr T value(char32_t cp, T default_value) const {
192192
const auto end = std::end(_data);
193-
auto it = detail::lower_bound(std::begin(_data), end, cp, [](uint32_t v, char32_t cp) {
193+
auto it = detail::lower_bound(std::begin(_data), end, cp, [](uint32_t v, char32_t local_cp) {
194194
char32_t c = (v >> 8);
195-
return c < cp;
195+
return c < local_cp;
196196
});
197197
if(it == end || ((*it) >> 8) != cp)
198198
return default_value;
@@ -306,9 +306,9 @@ struct range_array {
306306
std::uint32_t _data[N];
307307
constexpr bool lookup(char32_t cp) const {
308308
const auto end = std::end(_data);
309-
auto it = detail::upper_bound(std::begin(_data), end, cp, [](char32_t cp, uint32_t v) {
309+
auto it = detail::upper_bound(std::begin(_data), end, cp, [](char32_t local_cp, uint32_t v) {
310310
char32_t c = (v >> 8);
311-
return cp < c;
311+
return local_cp < c;
312312
});
313313
if(it == end)
314314
return false;
@@ -7139,7 +7139,7 @@ constexpr script cp_script(char32_t cp) {
71397139
return detail::tables::cp_script<0>(cp);
71407140
}
71417141

7142-
constexpr script_extensions_view::script_extensions_view(char32_t c) : c(c){}
7142+
constexpr script_extensions_view::script_extensions_view(char32_t local_c) : c(local_c){}
71437143

71447144
constexpr script_extensions_view::iterator::iterator(char32_t c) : m_c(c), m_script(detail::tables::get_cp_script(m_c, 1)) {
71457145
if(m_script == script::unknown)
@@ -7196,9 +7196,9 @@ constexpr version cp_age(char32_t cp) {
71967196

71977197
constexpr block cp_block(char32_t cp) {
71987198
const auto end = std::end(detail::tables::block_data._data);
7199-
auto it = detail::upper_bound(std::begin(detail::tables::block_data._data), end, cp, [](char32_t cp, uint32_t v) {
7199+
auto it = detail::upper_bound(std::begin(detail::tables::block_data._data), end, cp, [](char32_t local_cp, uint32_t v) {
72007200
char32_t c = (v >> 8);
7201-
return cp < c;
7201+
return local_cp < c;
72027202
});
72037203
if(it == end)
72047204
return block::no_block;
@@ -7313,7 +7313,7 @@ namespace detail {
73137313
template<typename Array, typename Res = long long>
73147314
constexpr bool get_numeric_value(char32_t cp, const Array& array, Res& res) {
73157315
auto it = detail::lower_bound(std::begin(array), std::end(array), cp,
7316-
[](const auto& d, char32_t cp) { return d.first < cp; });
7316+
[](const auto& d, char32_t local_cp) { return d.first < local_cp; });
73177317
if(it == std::end(array) || it->first != cp)
73187318
return false;
73197319
res = it->second;

‎include/unicode-db/unicode_interface.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace uni
1212
enum class block;
1313

1414
struct script_extensions_view {
15-
constexpr script_extensions_view(char32_t c);
15+
constexpr script_extensions_view(char32_t);
1616

1717
struct sentinel {};
1818
struct iterator {

‎single-header/ctre-unicode.hpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1565,7 +1565,7 @@ namespace uni
15651565
enum class block;
15661566

15671567
struct script_extensions_view {
1568-
constexpr script_extensions_view(char32_t c);
1568+
constexpr script_extensions_view(char32_t);
15691569

15701570
struct sentinel {};
15711571
struct iterator {
@@ -5331,7 +5331,7 @@ namespace uni
53315331
enum class block;
53325332

53335333
struct script_extensions_view {
5334-
constexpr script_extensions_view(char32_t c);
5334+
constexpr script_extensions_view(char32_t);
53355335

53365336
struct sentinel {};
53375337
struct iterator {
@@ -5488,9 +5488,9 @@ struct compact_range {
54885488
std::uint32_t _data[N];
54895489
constexpr T value(char32_t cp, T default_value) const {
54905490
const auto end = std::end(_data);
5491-
auto it = detail::upper_bound(std::begin(_data), end, cp, [](char32_t cp, uint32_t v) {
5491+
auto it = detail::upper_bound(std::begin(_data), end, cp, [](char32_t local_cp, uint32_t v) {
54925492
char32_t c = (v >> 8);
5493-
return cp < c;
5493+
return local_cp < c;
54945494
});
54955495
if(it == end)
54965496
return default_value;
@@ -5506,9 +5506,9 @@ struct compact_list {
55065506
std::uint32_t _data[N];
55075507
constexpr T value(char32_t cp, T default_value) const {
55085508
const auto end = std::end(_data);
5509-
auto it = detail::lower_bound(std::begin(_data), end, cp, [](uint32_t v, char32_t cp) {
5509+
auto it = detail::lower_bound(std::begin(_data), end, cp, [](uint32_t v, char32_t local_cp) {
55105510
char32_t c = (v >> 8);
5511-
return c < cp;
5511+
return c < local_cp;
55125512
});
55135513
if(it == end || ((*it) >> 8) != cp)
55145514
return default_value;
@@ -5618,9 +5618,9 @@ struct range_array {
56185618
std::uint32_t _data[N];
56195619
constexpr bool lookup(char32_t cp) const {
56205620
const auto end = std::end(_data);
5621-
auto it = detail::upper_bound(std::begin(_data), end, cp, [](char32_t cp, uint32_t v) {
5621+
auto it = detail::upper_bound(std::begin(_data), end, cp, [](char32_t local_cp, uint32_t v) {
56225622
char32_t c = (v >> 8);
5623-
return cp < c;
5623+
return local_cp < c;
56245624
});
56255625
if(it == end)
56265626
return false;
@@ -12448,7 +12448,7 @@ constexpr script cp_script(char32_t cp) {
1244812448
return detail::tables::cp_script<0>(cp);
1244912449
}
1245012450

12451-
constexpr script_extensions_view::script_extensions_view(char32_t c) : c(c){}
12451+
constexpr script_extensions_view::script_extensions_view(char32_t local_c) : c(local_c){}
1245212452

1245312453
constexpr script_extensions_view::iterator::iterator(char32_t c) : m_c(c), m_script(detail::tables::get_cp_script(m_c, 1)) {
1245412454
if(m_script == script::unknown)
@@ -12504,9 +12504,9 @@ constexpr version cp_age(char32_t cp) {
1250412504

1250512505
constexpr block cp_block(char32_t cp) {
1250612506
const auto end = std::end(detail::tables::block_data._data);
12507-
auto it = detail::upper_bound(std::begin(detail::tables::block_data._data), end, cp, [](char32_t cp, uint32_t v) {
12507+
auto it = detail::upper_bound(std::begin(detail::tables::block_data._data), end, cp, [](char32_t local_cp, uint32_t v) {
1250812508
char32_t c = (v >> 8);
12509-
return cp < c;
12509+
return local_cp < c;
1251012510
});
1251112511
if(it == end)
1251212512
return block::no_block;
@@ -12620,7 +12620,7 @@ namespace detail {
1262012620
template<typename Array, typename Res = long long>
1262112621
constexpr bool get_numeric_value(char32_t cp, const Array& array, Res& res) {
1262212622
auto it = detail::lower_bound(std::begin(array), std::end(array), cp,
12623-
[](const auto& d, char32_t cp) { return d.first < cp; });
12623+
[](const auto& d, char32_t local_cp) { return d.first < local_cp; });
1262412624
if(it == std::end(array) || it->first != cp)
1262512625
return false;
1262612626
res = it->second;

‎single-header/ctre.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1562,7 +1562,7 @@ namespace uni
15621562
enum class block;
15631563

15641564
struct script_extensions_view {
1565-
constexpr script_extensions_view(char32_t c);
1565+
constexpr script_extensions_view(char32_t);
15661566

15671567
struct sentinel {};
15681568
struct iterator {

‎single-header/unicode-db.hpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace uni
1414
enum class block;
1515

1616
struct script_extensions_view {
17-
constexpr script_extensions_view(char32_t c);
17+
constexpr script_extensions_view(char32_t);
1818

1919
struct sentinel {};
2020
struct iterator {
@@ -171,9 +171,9 @@ struct compact_range {
171171
std::uint32_t _data[N];
172172
constexpr T value(char32_t cp, T default_value) const {
173173
const auto end = std::end(_data);
174-
auto it = detail::upper_bound(std::begin(_data), end, cp, [](char32_t cp, uint32_t v) {
174+
auto it = detail::upper_bound(std::begin(_data), end, cp, [](char32_t local_cp, uint32_t v) {
175175
char32_t c = (v >> 8);
176-
return cp < c;
176+
return local_cp < c;
177177
});
178178
if(it == end)
179179
return default_value;
@@ -190,9 +190,9 @@ struct compact_list {
190190
std::uint32_t _data[N];
191191
constexpr T value(char32_t cp, T default_value) const {
192192
const auto end = std::end(_data);
193-
auto it = detail::lower_bound(std::begin(_data), end, cp, [](uint32_t v, char32_t cp) {
193+
auto it = detail::lower_bound(std::begin(_data), end, cp, [](uint32_t v, char32_t local_cp) {
194194
char32_t c = (v >> 8);
195-
return c < cp;
195+
return c < local_cp;
196196
});
197197
if(it == end || ((*it) >> 8) != cp)
198198
return default_value;
@@ -306,9 +306,9 @@ struct range_array {
306306
std::uint32_t _data[N];
307307
constexpr bool lookup(char32_t cp) const {
308308
const auto end = std::end(_data);
309-
auto it = detail::upper_bound(std::begin(_data), end, cp, [](char32_t cp, uint32_t v) {
309+
auto it = detail::upper_bound(std::begin(_data), end, cp, [](char32_t local_cp, uint32_t v) {
310310
char32_t c = (v >> 8);
311-
return cp < c;
311+
return local_cp < c;
312312
});
313313
if(it == end)
314314
return false;
@@ -7139,7 +7139,7 @@ constexpr script cp_script(char32_t cp) {
71397139
return detail::tables::cp_script<0>(cp);
71407140
}
71417141

7142-
constexpr script_extensions_view::script_extensions_view(char32_t c) : c(c){}
7142+
constexpr script_extensions_view::script_extensions_view(char32_t local_c) : c(local_c){}
71437143

71447144
constexpr script_extensions_view::iterator::iterator(char32_t c) : m_c(c), m_script(detail::tables::get_cp_script(m_c, 1)) {
71457145
if(m_script == script::unknown)
@@ -7196,9 +7196,9 @@ constexpr version cp_age(char32_t cp) {
71967196

71977197
constexpr block cp_block(char32_t cp) {
71987198
const auto end = std::end(detail::tables::block_data._data);
7199-
auto it = detail::upper_bound(std::begin(detail::tables::block_data._data), end, cp, [](char32_t cp, uint32_t v) {
7199+
auto it = detail::upper_bound(std::begin(detail::tables::block_data._data), end, cp, [](char32_t local_cp, uint32_t v) {
72007200
char32_t c = (v >> 8);
7201-
return cp < c;
7201+
return local_cp < c;
72027202
});
72037203
if(it == end)
72047204
return block::no_block;
@@ -7313,7 +7313,7 @@ namespace detail {
73137313
template<typename Array, typename Res = long long>
73147314
constexpr bool get_numeric_value(char32_t cp, const Array& array, Res& res) {
73157315
auto it = detail::lower_bound(std::begin(array), std::end(array), cp,
7316-
[](const auto& d, char32_t cp) { return d.first < cp; });
7316+
[](const auto& d, char32_t local_cp) { return d.first < local_cp; });
73177317
if(it == std::end(array) || it->first != cp)
73187318
return false;
73197319
res = it->second;

0 commit comments

Comments
 (0)