pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-01-09 20:43:52 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Arthur Ice 2014-07-03 23:09:19 -07:00
commit 6197fb07e1
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/MySQLRequestResult.h
View File

@ -10,6 +10,8 @@
#include <../common/types.h>
#include <../common/MySQLRequestRow.h>
#include <string>
#include <string.h>
#include <limits.h>
class MySQLRequestResult {
private:
@ -52,4 +54,5 @@ private:
};
#endif
#endif

11
common/MySQLRequestRow.cpp
View File

@ -19,6 +19,15 @@ MySQLRequestRow::MySQLRequestRow(MySQLRequestRow&& moveItem)
moveItem.m_MySQLRow = nullptr;
}
MySQLRequestRow& MySQLRequestRow::operator=(MySQLRequestRow& moveItem)
{
m_Result = moveItem.m_Result;
m_MySQLRow = moveItem.m_MySQLRow;
moveItem.m_Result = nullptr;
moveItem.m_MySQLRow = nullptr;
}
MySQLRequestRow::MySQLRequestRow(MYSQL_RES *result)
: m_Result(result), m_MySQLRow(mysql_fetch_row(m_Result))
{
@ -51,4 +60,4 @@ char* MySQLRequestRow::operator[](int index)
{
return m_MySQLRow[index];
}
}

3
common/MySQLRequestRow.h
View File

@ -23,6 +23,7 @@ public:
MySQLRequestRow(MYSQL_RES *result);
MySQLRequestRow(const MySQLRequestRow& row);
MySQLRequestRow(MySQLRequestRow&& moveItem);
MySQLRequestRow& operator=(MySQLRequestRow& moveItem);
MySQLRequestRow& operator++();
MySQLRequestRow operator++(int);
bool operator==(const MySQLRequestRow& rhs);
@ -34,4 +35,4 @@ public:
#endif
#endif

2
world/socket_server.cpp
View File

@ -1,5 +1,5 @@
#include "../common/debug.h"
#include "Socket_Server.h"
#include "socket_server.h"
#include "WorldConfig.h"
#include "clientlist.h"
#include "zonelist.h"