diff options
| author |  Sadie Powell | 2018-07-31 03:02:16 +0100 |
|---|---|---|
| committer | Sadie Powell | 2019-01-25 02:49:03 +0000 |
| commit | fb17bba197a190b5865e2ddf4f70019a6dc23ba2 (patch) | |
| tree | afd8943530eceb5b14f457856edd9257bdc440ca /src/modules | |
| parent | Use C++14 compilers in Docker on Travis. (diff) | |
Replace the TR1NS macro with the std namespace.
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/m_channames.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_monitor.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_nationalchars.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/servercommand.h | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/utils.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp index d0d122b43..b3a882c20 100644 --- a/src/modules/m_channames.cpp +++ b/src/modules/m_channames.cpp @@ -44,7 +44,7 @@ bool NewIsChannelHandler::Call(const std::string& channame) class ModuleChannelNames : public Module { - TR1NS::function<bool(const std::string&)> rememberer; + std::function<bool(const std::string&)> rememberer; bool badchan; ChanModeReference permchannelmode; diff --git a/src/modules/m_monitor.cpp b/src/modules/m_monitor.cpp index fd72c7320..7632f6a04 100644 --- a/src/modules/m_monitor.cpp +++ b/src/modules/m_monitor.cpp @@ -191,7 +191,7 @@ class IRCv3::Monitor::Manager } private: - typedef TR1NS::unordered_map<std::string, Entry, irc::insensitive, irc::StrHashComp> NickHash; + typedef std::unordered_map<std::string, Entry, irc::insensitive, irc::StrHashComp> NickHash; Entry* Find(const std::string& nick) { diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp index 81c2d2959..15711a4c1 100644 --- a/src/modules/m_nationalchars.cpp +++ b/src/modules/m_nationalchars.cpp @@ -219,7 +219,7 @@ class ModuleNationalChars : public Module { std::string charset; unsigned char m_additional[256], m_additionalUp[256], m_lower[256], m_upper[256]; - TR1NS::function<bool(const std::string&)> rememberer; + std::function<bool(const std::string&)> rememberer; bool forcequit; const unsigned char * lowermap_rememberer; unsigned char prev_map[256]; diff --git a/src/modules/m_spanningtree/servercommand.h b/src/modules/m_spanningtree/servercommand.h index 6ea5a9251..7e4af3b48 100644 --- a/src/modules/m_spanningtree/servercommand.h +++ b/src/modules/m_spanningtree/servercommand.h @@ -95,7 +95,7 @@ class ServerOnlyServerCommand : public ServerCommand class ServerCommandManager { - typedef TR1NS::unordered_map<std::string, ServerCommand*> ServerCommandMap; + typedef std::unordered_map<std::string, ServerCommand*> ServerCommandMap; ServerCommandMap commands; public: diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h index c6f5822fe..6fd36438f 100644 --- a/src/modules/m_spanningtree/utils.h +++ b/src/modules/m_spanningtree/utils.h @@ -37,7 +37,7 @@ extern SpanningTreeUtilities* Utils; /** Associative container type, mapping server names/ids to TreeServers */ -typedef TR1NS::unordered_map<std::string, TreeServer*, irc::insensitive, irc::StrHashComp> server_hash; +typedef std::unordered_map<std::string, TreeServer*, irc::insensitive, irc::StrHashComp> server_hash; /** Contains helper functions and variables for this module, * and keeps them out of the global namespace |