diff --git a/include/ircd/stdinc.h b/include/ircd/stdinc.h index d64d14c15..e912b1cd5 100644 --- a/include/ircd/stdinc.h +++ b/include/ircd/stdinc.h @@ -214,6 +214,12 @@ namespace ircd template using ilist = std::initializer_list; using std::error_code; + + /// Simple gimmick to allow shorter declarations when both elements + /// of a pair are the same. + template + using pair = std::pair; } #pragma GCC visibility pop // default diff --git a/include/ircd/util/pair.h b/include/ircd/util/pair.h deleted file mode 100644 index 52e3215b7..000000000 --- a/include/ircd/util/pair.h +++ /dev/null @@ -1,22 +0,0 @@ -// The Construct -// -// Copyright (C) The Construct Developers, Authors & Contributors -// Copyright (C) 2016-2020 Jason Volk -// -// 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 - using pair = std::pair; -}} diff --git a/include/ircd/util/util.h b/include/ircd/util/util.h index 5318551e7..bd96b4fef 100644 --- a/include/ircd/util/util.h +++ 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"