From 46b2613a8c1a1bebaf90558b10e6f5012dde1ff0 Mon Sep 17 00:00:00 2001
From: Francesco Biscani <bluescarni@gmail.com>
Date: Thu, 23 May 2024 10:29:11 +0200
Subject: [PATCH] Avoid code repetition in iface_ptr().

---
 include/tanuki/tanuki.hpp | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/include/tanuki/tanuki.hpp b/include/tanuki/tanuki.hpp
index c3e7a8c..59dee8d 100644
--- a/include/tanuki/tanuki.hpp
+++ b/include/tanuki/tanuki.hpp
@@ -1849,7 +1849,9 @@ class TANUKI_VISIBLE wrap : private detail::wrap_storage<IFace, Cfg.static_size,
         return w.m_pv_iface->_tanuki_value_type_index();
     }
 
-    [[nodiscard]] friend const IFace *iface_ptr(const wrap &w) noexcept
+    template <typename Wrap>
+        requires std::same_as<wrap, std::remove_cv_t<Wrap>>
+    [[nodiscard]] friend auto iface_ptr_impl(Wrap &w) noexcept
     {
         if constexpr (Cfg.semantics == wrap_semantics::value) {
             return w.m_pv_iface;
@@ -1857,29 +1859,22 @@ class TANUKI_VISIBLE wrap : private detail::wrap_storage<IFace, Cfg.static_size,
             return w.m_pv_iface.get();
         }
     }
+
+    [[nodiscard]] friend const IFace *iface_ptr(const wrap &w) noexcept
+    {
+        return iface_ptr_impl(w);
+    }
     [[nodiscard]] friend const IFace *iface_ptr(const wrap &&w) noexcept
     {
-        if constexpr (Cfg.semantics == wrap_semantics::value) {
-            return w.m_pv_iface;
-        } else {
-            return w.m_pv_iface.get();
-        }
+        return iface_ptr_impl(w);
     }
     [[nodiscard]] friend IFace *iface_ptr(wrap &w) noexcept
     {
-        if constexpr (Cfg.semantics == wrap_semantics::value) {
-            return w.m_pv_iface;
-        } else {
-            return w.m_pv_iface.get();
-        }
+        return iface_ptr_impl(w);
     }
     [[nodiscard]] friend IFace *iface_ptr(wrap &&w) noexcept
     {
-        if constexpr (Cfg.semantics == wrap_semantics::value) {
-            return w.m_pv_iface;
-        } else {
-            return w.m_pv_iface.get();
-        }
+        return iface_ptr_impl(w);
     }
 
     friend void swap(wrap &w1, wrap &w2) noexcept