diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2014-07-14 16:24:59 +0200 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-07-14 16:24:59 +0200 |
| commit | 46c97a8db770d637cf8e11fa8b178a32c60cdada (patch) | |
| tree | 4022e05800efba2dd0a31b6363eed0f0bf065671 /include | |
| parent | 63601e946e77f11835cf9cbb87c55fe41e0b12bb (diff) | |
Rename UserChanList to User::ChanList, remove UCListIter
Diffstat (limited to 'include')
| -rw-r--r-- | include/typedefs.h | 8 | ||||
| -rw-r--r-- | include/users.h | 5 |
2 files changed, 4 insertions, 9 deletions
diff --git a/include/typedefs.h b/include/typedefs.h index 640c70cab..bd236dc62 100644 --- a/include/typedefs.h +++ b/include/typedefs.h @@ -65,14 +65,6 @@ typedef std::vector<std::pair<std::string, std::string> > FailedPortList; */ typedef std::vector<reference<ConnectClass> > ClassVector; -/** Typedef for the list of user-channel records for a user - */ -typedef intrusive_list<Membership> UserChanList; - -/** Shorthand for an iterator into a UserChanList - */ -typedef UserChanList::iterator UCListIter; - /** List of channels to consider when building the neighbor list of a user */ typedef std::vector<Membership*> IncludeChanList; diff --git a/include/users.h b/include/users.h index 6408bc45f..8c89a0b16 100644 --- a/include/users.h +++ b/include/users.h @@ -248,6 +248,9 @@ class CoreExport User : public Extensible std::bitset<ModeParser::MODEID_MAX> modes; public: + /** List of Memberships for this user + */ + typedef intrusive_list<Membership> ChanList; /** Hostname of connection. * This should be valid as per RFC1035. @@ -302,7 +305,7 @@ class CoreExport User : public Extensible /** Channels this user is on */ - UserChanList chans; + ChanList chans; /** The server the user is connected to. */ |