diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2013-05-15 13:48:02 -0700 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2013-05-15 13:48:02 -0700 |
| commit | 4b41feea830fc84e8c1b2fd0982f3e8d8840af96 (patch) | |
| tree | d9cf047483dd4bf6c21c9465ae51e842ca1e7b50 /src/modules/extra/m_mysql.cpp | |
| parent | e586aaab7c4f7b03514c83451d73b73f55dc6998 (diff) | |
| parent | 4ab1c43c1eee708fc50a4808f714a731891b75e8 (diff) | |
Merge pull request #514 from SaberUK/master+virtual-cleanup
Remove virtual keyword from a ton of methods which don't need it, introduce CXX11_OVERRIDE.
Diffstat (limited to 'src/modules/extra/m_mysql.cpp')
| -rw-r--r-- | src/modules/extra/m_mysql.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index 2a7e2f878..e5d8d379c 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -107,11 +107,11 @@ class ModuleSQL : public Module ConnMap connections; // main thread only ModuleSQL(); - void init(); + void init() CXX11_OVERRIDE; ~ModuleSQL(); - void OnRehash(User* user); - void OnUnloadModule(Module* mod); - Version GetVersion(); + void OnRehash(User* user) CXX11_OVERRIDE; + void OnUnloadModule(Module* mod) CXX11_OVERRIDE; + Version GetVersion() CXX11_OVERRIDE; }; class DispatcherThread : public SocketThread @@ -121,8 +121,8 @@ class DispatcherThread : public SocketThread public: DispatcherThread(ModuleSQL* CreatorModule) : Parent(CreatorModule) { } ~DispatcherThread() { } - virtual void Run(); - virtual void OnNotify(); + void Run(); + void OnNotify(); }; #if !defined(MYSQL_VERSION_ID) || MYSQL_VERSION_ID<32224 @@ -189,17 +189,17 @@ class MySQLresult : public SQLResult } - virtual int Rows() + int Rows() { return rows; } - virtual void GetCols(std::vector<std::string>& result) + void GetCols(std::vector<std::string>& result) { result.assign(colnames.begin(), colnames.end()); } - virtual SQLEntry GetValue(int row, int column) + SQLEntry GetValue(int row, int column) { if ((row >= 0) && (row < rows) && (column >= 0) && (column < (int)fieldlists[row].size())) { @@ -208,7 +208,7 @@ class MySQLresult : public SQLResult return SQLEntry(); } - virtual bool GetRow(SQLEntries& result) + bool GetRow(SQLEntries& result) { if (currentrow < rows) { |