From a9ac3f9956d47e2939cbf298d644c83a178bccf4 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Wed, 20 Sep 2017 19:29:36 -0700
Subject: [PATCH] ircd: Move ircd::mods::demangle() to ircd::demangle().

---
 include/ircd/mods.h   | 11 -----------
 include/ircd/stdinc.h | 10 ++++++++++
 ircd/mods.cc          |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/include/ircd/mods.h b/include/ircd/mods.h
index 5dd2631d1..1e2c0184d 100644
--- a/include/ircd/mods.h
+++ b/include/ircd/mods.h
@@ -38,9 +38,6 @@ namespace ircd::mods
 	template<class T> struct import_shared;
 	struct paths extern paths;
 
-	std::string demangle(const std::string &symbol);
-	template<class T> std::string demangle();
-
 	std::string postfixed(const std::string &name);
 	std::string unpostfixed(const std::string &name);
 
@@ -69,7 +66,6 @@ namespace ircd
 	using mods::module;
 	using mods::import;
 	using mods::import_shared;
-	using mods::demangle;
 }
 
 struct ircd::mods::paths
@@ -272,10 +268,3 @@ const
 {
 	return reinterpret_cast<const T *>(ptr<const uint8_t>(name));
 }
-
-template<class T>
-std::string
-ircd::mods::demangle()
-{
-	return demangle(typeid(T).name());
-}
diff --git a/include/ircd/stdinc.h b/include/ircd/stdinc.h
index 4f092d03d..44568bf23 100644
--- a/include/ircd/stdinc.h
+++ b/include/ircd/stdinc.h
@@ -198,6 +198,9 @@ namespace ircd
 
 	struct socket;
 	struct client;
+
+	std::string demangle(const std::string &symbol);
+	template<class T> std::string demangle();
 }
 
 #include "util.h"
@@ -229,3 +232,10 @@ namespace ircd
 #include "client.h"
 #include "mods.h"
 #include "listen.h"
+
+template<class T>
+std::string
+ircd::demangle()
+{
+	return demangle(typeid(T).name());
+}
diff --git a/ircd/mods.cc b/ircd/mods.cc
index 8e5809d89..c67346eb3 100644
--- a/ircd/mods.cc
+++ b/ircd/mods.cc
@@ -584,7 +584,7 @@ ircd::mods::prefix_if_relative(const filesystem::path &path)
 }
 
 std::string
-ircd::mods::demangle(const std::string &symbol)
+ircd::demangle(const std::string &symbol)
 {
 	size_t len;
 	int status;