Skip to content

Commit e790b28

Browse files
committed
fixed:complie error
1 parent 44a28e9 commit e790b28

File tree

9 files changed

+202
-162
lines changed

9 files changed

+202
-162
lines changed

XEngine_Source/StorageModule_APIHelp/pch.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ 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+
3542
#include "../XEngine_StorageComponents/XStorage_SQLPacket/SQLPacket_Define.h"
3643
#include "APIHelp_Define.h"
3744
#include "APIHelp_Error.h"

XEngine_Source/StorageModule_Config/pch.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@
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+
3340
#include "Config_Define.h"
3441
#include "Config_Error.h"
3542
/********************************************************************

XEngine_Source/StorageModule_Session/pch.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,10 @@ using namespace std;
4444
// History:
4545
*********************************************************************/
4646
extern BOOL Session_IsErrorOccur;
47-
extern DWORD Session_dwErrorCode;
47+
extern DWORD Session_dwErrorCode;
48+
49+
#ifdef _UNICODE
50+
typedef std::wstring tstring;
51+
#else
52+
typedef std::string tstring;
53+
#endif

XEngine_Source/XEngine_P2XPComponents/XEngine_P2XPPeer/pch.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ using namespace std;
4747
extern BOOL PeerManage_IsErrorOccur;
4848
extern DWORD PeerManage_dwErrorCode;
4949

50+
#ifdef _UNICODE
51+
typedef std::wstring tstring;
52+
#else
53+
typedef std::string tstring;
54+
#endif
5055

5156
#ifdef _WINDOWS
5257
#ifdef _WIN64

XEngine_Source/XEngine_P2XPComponents/XEngine_P2XPProtocol/pch.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,10 @@ using namespace std;
5151
// History:
5252
*********************************************************************/
5353
extern BOOL P2XPProtocol_IsErrorOccur;
54-
extern DWORD P2XPProtocol_dwErrorCode;
54+
extern DWORD P2XPProtocol_dwErrorCode;
55+
56+
#ifdef _UNICODE
57+
typedef std::wstring tstring;
58+
#else
59+
typedef std::string tstring;
60+
#endif

XEngine_Source/XEngine_StorageApp/StorageApp_Download.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ BOOL XEngine_Task_HttpDownload(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
134134
{
135135
st_HDRParam.bAuth = TRUE;
136136
}
137-
//使用重定向?
137+
//使用重定向,这是分布式重定向实现
138138
if (APIHelp_Distributed_IsMode(st_LoadbalanceCfg.st_LoadBalance.pStl_ListUseMode, STORAGE_NETTYPE_HTTPDOWNLOAD))
139139
{
140140
TCHAR tszHdrBuffer[1024];

XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <errno.h>
88
#include <thread>
99
#include <list>
10+
#include <string>
1011
#include <sys/types.h>
1112
#include <sys/stat.h>
1213
#ifdef _WINDOWS
@@ -42,6 +43,13 @@ using namespace std;
4243
#include <XEngine_Include/XEngine_RfcComponents/HttpServer_Error.h>
4344
#include <XEngine_Include/XEngine_NetHelp/APIHelp_Define.h>
4445
#include <XEngine_Include/XEngine_NetHelp/APIHelp_Error.h>
46+
47+
#ifdef _UNICODE
48+
typedef std::wstring tstring;
49+
#else
50+
typedef std::string tstring;
51+
#endif
52+
4553
#include "../XStorage_Protocol.h"
4654
#include "../XEngine_StorageComponents/XStorage_SQLPacket/SQLPacket_Define.h"
4755
#include "../XEngine_StorageComponents/XStorage_SQLPacket/SQLPacket_Error.h"

XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ int main(int argc, char** argv)
128128
{
129129
return -1;
130130
}
131+
131132
if (st_ServiceCfg.st_Memory.bReload)
132133
{
133134
//重载配置文件后退出

0 commit comments

Comments
 (0)