ircd::util: Remove separate header for pair gimmick; move to stdinc.h

include/ircd/stdinc.h

@@ -214,6 +214,12 @@ namespace ircd
 	template<class... T> using ilist = std::initializer_list<T...>;
 
 	using std::error_code;
+
+	/// Simple gimmick to allow shorter declarations when both elements
+	/// of a pair are the same.
+	template<class A,
+	         class B = A>
+	using pair = std::pair<A, B>;
 }
 
 #pragma GCC visibility pop // default

include/ircd/util/pair.h

@@ -1,22 +0,0 @@
-// The Construct
-//
-// Copyright (C) The Construct Developers, Authors & Contributors
-// Copyright (C) 2016-2020 Jason Volk <jason@zemos.net>
-//
-// Permission to use, copy, modify, and/or distribute this software for any
-// purpose with or without fee is hereby granted, provided that the above
-// copyright notice and this permission notice is present in all copies. The
-// full license for this software is available in the LICENSE file.
-
-#pragma once
-#define HAVE_IRCD_UTIL_PAIR_H
-
-namespace ircd {
-inline namespace util
-{
-	/// Simple gimmick to allow shorter declarations when both elements
-	/// of a pair are the same.
-	template<class A,
-	         class B = A>
-	using pair = std::pair<A, B>;
-}}

include/ircd/util/util.h

@@ -32,7 +32,6 @@ namespace ircd
 
 #include "typography.h"
 #include "identity.h"
-#include "pair.h"
 #include "unit_literal.h"
 #include "construction.h"
 #include "unwind.h"