From b27bf8fef3df80453b3f4cd35155066a6fbd75bb Mon Sep 17 00:00:00 2001 From: Jare Guo Date: Fri, 27 Apr 2018 11:00:13 +0800 Subject: [PATCH] fix compile error (#1220) --- native/cocos/2d/CCTMXTiledMap.cpp | 2 +- native/cocos/2d/CCTMXTiledMap.h | 2 +- native/cocos/2d/CCTMXXMLParser.h | 2 +- .../scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/native/cocos/2d/CCTMXTiledMap.cpp b/native/cocos/2d/CCTMXTiledMap.cpp index ffbe9d685e..d752224132 100644 --- a/native/cocos/2d/CCTMXTiledMap.cpp +++ b/native/cocos/2d/CCTMXTiledMap.cpp @@ -93,7 +93,7 @@ bool TMXTiledMap::initWithXML(const std::string& tmxString, const std::string& r return true; } -bool TMXTiledMap::initWithXML(const std::string& tmxString, const cocos2d::Map& tsxFileMap, +bool TMXTiledMap::initWithXML(const std::string& tmxString, const std::map& tsxFileMap, const cocos2d::Map& textures) { _tmxFile = tmxString; diff --git a/native/cocos/2d/CCTMXTiledMap.h b/native/cocos/2d/CCTMXTiledMap.h index ae2390eaa0..b8144ba462 100644 --- a/native/cocos/2d/CCTMXTiledMap.h +++ b/native/cocos/2d/CCTMXTiledMap.h @@ -285,7 +285,7 @@ CC_CONSTRUCTOR_ACCESS: bool initWithXML(const std::string& tmxString, const std::string& resourcePath); /** initializes a TMX Tiled Map with a TMX formatted XML string and a tsxFile map and a texture map */ - bool initWithXML(const std::string& tmxString, const cocos2d::Map& tsxFileMap, + bool initWithXML(const std::string& tmxString, const std::map& tsxFileMap, const cocos2d::Map& textures); protected: diff --git a/native/cocos/2d/CCTMXXMLParser.h b/native/cocos/2d/CCTMXXMLParser.h index e2102f2e5e..f5d33167f5 100644 --- a/native/cocos/2d/CCTMXXMLParser.h +++ b/native/cocos/2d/CCTMXXMLParser.h @@ -217,7 +217,7 @@ class CC_DLL TMXMapInfo : public Ref, public SAXDelegator { public: typedef cocos2d::Map TextureMap; - typedef cocos2d::Map TsxFileMap; + typedef std::map TsxFileMap; /** creates a TMX Format with a tmx file */ static TMXMapInfo * create(const std::string& tmxFile); diff --git a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp index 9736cb8365..b89e0d9814 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp @@ -36280,7 +36280,7 @@ static bool js_cocos2dx_TMXMapInfo_initWithXML(se::State& s) std::string arg0; ok &= seval_to_std_string(args[0], &arg0); if (!ok) { ok = true; break; } - const cocos2d::Map, std::basic_string >* arg1 = nullptr; + const std::map, std::basic_string, std::less >, std::allocator, std::basic_string > > >* arg1 = nullptr; ok &= seval_to_native_ptr(args[1], &arg1); if (!ok) { ok = true; break; } bool result = cobj->initWithXML(arg0, arg1); @@ -36295,7 +36295,7 @@ static bool js_cocos2dx_TMXMapInfo_initWithXML(se::State& s) std::string arg0; ok &= seval_to_std_string(args[0], &arg0); if (!ok) { ok = true; break; } - const cocos2d::Map, std::basic_string >* arg1 = nullptr; + const std::map, std::basic_string, std::less >, std::allocator, std::basic_string > > >* arg1 = nullptr; ok &= seval_to_native_ptr(args[1], &arg1); if (!ok) { ok = true; break; } const cocos2d::Map, cocos2d::Texture2D *>* arg2 = nullptr; @@ -36827,7 +36827,7 @@ static bool js_cocos2dx_TMXMapInfo_createWithXML(se::State& s) std::string arg0; ok &= seval_to_std_string(args[0], &arg0); if (!ok) { ok = true; break; } - const cocos2d::Map, std::basic_string >* arg1 = nullptr; + const std::map, std::basic_string, std::less >, std::allocator, std::basic_string > > >* arg1 = nullptr; ok &= seval_to_native_ptr(args[1], &arg1); if (!ok) { ok = true; break; } cocos2d::TMXMapInfo* result = cocos2d::TMXMapInfo::createWithXML(arg0, arg1); @@ -36841,7 +36841,7 @@ static bool js_cocos2dx_TMXMapInfo_createWithXML(se::State& s) std::string arg0; ok &= seval_to_std_string(args[0], &arg0); if (!ok) { ok = true; break; } - const cocos2d::Map, std::basic_string >* arg1 = nullptr; + const std::map, std::basic_string, std::less >, std::allocator, std::basic_string > > >* arg1 = nullptr; ok &= seval_to_native_ptr(args[1], &arg1); if (!ok) { ok = true; break; } const cocos2d::Map, cocos2d::Texture2D *>* arg2 = nullptr; @@ -37736,8 +37736,8 @@ static bool js_cocos2dx_TMXTiledMap_initWithXML(se::State& s) std::string arg0; ok &= seval_to_std_string(args[0], &arg0); if (!ok) { ok = true; break; } - cocos2d::Map, std::basic_string > arg1; - ok &= seval_to_Map_string_key(args[1], &arg1); + std::map arg1; + ok &= seval_to_std_map_string_string(args[1], &arg1); if (!ok) { ok = true; break; } cocos2d::Map, cocos2d::Texture2D *> arg2; ok &= seval_to_Map_string_key(args[2], &arg2);