From: Matan Breizman <mbreizma@redhat.com>
Date: Mon, 17 Feb 2025 10:08:11 +0000 (+0000)
Subject: crimson: fix -Wmissing-template-arg-list-after-template-kw
X-Git-Tag: v20.0.0~108^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F61890%2Fhead;p=ceph.git

crimson: fix -Wmissing-template-arg-list-after-template-kw

See: https://github.com/llvm/llvm-project/commit/f46d1463b835560d90ad3ac02b63c771e4ebe566
```
common/interruptible_future.h:1182:16: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw]
 1182 |     ).template handle_interruption(std::move(efunc));
      |                ^
1 error generated.
```

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
---

diff --git a/src/crimson/common/interruptible_future.h b/src/crimson/common/interruptible_future.h
index c0bcb5181bcb8..01fe1b192c435 100644
--- a/src/crimson/common/interruptible_future.h
+++ b/src/crimson/common/interruptible_future.h
@@ -1179,7 +1179,7 @@ public:
       std::move(ic),
       std::forward<OpFunc>(opfunc),
       std::forward<Params>(params)...
-    ).template handle_interruption(std::move(efunc));
+    ).handle_interruption(std::move(efunc));
   }
 
   template <typename OpFunc, typename OnInterrupt,
diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/stages/stage.h b/src/crimson/os/seastore/onode_manager/staged-fltree/stages/stage.h
index 10fa5f9518da3..6b5ab13645ed7 100644
--- a/src/crimson/os/seastore/onode_manager/staged-fltree/stages/stage.h
+++ b/src/crimson/os/seastore/onode_manager/staged-fltree/stages/stage.h
@@ -1153,7 +1153,7 @@ struct staged {
       return insert_size(key, value);
     } else {
       assert(stage < STAGE);
-      return NXT_STAGE_T::template insert_size_at(stage, key, value);
+      return NXT_STAGE_T::insert_size_at(stage, key, value);
     }
   }
 
@@ -1406,7 +1406,7 @@ struct staged {
         return container_t::insert_at(
             mut, container, key, value, 0, _insert_size, p_left_bound);
       } else {
-        auto range = container_t::template insert_prefix_at(
+        auto range = container_t::insert_prefix_at(
             mut, container, key, 0, _insert_size, p_left_bound);
         return NXT_STAGE_T::template insert_new<KT>(mut, range, key, value);
       }
diff --git a/src/crimson/osd/osd_operations/replicated_request.cc b/src/crimson/osd/osd_operations/replicated_request.cc
index 44ea0703cb776..73be6c25b4826 100644
--- a/src/crimson/osd/osd_operations/replicated_request.cc
+++ b/src/crimson/osd/osd_operations/replicated_request.cc
@@ -93,7 +93,7 @@ RepRequest::interruptible_future<> RepRequest::with_pg_interruptible(
   auto [commit_fut, reply] = co_await pg->handle_rep_op(req);
 
   // Transitions from OrderedExclusive->OrderedConcurrent cannot block
-  this->template enter_stage_sync(repop_pipeline(*pg).wait_commit);
+  this->enter_stage_sync(repop_pipeline(*pg).wait_commit);
 
   co_await std::move(commit_fut);
 
diff --git a/src/crimson/osd/pg_shard_manager.cc b/src/crimson/osd/pg_shard_manager.cc
index 0d041e91e5e79..cb5e556ab9efc 100644
--- a/src/crimson/osd/pg_shard_manager.cc
+++ b/src/crimson/osd/pg_shard_manager.cc
@@ -26,7 +26,7 @@ seastar::future<> PGShardManager::load_pgs(crimson::os::FuturizedStore& store)
           return get_pg_to_shard_mapping().get_or_create_pg_mapping(
             pgid, shard_core
           ).then([this, pgid] (auto core) {
-            return this->template with_remote_shard_state(
+            return this->with_remote_shard_state(
               core,
               [pgid](
 	      PerShardState &per_shard_state,