X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Ftypedefs.h;h=404175ddb456a59a2a48607056c3f33a08ced212;hb=cfa32a6561e0152ebbd7135eaec9f7c794c170b1;hp=da277515285cd7f6339c58d64a43f26ba50b5ae5;hpb=5b9682275e384635a1fd9f7320cf4d9a604a43b4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/typedefs.h b/include/typedefs.h index da2775152..404175ddb 100644 --- a/include/typedefs.h +++ b/include/typedefs.h @@ -19,8 +19,7 @@ */ -#ifndef TYPEDEFS_H -#define TYPEDEFS_H +#pragma once class BanCacheManager; class BanItem; @@ -29,8 +28,6 @@ class Channel; class Command; class ConfigReader; class ConfigTag; -class DNSHeader; -class DNSRequest; class Extensible; class FakeUser; class InspIRCd; @@ -45,24 +42,21 @@ class ServerConfig; class ServerLimits; class Thread; class User; -class UserResolver; class XLine; class XLineManager; class XLineFactory; struct ConnectClass; struct ModResult; -struct ResourceRecord; #include "hashcomp.h" #include "base.h" -#ifdef HASHMAP_DEPRECATED - typedef nspace::hash_map user_hash; - typedef nspace::hash_map chan_hash; -#else - typedef nspace::hash_map, irc::StrHashComp> user_hash; - typedef nspace::hash_map, irc::StrHashComp> chan_hash; -#endif +typedef TR1NS::unordered_map user_hash; +typedef TR1NS::unordered_map chan_hash; + +/** A list holding local users, this is the type of UserManager::local_users + */ +typedef std::list LocalUserList; /** A list of failed port bindings, used for informational purposes on startup */ typedef std::vector > FailedPortList; @@ -116,7 +110,7 @@ typedef std::map ConfigFileCache; /** A hash of commands used by the core */ -typedef nspace::hash_map Commandtable; +typedef TR1NS::unordered_map Commandtable; /** Membership list of a channel */ typedef std::map UserMembList; @@ -155,7 +149,3 @@ typedef XLineContainer::iterator ContainerIter; /** An interator in an XLineLookup */ typedef XLineLookup::iterator LookupIter; - - -#endif -