Skip to content

Commit d7892b7

Browse files
xengine-qytxengine-qyt
committed
delete tstring type
match xengine version 7.23
1 parent d7ff8cc commit d7892b7

File tree

27 files changed

+71
-97
lines changed

27 files changed

+71
-97
lines changed

‎XEngine_Source/StorageModule_APIHelp/APIHelp_Define.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ extern "C" BOOL APIHelp_Distributed_IsMode(list<int>*pStl_ListMode, int nMode);
5959
意思：是否成功
6060
备注：
6161
*********************************************************************/
62-
extern "C" BOOL APIHelp_Distributed_RandomAddr(list<tstring>* pStl_ListAddr, TCHAR* ptszAddr);
62+
extern "C" BOOL APIHelp_Distributed_RandomAddr(list<string>* pStl_ListAddr, TCHAR* ptszAddr);
6363
/********************************************************************
6464
函数名称：APIHelp_Distributed_FileList
6565
函数功能：解析所有解析到的内容并且打包成指定结构

‎XEngine_Source/StorageModule_APIHelp/APIHelp_Distributed/APIHelp_Distributed.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ BOOL CAPIHelp_Distributed::APIHelp_Distributed_IsMode(list<int>* pStl_ListMode,
7474
意思：是否成功
7575
备注：
7676
*********************************************************************/
77-
BOOL CAPIHelp_Distributed::APIHelp_Distributed_RandomAddr(list<tstring>* pStl_ListAddr, TCHAR* ptszAddr)
77+
BOOL CAPIHelp_Distributed::APIHelp_Distributed_RandomAddr(list<string>* pStl_ListAddr, TCHAR* ptszAddr)
7878
{
7979
APIHelp_IsErrorOccur = FALSE;
8080

@@ -86,7 +86,7 @@ BOOL CAPIHelp_Distributed::APIHelp_Distributed_RandomAddr(list<tstring>* pStl_Li
8686
{
8787
xhToken--;
8888
}
89-
list<tstring>::const_iterator stl_ListIterator = pStl_ListAddr->begin();
89+
list<string>::const_iterator stl_ListIterator = pStl_ListAddr->begin();
9090
for (XNETHANDLE i = 0; stl_ListIterator != pStl_ListAddr->end(); stl_ListIterator++, i++)
9191
{
9292
if (xhToken == i)

‎XEngine_Source/StorageModule_APIHelp/APIHelp_Distributed/APIHelp_Distributed.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class CAPIHelp_Distributed
1919
~CAPIHelp_Distributed();
2020
public:
2121
BOOL APIHelp_Distributed_IsMode(list<int>* pStl_ListMode, int nMode);
22-
BOOL APIHelp_Distributed_RandomAddr(list<tstring>* pStl_ListAddr, TCHAR* ptszAddr);
22+
BOOL APIHelp_Distributed_RandomAddr(list<string>* pStl_ListAddr, TCHAR* ptszAddr);
2323
BOOL APIHelp_Distributed_FileList(list<APIHELP_LBFILEINFO>* pStl_ListParse, XSTORAGECORE_DBFILE*** pppSt_ListPacket, int* pInt_ListCount);
2424
protected:
2525
BOOL APIHelp_Distributed_FileListParse(LPCTSTR lpszMsgBuffer, int nMsgLen, XSTORAGECORE_DBFILE* pSt_DBFile);

‎XEngine_Source/StorageModule_APIHelp/pch.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extern "C" BOOL APIHelp_Distributed_IsMode(list<int>*pStl_ListMode, int nMode)
3333
{
3434
return m_APIDistributed.APIHelp_Distributed_IsMode(pStl_ListMode, nMode);
3535
}
36-
extern "C" BOOL APIHelp_Distributed_RandomAddr(list<tstring>*pStl_ListAddr, TCHAR * ptszAddr)
36+
extern "C" BOOL APIHelp_Distributed_RandomAddr(list<string>*pStl_ListAddr, TCHAR * ptszAddr)
3737
{
3838
return m_APIDistributed.APIHelp_Distributed_RandomAddr(pStl_ListAddr, ptszAddr);
3939
}

‎XEngine_Source/StorageModule_APIHelp/pch.h‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,7 @@ using namespace std;
3232
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
3333
#include <XEngine_Include/XEngine_HelpComponents/DataBase_Define.h>
3434
#include <XEngine_Include/XEngine_HelpComponents/DataBase_Error.h>
35-
36-
#ifdef _UNICODE
37-
typedef std::wstring tstring;
38-
#else
39-
typedef std::string tstring;
40-
#endif
41-
35+
#include "../XStorage_Protocol.h"
4236
#include "../XEngine_StorageComponents/XStorage_SQLPacket/SQLPacket_Define.h"
4337
#include "APIHelp_Define.h"
4438
#include "APIHelp_Error.h"

‎XEngine_Source/StorageModule_Config/Config_Define.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ typedef struct tag_XEngine_ServerConfig
100100
}st_P2xp;
101101
struct
102102
{
103-
list<tstring> *pStl_ListStorage;
103+
list<string> *pStl_ListStorage;
104104
}st_XVer;
105105
}XENGINE_SERVERCONFIG;
106106
typedef struct
@@ -114,9 +114,9 @@ typedef struct
114114
struct
115115
{
116116
list<int>* pStl_ListUseMode;
117-
list<tstring>* pStl_ListCenter;
118-
list<tstring>* pStl_ListDownload;
119-
list<tstring>* pStl_ListUPLoader;
117+
list<string>* pStl_ListCenter;
118+
list<string>* pStl_ListDownload;
119+
list<string>* pStl_ListUPLoader;
120120
}st_LoadBalance;
121121
}XENGINE_LBCONFIG;
122122
//////////////////////////////////////////////////////////////////////////

