Commit patch from danieldg that makes a ton of stuff const-safe for latest warn-happy...

[user/henk/code/inspircd.git] / src / modules / extra / m_mysql.cpp

diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 5ce87c4b495af7f843a3ea37f6f4ab82545b9e49..8fa717f78ffad235ba10330874302aaaddf1d890 100644 (file)
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -99,7 +99,7 @@ class MySQLresult : public SQLresult
        int rows;
  public:
 
-       MySQLresult(Module* self, Module* to, MYSQL_RES* res, int affected_rows, unsigned int id) : SQLresult(self, to, id), currentrow(0), fieldmap(NULL)
+       MySQLresult(Module* self, Module* to, MYSQL_RES* res, int affected_rows, unsigned int rid) : SQLresult(self, to, rid), currentrow(0), fieldmap(NULL)
        {
                /* A number of affected rows from from mysql_affected_rows.
                 */
@@ -145,7 +145,7 @@ class MySQLresult : public SQLresult
                }
        }
 
-       MySQLresult(Module* self, Module* to, SQLerror e, unsigned int id) : SQLresult(self, to, id), currentrow(0)
+       MySQLresult(Module* self, Module* to, SQLerror e, unsigned int rid) : SQLresult(self, to, rid), currentrow(0)
        {
                rows = 0;
                error = e;
@@ -762,7 +762,7 @@ class ModuleSQL : public Module
                return ++currid;
        }
 
-       char* OnRequest(Request* request)
+       virtual const char* OnRequest(Request* request)
        {
                if(strcmp(SQLREQID, request->GetId()) == 0)
                {