diff options
| author | QAston <qaston@gmail.com> | 2011-07-01 12:48:21 +0200 |
|---|---|---|
| committer | QAston <qaston@gmail.com> | 2011-07-01 12:48:21 +0200 |
| commit | 06515b27b3a92b353b63ee98b99d8c44f24e7194 (patch) | |
| tree | 3ee85275da234a7e0311d898107e5e5e376717c6 /src/server/shared/Database | |
| parent | 3b8dce669d6ce4aad680da99dae1b73fe54b17df (diff) | |
| parent | a9c9ab0efa7e41c31f52e71749048300d809d69a (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Diffstat (limited to 'src/server/shared/Database')
| -rwxr-xr-x | src/server/shared/Database/DatabaseWorkerPool.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h index 2be778a1028..5e24608715a 100755 --- a/src/server/shared/Database/DatabaseWorkerPool.h +++ b/src/server/shared/Database/DatabaseWorkerPool.h @@ -408,13 +408,13 @@ class DatabaseWorkerPool } //! Apply escape string'ing for current collation. (utf8) - void escape_string(std::string& str) + void EscapeString(std::string& str) { if (str.empty()) return; char* buf = new char[str.size()*2+1]; - escape_string(buf, str.c_str(), str.size()); + EscapeString(buf, str.c_str(), str.size()); str = buf; delete[] buf; } @@ -441,7 +441,7 @@ class DatabaseWorkerPool } private: - unsigned long escape_string(char *to, const char *from, unsigned long length) + unsigned long EscapeString(char *to, const char *from, unsigned long length) { if (!to || !from || !length) return 0; |
