fix compile error (#1220)

This commit is contained in:
Jare Guo
2018-04-27 11:00:13 +08:00
committed by James Chen
parent 8d52f3d544
commit b27bf8fef3
4 changed files with 9 additions and 9 deletions
+1 -1
View File
@@ -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<std::string, std::string>& tsxFileMap,
bool TMXTiledMap::initWithXML(const std::string& tmxString, const std::map<std::string, std::string>& tsxFileMap,
const cocos2d::Map<std::string, Texture2D*>& textures)
{
_tmxFile = tmxString;
+1 -1
View File
@@ -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<std::string, std::string>& tsxFileMap,
bool initWithXML(const std::string& tmxString, const std::map<std::string, std::string>& tsxFileMap,
const cocos2d::Map<std::string, Texture2D*>& textures);
protected:
+1 -1
View File
@@ -217,7 +217,7 @@ class CC_DLL TMXMapInfo : public Ref, public SAXDelegator
{
public:
typedef cocos2d::Map<std::string, Texture2D*> TextureMap;
typedef cocos2d::Map<std::string, std::string> TsxFileMap;
typedef std::map<std::string, std::string> TsxFileMap;
/** creates a TMX Format with a tmx file */
static TMXMapInfo * create(const std::string& tmxFile);
@@ -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<char>, std::basic_string<char> >* arg1 = nullptr;
const std::map<std::basic_string<char>, std::basic_string<char>, std::less<std::basic_string<char> >, std::allocator<std::pair<const std::basic_string<char>, std::basic_string<char> > > >* 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<char>, std::basic_string<char> >* arg1 = nullptr;
const std::map<std::basic_string<char>, std::basic_string<char>, std::less<std::basic_string<char> >, std::allocator<std::pair<const std::basic_string<char>, std::basic_string<char> > > >* arg1 = nullptr;
ok &= seval_to_native_ptr(args[1], &arg1);
if (!ok) { ok = true; break; }
const cocos2d::Map<std::basic_string<char>, 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<char>, std::basic_string<char> >* arg1 = nullptr;
const std::map<std::basic_string<char>, std::basic_string<char>, std::less<std::basic_string<char> >, std::allocator<std::pair<const std::basic_string<char>, std::basic_string<char> > > >* 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<char>, std::basic_string<char> >* arg1 = nullptr;
const std::map<std::basic_string<char>, std::basic_string<char>, std::less<std::basic_string<char> >, std::allocator<std::pair<const std::basic_string<char>, std::basic_string<char> > > >* arg1 = nullptr;
ok &= seval_to_native_ptr(args[1], &arg1);
if (!ok) { ok = true; break; }
const cocos2d::Map<std::basic_string<char>, 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<char>, std::basic_string<char> > arg1;
ok &= seval_to_Map_string_key(args[1], &arg1);
std::map<std::string, std::string> arg1;
ok &= seval_to_std_map_string_string(args[1], &arg1);
if (!ok) { ok = true; break; }
cocos2d::Map<std::basic_string<char>, cocos2d::Texture2D *> arg2;
ok &= seval_to_Map_string_key(args[2], &arg2);