diff options
| author | 2022-10-30 12:16:52 +0000 | |
|---|---|---|
| committer | 2022-10-30 12:58:38 +0000 | |
| commit | 41926908ecfcf043cd149e93f0c710f8cecd96a0 (patch) | |
| tree | 1a0c82117e31ad9fca8b43514e571344793353c9 /include | |
| parent | Slim down the forward declarations in typedefs. (diff) | |
Fix some types which were missed when making stuff final.
Diffstat (limited to 'include')
| -rw-r--r-- | include/clientprotocol.h | 4 | ||||
| -rw-r--r-- | include/event.h | 4 | ||||
| -rw-r--r-- | include/hashcomp.h | 4 | ||||
| -rw-r--r-- | include/inspsocket.h | 2 | ||||
| -rw-r--r-- | include/listmode.h | 6 | ||||
| -rw-r--r-- | include/mode.h | 2 | ||||
| -rw-r--r-- | include/modules/dns.h | 4 | ||||
| -rw-r--r-- | include/modules/reload.h | 2 | ||||
| -rw-r--r-- | include/protocol.h | 2 | ||||
| -rw-r--r-- | include/typedefs.h | 3 | ||||
| -rw-r--r-- | include/usermanager.h | 2 |
11 files changed, 17 insertions, 18 deletions
diff --git a/include/clientprotocol.h b/include/clientprotocol.h index b3e85fd8f..3d5ec4002 100644 --- a/include/clientprotocol.h +++ b/include/clientprotocol.h @@ -184,7 +184,7 @@ class ClientProtocol::Message public: /** Contains information required to identify a specific version of a serialized message. */ - struct SerializedInfo + struct SerializedInfo final { const Serializer* serializer; TagSelection tagwl; @@ -209,7 +209,7 @@ public: } }; - class Param + class Param final { const std::string* ptr; insp::aligned_storage<std::string> str; diff --git a/include/event.h b/include/event.h index 5e4ba4886..4795d3c39 100644 --- a/include/event.h +++ b/include/event.h @@ -39,12 +39,12 @@ class Events::ModuleEventProvider , private dynamic_reference_base::CaptureHook { public: - struct Comp + struct Comp final { bool operator()(ModuleEventListener* lhs, ModuleEventListener* rhs) const; }; - struct ElementComp + struct ElementComp final { bool operator()(ModuleEventListener* lhs, ModuleEventListener* rhs) const; }; diff --git a/include/hashcomp.h b/include/hashcomp.h index 1b31f76a8..b17be3648 100644 --- a/include/hashcomp.h +++ b/include/hashcomp.h @@ -81,7 +81,7 @@ namespace irc * Case sensitivity is ignored, and the RFC 'character set' * is adhered to */ - struct StrHashComp + struct StrHashComp final { /** The operator () does the actual comparison in hash_map */ @@ -91,7 +91,7 @@ namespace irc } }; - struct insensitive + struct insensitive final { size_t CoreExport operator()(const std::string& s) const; }; diff --git a/include/inspsocket.h b/include/inspsocket.h index 645d84c50..bb008c0a4 100644 --- a/include/inspsocket.h +++ b/include/inspsocket.h @@ -118,7 +118,7 @@ class CoreExport StreamSocket public: /** Socket send queue */ - class SendQueue + class SendQueue final { public: /** One element of the queue, a continuous buffer diff --git a/include/listmode.h b/include/listmode.h index 07e66a37e..b3a67d86c 100644 --- a/include/listmode.h +++ b/include/listmode.h @@ -29,7 +29,7 @@ class CoreExport ListModeBase public: /** An item in a listmode's list */ - struct ListItem + struct ListItem final { std::string setter; std::string mask; @@ -43,7 +43,7 @@ public: typedef std::vector<ListItem> ModeList; private: - class ChanData + class ChanData final { public: ModeList list; @@ -54,7 +54,7 @@ private: /** The number of items a listmode's list may contain */ - struct ListLimit + struct ListLimit final { std::string mask; unsigned long limit; diff --git a/include/mode.h b/include/mode.h index 2f066bc41..cb6c1b8dd 100644 --- a/include/mode.h +++ b/include/mode.h @@ -382,7 +382,7 @@ protected: public: /** Sorts a container of PrefixMode* objects descending by their rank. */ - struct Sorter + struct Sorter final { bool operator()(const PrefixMode* lhs, const PrefixMode* rhs) const { diff --git a/include/modules/dns.h b/include/modules/dns.h index c8669fff0..95685eae7 100644 --- a/include/modules/dns.h +++ b/include/modules/dns.h @@ -99,7 +99,7 @@ namespace DNS bool operator==(const Question& other) const { return ((name == other.name) && (type == other.type)); } bool operator!=(const Question& other) const { return (!(*this == other)); } - struct hash + struct hash final { size_t operator()(const Question& question) const { @@ -110,7 +110,7 @@ namespace DNS namespace Record { - struct SRV + struct SRV final { uint16_t priority = UINT16_MAX; uint16_t weight = 0; diff --git a/include/modules/reload.h b/include/modules/reload.h index fb10fe355..e70782f54 100644 --- a/include/modules/reload.h +++ b/include/modules/reload.h @@ -28,7 +28,7 @@ namespace ReloadModule */ class CustomData { - struct Data + struct Data final { EventListener* handler; void* data; diff --git a/include/protocol.h b/include/protocol.h index a1b597992..22388f238 100644 --- a/include/protocol.h +++ b/include/protocol.h @@ -41,7 +41,7 @@ class CoreExport ProtocolInterface public: typedef ProtocolServer Server; - class ServerInfo + class ServerInfo final { public: std::string servername; diff --git a/include/typedefs.h b/include/typedefs.h index dd5e0d46f..41b5c9108 100644 --- a/include/typedefs.h +++ b/include/typedefs.h @@ -55,7 +55,7 @@ namespace ClientProtocol typedef std::vector<std::string> ParamList; typedef std::string SerializedMessage; - struct MessageTagData + struct MessageTagData final { MessageTagProvider* tagprov; std::string value; @@ -86,4 +86,3 @@ typedef std::set<User*> CUList; /** A bitset of characters which are enabled/set. */ typedef std::bitset<UCHAR_MAX + 1> CharState; - diff --git a/include/usermanager.h b/include/usermanager.h index 4aa1f1479..c4f91f5e8 100644 --- a/include/usermanager.h +++ b/include/usermanager.h @@ -34,7 +34,7 @@ typedef std::unordered_map<std::string, User*, irc::insensitive, irc::StrHashCom class CoreExport UserManager final { public: - struct CloneCounts + struct CloneCounts final { unsigned int global = 0; unsigned int local = 0; |
