MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-27 07:54:05 +01:00
Code Issues Releases Wiki Activity

ircd::net: Consistent nesting for null_remote to remote::null.

Browse source
This commit is contained in:
Jason Volk 2017-12-28 15:26:19 -07:00
parent bf9db52428
commit 46482e61f2
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/ircd/net/remote.h
View file

@ -54,8 +54,6 @@ namespace ircd::net
std::string string(const hostport &); std::string string(const hostport &);
std::string string(const ipport &); std::string string(const ipport &);
std::string string(const remote &); std::string string(const remote &);
extern const remote null_remote;
} }
/// This structure holds a hostname and port usually fresh from user input /// This structure holds a hostname and port usually fresh from user input
@ -119,6 +117,8 @@ struct ircd::net::ipport
struct ircd::net::remote struct ircd::net::remote
:ircd::net::ipport :ircd::net::ipport
{ {
static const remote null;
std::string hostname; std::string hostname;
operator bool() const; operator bool() const;

8
ircd/net.cc
View file

@ -1516,10 +1516,6 @@ ircd::net::string(const mutable_buffer &buf,
// net/remote.h // net/remote.h
// //
const ircd::net::remote
ircd::net::null_remote
{};
// //
// host / port utils // host / port utils
// //
@ -1686,6 +1682,10 @@ ircd::net::string(const remote &remote,
// remote // remote
// //
const ircd::net::remote
ircd::net::remote::null
{};
ircd::net::remote::remote(hostport hp) ircd::net::remote::remote(hostport hp)
:remote{std::move(hp.first), hp.second} :remote{std::move(hp.first), hp.second}
{ {