mcst-linux-kernel/patches-2024.06.26/ceph-14.2.22/0005-work-around-default-te...

59 lines
1.5 KiB
Diff

Subject: work around default template argument error
Bug: 133985
Tags: lcc
diff -rupN a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
--- a/src/os/bluestore/BlueStore.cc 2021-08-24 16:21:44.844485909 +0300
+++ b/src/os/bluestore/BlueStore.cc 2021-08-24 16:22:29.353621878 +0300
@@ -1922,7 +1922,11 @@ bool BlueStore::OnodeSpace::map_any(std:
return false;
}
+#ifndef __LCC__
template <int LogLevelV = 30>
+#else
+template <int LogLevelV>
+#endif
void BlueStore::OnodeSpace::dump(CephContext *cct)
{
for (auto& i : onode_map) {
@@ -2024,7 +2028,11 @@ void BlueStore::SharedBlob::finish_write
#undef dout_prefix
#define dout_prefix *_dout << "bluestore.sharedblobset(" << this << ") "
+#ifndef __LCC__
template <int LogLevelV = 30>
+#else
+template <int LogLevelV>
+#endif
void BlueStore::SharedBlobSet::dump(CephContext *cct)
{
std::lock_guard l(lock);
diff -rupN a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h
--- a/src/os/bluestore/BlueStore.h 2021-08-24 16:21:44.844485909 +0300
+++ b/src/os/bluestore/BlueStore.h 2021-08-24 16:22:29.363619438 +0300
@@ -495,7 +495,11 @@ public:
return sb_map.empty();
}
+#ifndef __LCC__
template <int LogLevelV>
+#else
+ template <int LogLevelV = 30>
+#endif
void dump(CephContext *cct);
};
@@ -1403,7 +1407,11 @@ public:
void clear();
bool empty();
+#ifndef __LCC__
template <int LogLevelV>
+#else
+ template <int LogLevelV = 30>
+#endif
void dump(CephContext *cct);
/// return true if f true for any item