‎XEngine_Source/StorageModule_Config/Config_Json/Config_Json.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ BOOL CConfig_Json::Config_Json_File(LPCTSTR lpszConfigFile,XENGINE_SERVERCONFIG
188188
}
189189
Json::Value st_JsonXVer = st_JsonRoot["XVer"];
190190

191-
pSt_ServerConfig->st_XVer.pStl_ListStorage = new list<tstring>;
191+
pSt_ServerConfig->st_XVer.pStl_ListStorage = new list<string>;
192192
for (unsigned int i = 0; i < st_JsonXVer["StorageVersion"].size(); i++)
193193
{
194194
pSt_ServerConfig->st_XVer.pStl_ListStorage->push_back(st_JsonXVer["StorageVersion"][i].asCString());
@@ -261,17 +261,17 @@ BOOL CConfig_Json::Config_Json_LoadBalance(LPCTSTR lpszConfigFile, XENGINE_LBCON
261261
{
262262
pSt_ServerConfig->st_LoadBalance.pStl_ListUseMode->push_back(st_JsonLoadBalance["nUseMode"][i].asInt());
263263
}
264-
pSt_ServerConfig->st_LoadBalance.pStl_ListCenter = new list<tstring>;
264+
pSt_ServerConfig->st_LoadBalance.pStl_ListCenter = new list<string>;
265265
for (unsigned int i = 0; i < st_JsonLoadBalance["CenterAddr"].size(); i++)
266266
{
267267
pSt_ServerConfig->st_LoadBalance.pStl_ListCenter->push_back(st_JsonLoadBalance["CenterAddr"][i].asCString());
268268
}
269-
pSt_ServerConfig->st_LoadBalance.pStl_ListDownload = new list<tstring>;
269+
pSt_ServerConfig->st_LoadBalance.pStl_ListDownload = new list<string>;
270270
for (unsigned int i = 0; i < st_JsonLoadBalance["DownloadAddr"].size(); i++)
271271
{
272272
pSt_ServerConfig->st_LoadBalance.pStl_ListDownload->push_back(st_JsonLoadBalance["DownloadAddr"][i].asCString());
273273
}
274-
pSt_ServerConfig->st_LoadBalance.pStl_ListUPLoader = new list<tstring>;
274+
pSt_ServerConfig->st_LoadBalance.pStl_ListUPLoader = new list<string>;
275275
for (unsigned int i = 0; i < st_JsonLoadBalance["UPLoaderAddr"].size(); i++)
276276
{
277277
pSt_ServerConfig->st_LoadBalance.pStl_ListUPLoader->push_back(st_JsonLoadBalance["UPLoaderAddr"][i].asCString());

‎XEngine_Source/StorageModule_Config/pch.h‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,6 @@
3030
using namespace std;
3131
#include <XEngine_Include/XEngine_CommHdr.h>
3232
#include <XEngine_Include/XEngine_Types.h>
33-
34-
#ifdef _UNICODE
35-
typedef std::wstring tstring;
36-
#else
37-
typedef std::string tstring;
38-
#endif
39-
4033
#include "Config_Define.h"
4134
#include "Config_Error.h"
4235
/********************************************************************

‎XEngine_Source/StorageModule_Session/Session_Stroage/Session_DLStroage.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ BOOL CSession_DLStroage::Session_DLStroage_Insert(LPCTSTR lpszClientAddr, LPCTST
108108
}
109109
//禁止一个客户端启动多个下载会话
110110
st_Locker.lock_shared();
111-
unordered_map<tstring, SESSION_STORAGEINFO>::iterator stl_MapIterator = stl_MapStroage.find(lpszClientAddr);
111+
unordered_map<string, SESSION_STORAGEINFO>::iterator stl_MapIterator = stl_MapStroage.find(lpszClientAddr);
112112
if (stl_MapIterator != stl_MapStroage.end())
113113
{
114114
Session_IsErrorOccur = TRUE;
@@ -207,7 +207,7 @@ BOOL CSession_DLStroage::Session_DLStroage_GetBuffer(LPCTSTR lpszClientAddr, TCH
207207
}
208208

209209
st_Locker.lock_shared();
210-
unordered_map<tstring, SESSION_STORAGEINFO>::iterator stl_MapIterator = stl_MapStroage.find(lpszClientAddr);
210+
unordered_map<string, SESSION_STORAGEINFO>::iterator stl_MapIterator = stl_MapStroage.find(lpszClientAddr);
211211
if (stl_MapIterator == stl_MapStroage.end())
212212
{
213213
Session_IsErrorOccur = TRUE;
@@ -261,7 +261,7 @@ BOOL CSession_DLStroage::Session_DLStroage_GetInfo(LPCTSTR lpszClientAddr, SESSI
261261
}
262262

263263
st_Locker.lock_shared();
264-
unordered_map<tstring, SESSION_STORAGEINFO>::iterator stl_MapIterator = stl_MapStroage.find(lpszClientAddr);
264+
unordered_map<string, SESSION_STORAGEINFO>::iterator stl_MapIterator = stl_MapStroage.find(lpszClientAddr);
265265
if (stl_MapIterator == stl_MapStroage.end())
266266
{
267267
Session_IsErrorOccur = TRUE;
@@ -329,7 +329,7 @@ BOOL CSession_DLStroage::Session_DLStorage_SetSeek(LPCTSTR lpszClientAddr, int n
329329
Session_IsErrorOccur = FALSE;
330330

331331
st_Locker.lock_shared();
332-
unordered_map<tstring, SESSION_STORAGEINFO>::iterator stl_MapIterator = stl_MapStroage.find(lpszClientAddr);
332+
unordered_map<string, SESSION_STORAGEINFO>::iterator stl_MapIterator = stl_MapStroage.find(lpszClientAddr);
333333
if (stl_MapIterator == stl_MapStroage.end())
334334
{
335335
Session_IsErrorOccur = TRUE;
@@ -388,7 +388,7 @@ BOOL CSession_DLStroage::Session_DLStorage_GetAll(SESSION_STORAGEINFO*** pppSt_S
388388
*pInt_ListCount = stl_MapStroage.size();
389389
BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_StorageInfo, *pInt_ListCount, sizeof(SESSION_STORAGEINFO));
390390

391-
unordered_map<tstring, SESSION_STORAGEINFO>::iterator stl_MapIterator = stl_MapStroage.begin();
391+
unordered_map<string, SESSION_STORAGEINFO>::iterator stl_MapIterator = stl_MapStroage.begin();
392392
for (int i = 0; stl_MapIterator != stl_MapStroage.end(); stl_MapIterator++, i++)
393393
{
394394
*(*pppSt_StorageInfo)[i] = stl_MapIterator->second;
@@ -421,7 +421,7 @@ BOOL CSession_DLStroage::Session_DLStroage_Delete(LPCTSTR lpszClientAddr)
421421
Session_IsErrorOccur = FALSE;
422422

423423
st_Locker.lock_shared();
424-
unordered_map<tstring, SESSION_STORAGEINFO>::iterator stl_MapIterator = stl_MapStroage.find(lpszClientAddr);
424+
unordered_map<string, SESSION_STORAGEINFO>::iterator stl_MapIterator = stl_MapStroage.find(lpszClientAddr);
425425
if (stl_MapIterator != stl_MapStroage.end())
426426
{
427427
fclose(stl_MapIterator->second.pSt_File);

‎XEngine_Source/StorageModule_Session/Session_Stroage/Session_DLStroage.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ class CSession_DLStroage
3030
int m_nTryTime;
3131
shared_mutex st_Locker;
3232
private:
33-
unordered_map<tstring, SESSION_STORAGEINFO> stl_MapStroage;
33+
unordered_map<string, SESSION_STORAGEINFO> stl_MapStroage;
3434
};

0 commit comments

Comments
 (0)