From b1e40a98b0c15615b2472747001e38878a7aadfe Mon Sep 17 00:00:00 2001 From: yinjimmy Date: Wed, 3 Jun 2015 22:58:25 +0800 Subject: [PATCH] fix simulator compile error --- .../Classes/ide-support/RuntimeJsImpl.cpp | 5 +- .../Classes/ide-support/RuntimeLuaImpl.cpp | 5 +- .../lib/runtime/ConsoleCommand.cpp | 76 +++++++++++-------- .../libsimulator/lib/runtime/FileServer.cpp | 2 +- 4 files changed, 53 insertions(+), 35 deletions(-) diff --git a/tools/simulator/frameworks/runtime-src/Classes/ide-support/RuntimeJsImpl.cpp b/tools/simulator/frameworks/runtime-src/Classes/ide-support/RuntimeJsImpl.cpp index 5e79dbdf3a..5d9d636d29 100644 --- a/tools/simulator/frameworks/runtime-src/Classes/ide-support/RuntimeJsImpl.cpp +++ b/tools/simulator/frameworks/runtime-src/Classes/ide-support/RuntimeJsImpl.cpp @@ -239,11 +239,14 @@ void RuntimeJsImpl::onPrecompile(const rapidjson::Document& dArgParse, rapidjson void RuntimeJsImpl::onReload(const rapidjson::Document &dArgParse, rapidjson::Document &dReplyParse) { if (dArgParse.HasMember("modulefiles")){ + auto& allocator = dReplyParse.GetAllocator(); rapidjson::Value bodyvalue(rapidjson::kObjectType); const rapidjson::Value& objectfiles = dArgParse["modulefiles"]; for (rapidjson::SizeType i = 0; i < objectfiles.Size(); i++){ if (!reloadScript(objectfiles[i].GetString())) { - bodyvalue.AddMember(objectfiles[i].GetString(),1,dReplyParse.GetAllocator()); + bodyvalue.AddMember(rapidjson::Value(objectfiles[i].GetString(), allocator) + , rapidjson::Value(1) + , allocator); } } if (0 == objectfiles.Size()) diff --git a/tools/simulator/frameworks/runtime-src/Classes/ide-support/RuntimeLuaImpl.cpp b/tools/simulator/frameworks/runtime-src/Classes/ide-support/RuntimeLuaImpl.cpp index 5a91d00b2f..0a43b2265e 100644 --- a/tools/simulator/frameworks/runtime-src/Classes/ide-support/RuntimeLuaImpl.cpp +++ b/tools/simulator/frameworks/runtime-src/Classes/ide-support/RuntimeLuaImpl.cpp @@ -268,13 +268,16 @@ void RuntimeLuaImpl::onReload(const rapidjson::Document &dArgParse, rapidjson::D // lua if (dArgParse.HasMember("modulefiles")) { + auto& allocator = dReplyParse.GetAllocator(); rapidjson::Value bodyvalue(rapidjson::kObjectType); const rapidjson::Value& objectfiles = dArgParse["modulefiles"]; for (rapidjson::SizeType i = 0; i < objectfiles.Size(); i++) { if (!reloadScript(objectfiles[i].GetString())) { - bodyvalue.AddMember(objectfiles[i].GetString(), 1, dReplyParse.GetAllocator()); + bodyvalue.AddMember(rapidjson::Value(objectfiles[i].GetString(), allocator) + , rapidjson::Value(1) + , allocator); } } if (0 == objectfiles.Size()) diff --git a/tools/simulator/libsimulator/lib/runtime/ConsoleCommand.cpp b/tools/simulator/libsimulator/lib/runtime/ConsoleCommand.cpp index 66e83905b0..7ee8a1fde8 100644 --- a/tools/simulator/libsimulator/lib/runtime/ConsoleCommand.cpp +++ b/tools/simulator/libsimulator/lib/runtime/ConsoleCommand.cpp @@ -83,10 +83,12 @@ void ConsoleCommand::onSendCommand(int fd, const std::string &args) rapidjson::Document dReplyParse; dReplyParse.SetObject(); - dReplyParse.AddMember("cmd",strcmd.c_str(),dReplyParse.GetAllocator()); + rapidjson::Document::AllocatorType& allocator = dReplyParse.GetAllocator(); + dReplyParse.AddMember("cmd", rapidjson::Value(strcmd.c_str(), allocator) + , allocator); if (dArgParse.HasMember("seq")) { - dReplyParse.AddMember("seq",dArgParse["seq"],dReplyParse.GetAllocator()); + dReplyParse.AddMember("seq",dArgParse["seq"],allocator); } if(strcmp(strcmd.c_str(), "start-logic") == 0) @@ -128,36 +130,40 @@ void ConsoleCommand::onSendCommand(int fd, const std::string &args) } else if(strcmp(strcmd.c_str(), "getversion") == 0) { rapidjson::Value bodyvalue(rapidjson::kObjectType); - bodyvalue.AddMember("version", getRuntimeVersion(), dReplyParse.GetAllocator()); - dReplyParse.AddMember("body", bodyvalue, dReplyParse.GetAllocator()); - dReplyParse.AddMember("code", 0, dReplyParse.GetAllocator()); + bodyvalue.AddMember("version", rapidjson::Value(getRuntimeVersion(), allocator) + , allocator); + dReplyParse.AddMember("body", bodyvalue, allocator); + dReplyParse.AddMember("code", 0, allocator); } else if(strcmp(strcmd.c_str(), "getfileinfo") == 0) { rapidjson::Value bodyvalue(rapidjson::kObjectType); rapidjson::Document* filecfgjson = _fileserver->getFileCfgJson(); - for (auto it = filecfgjson->MemberonBegin(); it != filecfgjson->MemberonEnd(); ++it) + for (rapidjson::Value::MemberIterator itr = filecfgjson->MemberBegin() + ; itr != filecfgjson->MemberEnd() + ; ++itr) { - bodyvalue.AddMember(it->name.GetString(), it->value.GetString(), dReplyParse.GetAllocator()); + bodyvalue.AddMember(itr->name, itr->value, allocator); } - dReplyParse.AddMember("body", bodyvalue, dReplyParse.GetAllocator()); - dReplyParse.AddMember("code", 0, dReplyParse.GetAllocator()); + + dReplyParse.AddMember("body", bodyvalue, allocator); + dReplyParse.AddMember("code", 0, allocator); } else if (strcmp(strcmd.c_str(), "getEntryfile") == 0) { rapidjson::Value bodyvalue(rapidjson::kObjectType); rapidjson::Value entryFileValue(rapidjson::kStringType); - entryFileValue.SetString(ConfigParser::getInstance()->getEntryFile().c_str(), dReplyParse.GetAllocator()); - bodyvalue.AddMember("entryfile", entryFileValue, dReplyParse.GetAllocator()); - dReplyParse.AddMember("body", bodyvalue,dReplyParse.GetAllocator()); - dReplyParse.AddMember("code", 0, dReplyParse.GetAllocator()); + entryFileValue.SetString(ConfigParser::getInstance()->getEntryFile().c_str(), allocator); + bodyvalue.AddMember("entryfile", entryFileValue, allocator); + dReplyParse.AddMember("body", bodyvalue,allocator); + dReplyParse.AddMember("code", 0, allocator); } else if(strcmp(strcmd.c_str(), "getIP") == 0) { rapidjson::Value bodyvalue(rapidjson::kObjectType); rapidjson::Value IPValue(rapidjson::kStringType); - IPValue.SetString(getIPAddress().c_str(), dReplyParse.GetAllocator()); - bodyvalue.AddMember("IP", IPValue,dReplyParse.GetAllocator()); - dReplyParse.AddMember("body", bodyvalue,dReplyParse.GetAllocator()); - dReplyParse.AddMember("code", 0, dReplyParse.GetAllocator()); + IPValue.SetString(getIPAddress().c_str(), allocator); + bodyvalue.AddMember("IP", IPValue,allocator); + dReplyParse.AddMember("body", bodyvalue,allocator); + dReplyParse.AddMember("code", 0, allocator); } else if(strcmp(strcmd.c_str(), "remove") == 0) { @@ -181,12 +187,16 @@ void ConsoleCommand::onSendCommand(int fd, const std::string &args) if(remove(filepath.c_str()) != 0) { // remove failed - bodyvalue.AddMember(filename, 2, dReplyParse.GetAllocator()); + bodyvalue.AddMember(rapidjson::Value(filename, allocator) + , rapidjson::Value(2) + , allocator); } } else { // file not exist - bodyvalue.AddMember(filename, 1, dReplyParse.GetAllocator()); + bodyvalue.AddMember(rapidjson::Value(filename, allocator) + , rapidjson::Value(1) + , allocator); } // file remove success, remove it from record @@ -194,10 +204,10 @@ void ConsoleCommand::onSendCommand(int fd, const std::string &args) _fileserver->removeResFileInfo(filename); } - dReplyParse.AddMember("body", bodyvalue, dReplyParse.GetAllocator()); + dReplyParse.AddMember("body", bodyvalue, allocator); } - dReplyParse.AddMember("code",0,dReplyParse.GetAllocator()); + dReplyParse.AddMember("code",0,allocator); } else if(strcmp(strcmd.c_str(), "shutdownapp") == 0) { #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) @@ -220,10 +230,10 @@ void ConsoleCommand::onSendCommand(int fd, const std::string &args) #endif rapidjson::Value bodyvalue(rapidjson::kObjectType); rapidjson::Value platformValue(rapidjson::kStringType); - platformValue.SetString(platform.c_str(), dReplyParse.GetAllocator()); - bodyvalue.AddMember("platform", platformValue, dReplyParse.GetAllocator()); - dReplyParse.AddMember("body", bodyvalue, dReplyParse.GetAllocator()); - dReplyParse.AddMember("code", 0, dReplyParse.GetAllocator()); + platformValue.SetString(platform.c_str(), allocator); + bodyvalue.AddMember("platform", platformValue, allocator); + dReplyParse.AddMember("body", bodyvalue, allocator); + dReplyParse.AddMember("code", 0, allocator); } else if(strcmp(strcmd.c_str(), "usewritablepath") == 0) { #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) @@ -235,7 +245,7 @@ void ConsoleCommand::onSendCommand(int fd, const std::string &args) FileUtils::getInstance()->setSearchPaths(searchPathArray); #endif - dReplyParse.AddMember("code", 0, dReplyParse.GetAllocator()); + dReplyParse.AddMember("code", 0, allocator); } else if (strcmp(strcmd.c_str(), "workdir") == 0) { @@ -245,10 +255,11 @@ void ConsoleCommand::onSendCommand(int fd, const std::string &args) FileUtils::getInstance()->setDefaultResourceRootPath(objectPath.GetString()); rapidjson::Value bodyvalue(rapidjson::kObjectType); - bodyvalue.AddMember("path", objectPath.GetString(), dReplyParse.GetAllocator()); - dReplyParse.AddMember("body", bodyvalue, dReplyParse.GetAllocator()); + bodyvalue.AddMember("path", rapidjson::Value(objectPath.GetString(), allocator) + , allocator); + dReplyParse.AddMember("body", bodyvalue, allocator); } - dReplyParse.AddMember("code", 0, dReplyParse.GetAllocator()); + dReplyParse.AddMember("code", 0, allocator); } else if (strcmp(strcmd.c_str(), "writablePath") == 0) { @@ -258,10 +269,11 @@ void ConsoleCommand::onSendCommand(int fd, const std::string &args) FileUtils::getInstance()->setWritablePath(objectPath.GetString()); rapidjson::Value bodyvalue(rapidjson::kObjectType); - bodyvalue.AddMember("path", objectPath.GetString(), dReplyParse.GetAllocator()); - dReplyParse.AddMember("body", bodyvalue, dReplyParse.GetAllocator()); + bodyvalue.AddMember("path", rapidjson::Value(objectPath.GetString(), allocator) + , allocator); + dReplyParse.AddMember("body", bodyvalue, allocator); } - dReplyParse.AddMember("code", 0, dReplyParse.GetAllocator()); + dReplyParse.AddMember("code", 0, allocator); } rapidjson::StringBuffer buffer; diff --git a/tools/simulator/libsimulator/lib/runtime/FileServer.cpp b/tools/simulator/libsimulator/lib/runtime/FileServer.cpp index 4b189877d5..c54ba43b13 100644 --- a/tools/simulator/libsimulator/lib/runtime/FileServer.cpp +++ b/tools/simulator/libsimulator/lib/runtime/FileServer.cpp @@ -95,7 +95,7 @@ void FileServer::addResFileInfo(const char* filename, uint64_t u64) filetimeValue.SetString(filetime, _filecfgjson.GetAllocator()); rapidjson::Value filenameValue(rapidjson::kStringType); filenameValue.SetString(filename,_filecfgjson.GetAllocator()); - _filecfgjson.AddMember(filenameValue.GetString(), filetimeValue, _filecfgjson.GetAllocator()); + _filecfgjson.AddMember(filenameValue, filetimeValue, _filecfgjson.GetAllocator()); } void FileServer::removeResFileInfo(const char *filename)