Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix compiling errors

This commit is contained in:
minggo 2014-01-02 21:53:18 +08:00
parent 674b38beef
commit d345139a08
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/network/HttpRequest.h
View File

@ -34,7 +34,7 @@ namespace network {
class HttpClient; class HttpClient;
class HttpResponse; class HttpResponse;
typedef void (cocos2d::Object::*SEL_HttpResponse)(HttpClient* client, HttpResponse* response); typedef void (cocos2d::Object::*SEL_HttpResponse)(HttpClient* client, HttpResponse* response);
#define httpresponse_selector(_SELECTOR) (network::SEL_HttpResponse)(&_SELECTOR) #define httpresponse_selector(_SELECTOR) (cocos2d::network::SEL_HttpResponse)(&_SELECTOR)
/** /**
@brief defines the object which users must packed for HttpClient::send(HttpRequest*) method. @brief defines the object which users must packed for HttpClient::send(HttpRequest*) method.

2
cocos/scripting/javascript/bindings/network/XMLHTTPRequest.h
View File

@ -102,7 +102,7 @@ private:
ResponseType _responseType; ResponseType _responseType;
unsigned _timeout; unsigned _timeout;
bool _isAsync; bool _isAsync;
network::HttpRequest* _httpRequest; cocos2d::network::HttpRequest* _httpRequest;
bool _isNetwork; bool _isNetwork;
bool _withCredentialsValue; bool _withCredentialsValue;
std::unordered_map<std::string, std::string> _httpHeader; std::unordered_map<std::string, std::string> _httpHeader;

2
cocos/scripting/javascript/bindings/network/jsb_websocket.cpp
View File

@ -30,7 +30,7 @@ THE SOFTWARE.
#include "ScriptingCore.h" #include "ScriptingCore.h"
#include "cocos2d_specifics.hpp" #include "cocos2d_specifics.hpp"
using namespace network; using namespace cocos2d::network;
/* /*
[Constructor(in DOMString url, in optional DOMString protocols)] [Constructor(in DOMString url, in optional DOMString protocols)]

2
tools/tojs/cocos2dx.ini
View File

@ -101,7 +101,7 @@ skip = Node::[^setPosition$ setGrid setGLServerState description getUserObject .
Bezier.*::[create actionWithDuration], Bezier.*::[create actionWithDuration],
CardinalSpline.*::[create actionWithDuration setPoints], CardinalSpline.*::[create actionWithDuration setPoints],
Scheduler::[pause resume unschedule schedule update isTargetPaused], Scheduler::[pause resume unschedule schedule update isTargetPaused],
TextureCache::[addPVRTCImage], TextureCache::[addPVRTCImage addImageAsync],
Timer::[getSelector createWithScriptHandler], Timer::[getSelector createWithScriptHandler],
*::[copyWith.* onEnter.* onExit.* ^description$ getObjectType onTouch.* onAcc.* onKey.* onRegisterTouchListener], *::[copyWith.* onEnter.* onExit.* ^description$ getObjectType onTouch.* onAcc.* onKey.* onRegisterTouchListener],
FileUtils::[(g|s)etSearchResolutionsOrder$ (g|s)etSearchPaths$ getFileData getDataFromFile], FileUtils::[(g|s)etSearchResolutionsOrder$ (g|s)etSearchPaths$ getFileData getDataFromFile],

2
tools/tolua/cocos2dx.ini
View File

@ -99,7 +99,7 @@ skip = Node::[setGLServerState description getUserObject .*UserData getGLServerS
Bezier.*::[create actionWithDuration], Bezier.*::[create actionWithDuration],
CardinalSpline.*::[create actionWithDuration setPoints], CardinalSpline.*::[create actionWithDuration setPoints],
Scheduler::[pause resume unschedule schedule update isTargetPaused], Scheduler::[pause resume unschedule schedule update isTargetPaused],
TextureCache::[addPVRTCImage], TextureCache::[addPVRTCImage addImageAsync],
Timer::[getSelector createWithScriptHandler], Timer::[getSelector createWithScriptHandler],
*::[copyWith.* onEnter.* onExit.* ^description$ getObjectType (g|s)etDelegate onTouch.* onAcc.* onKey.* onRegisterTouchListener], *::[copyWith.* onEnter.* onExit.* ^description$ getObjectType (g|s)etDelegate onTouch.* onAcc.* onKey.* onRegisterTouchListener],
FileUtils::[(g|s)etSearchResolutionsOrder$ (g|s)etSearchPaths$ getFileData getDataFromFile], FileUtils::[(g|s)etSearchResolutionsOrder$ (g|s)etSearchPaths$ getFileData getDataFromFile],