From: Xinyu Huang <xinyu.huang@intel.com>
Date: Fri, 18 Nov 2022 02:39:29 +0000 (+0000)
Subject: crimson/os/seastore: add reference to the iterator of segment_map_t
X-Git-Tag: v18.1.0~830^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dedba400ebcff5dc1ea22c51b6b257d3a36aaa7a;p=ceph.git

crimson/os/seastore: add reference to the iterator of segment_map_t

Signed-off-by: Xinyu Huang <xinyu.huang@intel.com>
---

diff --git a/src/crimson/os/seastore/seastore_types.h b/src/crimson/os/seastore/seastore_types.h
index 72b75f19a568..8698a3af1d8e 100644
--- a/src/crimson/os/seastore/seastore_types.h
+++ b/src/crimson/os/seastore/seastore_types.h
@@ -391,13 +391,11 @@ private:
       assert(!is_end());
       return &*current;
     }
-    template <bool c = is_const, std::enable_if_t<c, int> = 0>
-    const std::pair<const segment_id_t, const T&> &operator*() {
-      assert(!is_end());
-      return *current;
-    }
-    template <bool c = is_const, std::enable_if_t<!c, int> = 0>
-    std::pair<const segment_id_t, T&> &operator*() {
+
+    using reference = std::conditional_t<
+      is_const, const std::pair<const segment_id_t, const T&>&,
+      std::pair<const segment_id_t, T&>&>;
+    reference operator*() {
       assert(!is_end());
       return *current;
     }