diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/channels.h | 6 | ||||
| -rw-r--r-- | include/extern.h | 4 | ||||
| -rw-r--r-- | include/modes.h | 2 | ||||
| -rw-r--r-- | include/operserv.h | 4 | ||||
| -rw-r--r-- | include/regchannel.h | 4 | ||||
| -rw-r--r-- | include/users.h | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/include/channels.h b/include/channels.h index 56fa7cf46..845f8fc36 100644 --- a/include/channels.h +++ b/include/channels.h @@ -44,7 +44,7 @@ struct UserContainer { User *user; UserData ud; - Flags<ChannelModeName, CMODE_END> *Status; + Flags<ChannelModeName> *Status; UserContainer(User *u) : user(u) { } virtual ~UserContainer() { } @@ -60,7 +60,7 @@ enum ChannelFlags CH_SYNCING }; -class CoreExport Channel : public Extensible, public Flags<ChannelFlags, CMODE_END> +class CoreExport Channel : public Extensible, public Flags<ChannelFlags> { private: /** A map of channel modes with their parameters set on this channel @@ -68,7 +68,7 @@ class CoreExport Channel : public Extensible, public Flags<ChannelFlags, CMODE_E std::map<ChannelModeName, Anope::string> Params; /* Modes set on the channel */ - Flags<ChannelModeName, CMODE_END> modes; + Flags<ChannelModeName> modes; public: /** Default constructor diff --git a/include/extern.h b/include/extern.h index 7d625ec91..e4a87d1d2 100644 --- a/include/extern.h +++ b/include/extern.h @@ -299,8 +299,8 @@ E int str_is_cidr(const Anope::string &str, uint32 *ip, uint32 *mask, Anope::str /**** modes.cpp ****/ /* Number of generic modes we support */ E unsigned GenericChannelModes, GenericUserModes; -E Flags<ChannelModeName, CMODE_END> DefMLockOn; -E Flags<ChannelModeName, CMODE_END> DefMLockOff; +E Flags<ChannelModeName> DefMLockOn; +E Flags<ChannelModeName> DefMLockOff; E std::map<ChannelModeName, Anope::string> DefMLockParams; /* Modes to set on bots when they join the channel */ E std::list<ChannelModeStatus *> BotModes; diff --git a/include/modes.h b/include/modes.h index 7a4ff7f70..6447550ad 100644 --- a/include/modes.h +++ b/include/modes.h @@ -19,7 +19,7 @@ enum UserModeName UMODE_REGPRIV, UMODE_PROTECTED, UMODE_NO_CTCP, UMODE_WEBTV, UMODE_WHOIS, UMODE_ADMIN, UMODE_DEAF, UMODE_GLOBOPS, UMODE_HELPOP, UMODE_INVIS, UMODE_OPER, UMODE_PRIV, UMODE_GOD, UMODE_REGISTERED, UMODE_SNOMASK, UMODE_VHOST, UMODE_WALLOPS, UMODE_CLOAK, UMODE_SSL, UMODE_CALLERID, UMODE_COMMONCHANS, - UMODE_HIDDEN, UMODE_STRIPCOLOR, + UMODE_HIDDEN, UMODE_STRIPCOLOR, UMODE_INVISIBLE_OPER, UMODE_END }; diff --git a/include/operserv.h b/include/operserv.h index e3c25b0f6..d1c03c481 100644 --- a/include/operserv.h +++ b/include/operserv.h @@ -12,8 +12,8 @@ extern CoreExport std::vector<NewsItem *> News; extern CoreExport std::vector<std::bitset<32> > DefCon; extern CoreExport bool DefConModesSet; -extern CoreExport Flags<ChannelModeName, CMODE_END> DefConModesOn; -extern CoreExport Flags<ChannelModeName, CMODE_END> DefConModesOff; +extern CoreExport Flags<ChannelModeName> DefConModesOn; +extern CoreExport Flags<ChannelModeName> DefConModesOff; extern CoreExport std::map<ChannelModeName, Anope::string> DefConModesOnParams; class XLineManager; diff --git a/include/regchannel.h b/include/regchannel.h index 178b3c32d..e19b07f5e 100644 --- a/include/regchannel.h +++ b/include/regchannel.h @@ -69,8 +69,8 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag, std::vector<ChanAccess *> access; /* List of authorized users */ std::vector<AutoKick *> akick; /* List of users to kickban */ std::vector<BadWord *> badwords; /* List of badwords */ - Flags<ChannelModeName, CMODE_END> mlock_on; /* Modes mlocked on */ - Flags<ChannelModeName, CMODE_END> mlock_off; /* Modes mlocked off */ + Flags<ChannelModeName> mlock_on; /* Modes mlocked on */ + Flags<ChannelModeName> mlock_off; /* Modes mlocked off */ public: /** Default constructor diff --git a/include/users.h b/include/users.h index 8f82981c5..f545c15a1 100644 --- a/include/users.h +++ b/include/users.h @@ -20,7 +20,7 @@ extern CoreExport user_uid_map UserListByUID; struct ChannelContainer { Channel *chan; - Flags<ChannelModeName, CMODE_END> *Status; + Flags<ChannelModeName> *Status; ChannelContainer(Channel *c) : chan(c) { } virtual ~ChannelContainer() { } @@ -36,7 +36,7 @@ class CoreExport User : public Extensible Anope::string ident; Anope::string uid; bool OnAccess; /* If the user is on the access list of the nick theyre on */ - Flags<UserModeName, UMODE_END> modes; /* Bitset of mode names the user has set on them */ + Flags<UserModeName> modes; /* Bitset of mode names the user has set on them */ std::map<UserModeName, Anope::string> Params; /* Map of user modes and the params this user has */ NickCore *nc; /* NickCore account the user is currently loggged in as */ |