From 1604ecd03871c117cb79b226725a73c6dba07e67 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Wed, 5 Aug 2020 18:16:16 -0700
Subject: [PATCH] ircd::json::tuple: Use inline linkage for key() suite
 related.

---
 include/ircd/json/tuple/key.h   | 27 ++++++++++++++-------------
 include/ircd/json/tuple/tuple.h |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/include/ircd/json/tuple/key.h b/include/ircd/json/tuple/key.h
index ca91b2035..9ab35252e 100644
--- a/include/ircd/json/tuple/key.h
+++ b/include/ircd/json/tuple/key.h
@@ -23,9 +23,18 @@ noexcept
 	return tuple_element<tuple, i>::key;
 }
 
+template<size_t i,
+         class tuple>
+inline enable_if_tuple<tuple, const char *>
+key(const tuple &t)
+noexcept
+{
+	return std::get<i>(t).key;
+}
+
 template<class tuple,
          size_t i>
-constexpr typename std::enable_if<i == tuple::size(), const char *>::type
+inline typename std::enable_if<i == tuple::size(), const char *>::type
 key(const size_t &j)
 noexcept
 {
@@ -34,22 +43,14 @@ noexcept
 
 template<class tuple,
          size_t i = 0>
-constexpr typename std::enable_if<i < tuple::size(), const char *>::type
+inline typename std::enable_if<i < tuple::size(), const char *>::type
 key(const size_t &j)
 noexcept
 {
-	return j == i?
-		tuple_element<tuple, i>::key:
-		key<tuple, i + 1>(j);
-}
+	if(likely(j != i))
+		return key<tuple, i + 1>(j);
 
-template<size_t i,
-         class tuple>
-enable_if_tuple<tuple, const char *>
-key(const tuple &t)
-noexcept
-{
-	return std::get<i>(t).key;
+	return tuple_element<tuple, i>::key;
 }
 
 } // namespace json
diff --git a/include/ircd/json/tuple/tuple.h b/include/ircd/json/tuple/tuple.h
index 7c0c6dbc2..344e7d475 100644
--- a/include/ircd/json/tuple/tuple.h
+++ b/include/ircd/json/tuple/tuple.h
@@ -167,7 +167,7 @@ noexcept
 }
 
 template<class tuple>
-constexpr bool
+inline bool
 key_exists(const string_view &key)
 {
 	return indexof<tuple>(key) < size<tuple>();