diff --git a/CocosDenshion/proj.tizen/.cproject b/CocosDenshion/proj.tizen/.cproject index 28498d93b3..3a2ecc73e2 100644 --- a/CocosDenshion/proj.tizen/.cproject +++ b/CocosDenshion/proj.tizen/.cproject @@ -94,6 +94,7 @@ @@ -204,6 +205,7 @@ diff --git a/cocos2dx/platform/tizen/CCPlatformDefine.h b/cocos2dx/platform/tizen/CCPlatformDefine.h index 2d6ca70d16..716c2a7823 100644 --- a/cocos2dx/platform/tizen/CCPlatformDefine.h +++ b/cocos2dx/platform/tizen/CCPlatformDefine.h @@ -28,6 +28,7 @@ THE SOFTWARE. #include #include +#include #define CC_DLL diff --git a/cocos2dx/platform/tizen/CCStdC.h b/cocos2dx/platform/tizen/CCStdC.h index 92c5eafdac..a001a881f1 100644 --- a/cocos2dx/platform/tizen/CCStdC.h +++ b/cocos2dx/platform/tizen/CCStdC.h @@ -43,4 +43,6 @@ THE SOFTWARE. #define nullptr __null +#define override + #endif // __CC_STD_C_H__ diff --git a/extensions/network/SocketIO.h b/extensions/network/SocketIO.h index ea86c990a6..23badd8907 100644 --- a/extensions/network/SocketIO.h +++ b/extensions/network/SocketIO.h @@ -110,7 +110,7 @@ private: void addSocket(const std::string& uri, SIOClientImpl* socket); void removeSocket(const std::string& uri); - friend SIOClientImpl; + friend class SIOClientImpl; }; diff --git a/extensions/proj.tizen/.cproject b/extensions/proj.tizen/.cproject index 88feb5e355..80985f441a 100644 --- a/extensions/proj.tizen/.cproject +++ b/extensions/proj.tizen/.cproject @@ -114,6 +114,7 @@ @@ -249,6 +250,7 @@ diff --git a/samples/Cpp/TestCpp/proj.tizen/.cproject b/samples/Cpp/TestCpp/proj.tizen/.cproject index 25814a2d1c..4914eadd7e 100644 --- a/samples/Cpp/TestCpp/proj.tizen/.cproject +++ b/samples/Cpp/TestCpp/proj.tizen/.cproject @@ -44,6 +44,7 @@