diff options
author | Anubisss <none@none> | 2010-09-30 20:32:09 +0200 |
---|---|---|
committer | Anubisss <none@none> | 2010-09-30 20:32:09 +0200 |
commit | 84a29b2d351c07868ec150efcf15263f373fe9d7 (patch) | |
tree | 1aae3c638fb92fa72690ea78c0f1945588ca76f4 /src/server/shared/Database/MySQLConnection.h | |
parent | 41d816740bd4eb567083c825ac613301c04a89c2 (diff) |
Remove const from MySQLConnectionInfo, can't use non const functions in a const struct. This fixes the compile error.
--HG--
branch : trunk
Diffstat (limited to 'src/server/shared/Database/MySQLConnection.h')
-rw-r--r-- | src/server/shared/Database/MySQLConnection.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/server/shared/Database/MySQLConnection.h b/src/server/shared/Database/MySQLConnection.h index 34287948aed..6dc22efd130 100644 --- a/src/server/shared/Database/MySQLConnection.h +++ b/src/server/shared/Database/MySQLConnection.h @@ -53,11 +53,6 @@ struct MySQLConnectionInfo std::string database; std::string host; std::string port_or_socket; - - void ChangeHost(const std::string& newHost) /// Needed for unix socket case - { - host = newHost; - } }; class MySQLConnection @@ -66,8 +61,8 @@ class MySQLConnection friend class PingOperation; public: - MySQLConnection(const MySQLConnectionInfo& connInfo); //! Constructor for synchroneous connections. - MySQLConnection(ACE_Activation_Queue* queue, const MySQLConnectionInfo& connInfo); //! Constructor for asynchroneous connections. + MySQLConnection(MySQLConnectionInfo& connInfo); //! Constructor for synchroneous connections. + MySQLConnection(ACE_Activation_Queue* queue, MySQLConnectionInfo& connInfo); //! Constructor for asynchroneous connections. ~MySQLConnection(); virtual bool Open(); @@ -111,7 +106,7 @@ class MySQLConnection ACE_Activation_Queue* m_queue; //! Queue shared with other asynchroneous connections. DatabaseWorker* m_worker; //! Core worker task. MYSQL * m_Mysql; //! MySQL Handle. - const MySQLConnectionInfo& m_connectionInfo; //! Connection info (used for logging) + MySQLConnectionInfo& m_connectionInfo; //! Connection info (used for logging) ACE_Thread_Mutex m_Mutex; }; |