From: Radoslaw Zarzynski Date: Wed, 14 Dec 2022 20:18:19 +0000 (+0000) Subject: crimson/osd: drop C++'s ranges to workaround unbuildability on Clang X-Git-Tag: v18.1.0~260^2~5 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6923b05d70adbf5e8805b7d1be132d9737bad09a;p=ceph.git crimson/osd: drop C++'s ranges to workaround unbuildability on Clang ``` /home/jenkins-build/build/workspace/ceph-pull-requests/src/crimson/osd/osd_operations/snaptrim_event.cc:38:33: note: while checking constraint satisfaction for template 'operator| &, const std::vector>>> &>' required here for (const auto &i : subops | std::views::keys) { ^ /home/jenkins-build/build/workspace/ceph-pull-requests/src/crimson/osd/osd_operations/snaptrim_event.cc:38:33: note: in instantiation of function template specialization 'std::ranges::views::__adaptor::operator| &, const std::vector>>> &>' requested here /usr/bin/../lib/gcc/x86_64-linux-gnu/11/../../../../include/c++/11/bits/iterator_concepts.h:963:7: note: candidate template ignored: constraints not satisfied [with _Tp = std::ranges::ref_view --- diff --git a/src/crimson/osd/osd_operations/snaptrim_event.cc b/src/crimson/osd/osd_operations/snaptrim_event.cc index 73d02d9840801..22154c304e9a3 100644 --- a/src/crimson/osd/osd_operations/snaptrim_event.cc +++ b/src/crimson/osd/osd_operations/snaptrim_event.cc @@ -1,8 +1,6 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#include - #include "crimson/osd/osd_operations/snaptrim_event.h" #include "crimson/osd/ops_executer.h" #include "crimson/osd/pg.h" @@ -35,8 +33,8 @@ void SnapTrimEvent::SubOpBlocker::dump_detail(Formatter *f) const { f->open_array_section("dependent_operations"); { - for (const auto &i : subops | std::views::keys) { - f->dump_unsigned("op_id", i); + for (const auto &kv : subops) { + f->dump_unsigned("op_id", kv.first); } } f->close_section();