Browse Source

#IQRV #comment [Chromium] 编译通过

gifur 2 years ago
parent
commit
4dbdbbe71f

+ 4 - 3
Module/mod_chromium/CWSCodec.cpp

@@ -538,7 +538,7 @@ namespace Chromium {
 		}
 		DbgEx("BufferToJson -> messageType=%d(%s), sessionID=%d(%02X), transID=%d(%02X), replaceTransID=%d(%02X), errorCode=%d(%s)", msg.getMessageType(), 
 			GetMessageTypeString(msg.getMessageType()).c_str(),	msg.getSessionID(), msg.getSessionID(), srcTransId, srcTransId, replaceTransId
-			, replaceTransId, errorCode, SpStrError((ErrorCodeEnum)errorCode).c_str());
+			, replaceTransId, errorCode, SpStrError((ErrorCodeEnum)errorCode));
 
 		if (Error_Succeed != errorCode)
 			dealErrcodeFun(errorCode, srcTransId);
@@ -575,7 +575,7 @@ namespace Chromium {
 				});
 			std::map<int, entity_def_struct>::iterator it = m_AckCallbackList.find(msg.getTransID());
 
-			if (m_AckCallbackList->end() == it)
+			if (m_AckCallbackList.end() == it)
 			{
 				// 没有对应的request,无法反序列化
 				cJSON_AddNumberToObject(ret, "errorCode", Error_Unexpect);
@@ -587,7 +587,8 @@ namespace Chromium {
 				return s;
 			}
 			DeserializeRequestAck(msg, it, rpos, ret);
-			m_AckCallbackList->erase(it);
+			
+			m_AckCallbackList.erase(it);
 		}
 		else if (Event == msg.getMessageType())
 		{

+ 1 - 0
Module/mod_chromium/CWSCodec.h

@@ -10,6 +10,7 @@
 #include "baseEx.h"
 #include <tuple>
 #include <string>
+#include <map>
 #include <boost/thread/mutex.hpp>
 
 

+ 1 - 3
Module/mod_chromium/baseEx.h

@@ -5,9 +5,7 @@
 
 extern void* logProducer;
 extern bool g_useMagic;
-#if defined(RVC_OS_WIN)
-extern bool g_useMagic;
-#endif //RVC_OS_WIN
+extern bool g_logToFile;
 
 
 void DbgEx(const char* str, ...);