Skip to content

Commit f9ec198

Browse files
dunhordunhor
authored
Silence clang-tidy warnings (#1438)
1 parent c5e0aae commit f9ec198

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

‎strings/base_collections_base.h‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ WINRT_EXPORT namespace winrt
108108
auto First()
109109
{
110110
// NOTE: iterator's constructor requires shared access
111-
auto guard = static_cast<D&>(*this).acquire_shared();
111+
[[maybe_unused]] auto guard = static_cast<D&>(*this).acquire_shared();
112112
return make<iterator>(static_cast<D*>(this));
113113
}
114114

@@ -161,7 +161,7 @@ WINRT_EXPORT namespace winrt
161161

162162
T Current() const
163163
{
164-
auto guard = m_owner->acquire_shared();
164+
[[maybe_unused]] auto guard = m_owner->acquire_shared();
165165
this->check_version(*m_owner);
166166

167167
if (m_current == m_end)
@@ -174,14 +174,14 @@ WINRT_EXPORT namespace winrt
174174

175175
bool HasCurrent() const
176176
{
177-
auto guard = m_owner->acquire_shared();
177+
[[maybe_unused]] auto guard = m_owner->acquire_shared();
178178
this->check_version(*m_owner);
179179
return m_current != m_end;
180180
}
181181

182182
bool MoveNext()
183183
{
184-
auto guard = m_owner->acquire_exclusive();
184+
[[maybe_unused]] auto guard = m_owner->acquire_exclusive();
185185
this->check_version(*m_owner);
186186
if (m_current != m_end)
187187
{
@@ -193,7 +193,7 @@ WINRT_EXPORT namespace winrt
193193

194194
uint32_t GetMany(array_view<T> values)
195195
{
196-
auto guard = m_owner->acquire_exclusive();
196+
[[maybe_unused]] auto guard = m_owner->acquire_exclusive();
197197
this->check_version(*m_owner);
198198
return GetMany(values, typename std::iterator_traits<iterator_type>::iterator_category());
199199
}
@@ -248,7 +248,7 @@ WINRT_EXPORT namespace winrt
248248
{
249249
T GetAt(uint32_t const index) const
250250
{
251-
auto guard = static_cast<D const&>(*this).acquire_shared();
251+
[[maybe_unused]] auto guard = static_cast<D const&>(*this).acquire_shared();
252252
if (index >= container_size())
253253
{
254254
throw hresult_out_of_bounds();
@@ -259,13 +259,13 @@ WINRT_EXPORT namespace winrt
259259

260260
uint32_t Size() const noexcept
261261
{
262-
auto guard = static_cast<D const&>(*this).acquire_shared();
262+
[[maybe_unused]] auto guard = static_cast<D const&>(*this).acquire_shared();
263263
return container_size();
264264
}
265265

266266
bool IndexOf(T const& value, uint32_t& index) const noexcept
267267
{
268-
auto guard = static_cast<D const&>(*this).acquire_shared();
268+
[[maybe_unused]] auto guard = static_cast<D const&>(*this).acquire_shared();
269269
auto first = std::find_if(static_cast<D const&>(*this).get_container().begin(), static_cast<D const&>(*this).get_container().end(), [&](auto&& match)
270270
{
271271
return value == static_cast<D const&>(*this).unwrap_value(match);
@@ -277,7 +277,7 @@ WINRT_EXPORT namespace winrt
277277

278278
uint32_t GetMany(uint32_t const startIndex, array_view<T> values) const
279279
{
280-
auto guard = static_cast<D const&>(*this).acquire_shared();
280+
[[maybe_unused]] auto guard = static_cast<D const&>(*this).acquire_shared();
281281
if (startIndex >= container_size())
282282
{
283283
return 0;
@@ -308,7 +308,7 @@ WINRT_EXPORT namespace winrt
308308
{
309309
impl::removed_value<typename impl::container_type_t<D>::value_type> oldValue;
310310

311-
auto guard = static_cast<D&>(*this).acquire_exclusive();
311+
[[maybe_unused]] auto guard = static_cast<D&>(*this).acquire_exclusive();
312312
if (index >= static_cast<D const&>(*this).get_container().size())
313313
{
314314
throw hresult_out_of_bounds();
@@ -322,7 +322,7 @@ WINRT_EXPORT namespace winrt
322322

323323
void InsertAt(uint32_t const index, T const& value)
324324
{
325-
auto guard = static_cast<D&>(*this).acquire_exclusive();
325+
[[maybe_unused]] auto guard = static_cast<D&>(*this).acquire_exclusive();
326326
if (index > static_cast<D const&>(*this).get_container().size())
327327
{
328328
throw hresult_out_of_bounds();
@@ -336,7 +336,7 @@ WINRT_EXPORT namespace winrt
336336
{
337337
impl::removed_value<typename impl::container_type_t<D>::value_type> removedValue;
338338

339-
auto guard = static_cast<D&>(*this).acquire_exclusive();
339+
[[maybe_unused]] auto guard = static_cast<D&>(*this).acquire_exclusive();
340340
if (index >= static_cast<D const&>(*this).get_container().size())
341341
{
342342
throw hresult_out_of_bounds();
@@ -350,7 +350,7 @@ WINRT_EXPORT namespace winrt
350350

351351
void Append(T const& value)
352352
{
353-
auto guard = static_cast<D&>(*this).acquire_exclusive();
353+
[[maybe_unused]] auto guard = static_cast<D&>(*this).acquire_exclusive();
354354
this->increment_version();
355355
static_cast<D&>(*this).get_container().push_back(static_cast<D const&>(*this).wrap_value(value));
356356
}
@@ -359,7 +359,7 @@ WINRT_EXPORT namespace winrt
359359
{
360360
impl::removed_value<typename impl::container_type_t<D>::value_type> removedValue;
361361

362-
auto guard = static_cast<D&>(*this).acquire_exclusive();
362+
[[maybe_unused]] auto guard = static_cast<D&>(*this).acquire_exclusive();
363363
if (static_cast<D const&>(*this).get_container().empty())
364364
{
365365
throw hresult_out_of_bounds();
@@ -374,7 +374,7 @@ WINRT_EXPORT namespace winrt
374374
{
375375
impl::removed_values<D> oldContainer;
376376

377-
auto guard = static_cast<D&>(*this).acquire_exclusive();
377+
[[maybe_unused]] auto guard = static_cast<D&>(*this).acquire_exclusive();
378378
this->increment_version();
379379
oldContainer.assign(static_cast<D&>(*this).get_container());
380380
}
@@ -383,7 +383,7 @@ WINRT_EXPORT namespace winrt
383383
{
384384
impl::removed_values<D> oldContainer;
385385

386-
auto guard = static_cast<D&>(*this).acquire_exclusive();
386+
[[maybe_unused]] auto guard = static_cast<D&>(*this).acquire_exclusive();
387387
this->increment_version();
388388
oldContainer.assign(static_cast<D&>(*this).get_container());
389389
assign(value.begin(), value.end());
@@ -508,7 +508,7 @@ WINRT_EXPORT namespace winrt
508508
{
509509
V Lookup(K const& key) const
510510
{
511-
auto guard = static_cast<D const&>(*this).acquire_shared();
511+
[[maybe_unused]] auto guard = static_cast<D const&>(*this).acquire_shared();
512512
auto pair = static_cast<D const&>(*this).get_container().find(static_cast<D const&>(*this).wrap_value(key));
513513

514514
if (pair == static_cast<D const&>(*this).get_container().end())
@@ -521,13 +521,13 @@ WINRT_EXPORT namespace winrt
521521

522522
uint32_t Size() const noexcept
523523
{
524-
auto guard = static_cast<D const&>(*this).acquire_shared();
524+
[[maybe_unused]] auto guard = static_cast<D const&>(*this).acquire_shared();
525525
return static_cast<uint32_t>(static_cast<D const&>(*this).get_container().size());
526526
}
527527

528528
bool HasKey(K const& key) const noexcept
529529
{
530-
auto guard = static_cast<D const&>(*this).acquire_shared();
530+
[[maybe_unused]] auto guard = static_cast<D const&>(*this).acquire_shared();
531531
return static_cast<D const&>(*this).get_container().find(static_cast<D const&>(*this).wrap_value(key)) != static_cast<D const&>(*this).get_container().end();
532532
}
533533

@@ -550,7 +550,7 @@ WINRT_EXPORT namespace winrt
550550
{
551551
impl::removed_value<typename impl::container_type_t<D>::mapped_type> oldValue;
552552

553-
auto guard = static_cast<D&>(*this).acquire_exclusive();
553+
[[maybe_unused]] auto guard = static_cast<D&>(*this).acquire_exclusive();
554554
this->increment_version();
555555
auto [itr, added] = static_cast<D&>(*this).get_container().emplace(static_cast<D const&>(*this).wrap_value(key), static_cast<D const&>(*this).wrap_value(value));
556556
if (!added)
@@ -566,7 +566,7 @@ WINRT_EXPORT namespace winrt
566566
{
567567
typename impl::container_type_t<D>::node_type removedNode;
568568

569-
auto guard = static_cast<D&>(*this).acquire_exclusive();
569+
[[maybe_unused]] auto guard = static_cast<D&>(*this).acquire_exclusive();
570570
auto& container = static_cast<D&>(*this).get_container();
571571
auto found = container.find(static_cast<D const&>(*this).wrap_value(key));
572572
if (found == container.end())
@@ -581,7 +581,7 @@ WINRT_EXPORT namespace winrt
581581
{
582582
impl::removed_values<D> oldContainer;
583583

584-
auto guard = static_cast<D&>(*this).acquire_exclusive();
584+
[[maybe_unused]] auto guard = static_cast<D&>(*this).acquire_exclusive();
585585
this->increment_version();
586586
oldContainer.assign(static_cast<D&>(*this).get_container());
587587
}

‎strings/base_collections_vector.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ namespace winrt::impl
8282

8383
operator wfc::IIterator<Windows::Foundation::IInspectable>()
8484
{
85-
auto guard = container->acquire_shared();
85+
[[maybe_unused]] auto guard = container->acquire_shared();
8686
return make<iterator>(container);
8787
}
8888
};
@@ -141,7 +141,7 @@ namespace winrt::impl
141141

142142
uint32_t GetMany(uint32_t const startIndex, array_view<Windows::Foundation::IInspectable> values) const
143143
{
144-
auto guard = this->acquire_shared();
144+
[[maybe_unused]] auto guard = this->acquire_shared();
145145
if (startIndex >= m_values.size())
146146
{
147147
return 0;
@@ -239,7 +239,7 @@ namespace winrt::impl
239239

240240
Windows::Foundation::IInspectable Current() const
241241
{
242-
auto guard = m_owner->acquire_shared();
242+
[[maybe_unused]] auto guard = m_owner->acquire_shared();
243243
check_version(*m_owner);
244244
if (m_current == m_end)
245245
{
@@ -251,14 +251,14 @@ namespace winrt::impl
251251

252252
bool HasCurrent() const
253253
{
254-
auto guard = m_owner->acquire_shared();
254+
[[maybe_unused]] auto guard = m_owner->acquire_shared();
255255
check_version(*m_owner);
256256
return m_current != m_end;
257257
}
258258

259259
bool MoveNext()
260260
{
261-
auto guard = m_owner->acquire_exclusive();
261+
[[maybe_unused]] auto guard = m_owner->acquire_exclusive();
262262
check_version(*m_owner);
263263
if (m_current != m_end)
264264
{
@@ -270,7 +270,7 @@ namespace winrt::impl
270270

271271
uint32_t GetMany(array_view<Windows::Foundation::IInspectable> values)
272272
{
273-
auto guard = m_owner->acquire_exclusive();
273+
[[maybe_unused]] auto guard = m_owner->acquire_exclusive();
274274
check_version(*m_owner);
275275
uint32_t const actual = (std::min)(static_cast<uint32_t>(std::distance(m_current, m_end)), values.size());
276276

0 commit comments

Comments
 (0)