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

CCPlatformMacros.h 

Added std::nothrow for CREATE_FUNC.
This commit is contained in:
xseekerj 2014-09-27 19:53:44 +08:00
parent 99064b091f
commit 0bfd934d03
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cocos/platform/CCPlatformMacros.h
View File

@ -31,6 +31,7 @@ Copyright (c) 2013-2014 Chukong Technologies
#include "base/ccConfig.h" #include "base/ccConfig.h"
#include "platform/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#include "platform/CCPlatformDefine.h" #include "platform/CCPlatformDefine.h"
#include <new>
/** /**
* define a create function for a specific type, such as Layer * define a create function for a specific type, such as Layer
@ -39,7 +40,7 @@ Copyright (c) 2013-2014 Chukong Technologies
#define CREATE_FUNC(__TYPE__) \ #define CREATE_FUNC(__TYPE__) \
static __TYPE__* create() \ static __TYPE__* create() \
{ \ { \
__TYPE__ *pRet = new __TYPE__(); \ __TYPE__ *pRet = new(std::nothrow) __TYPE__(); \
if (pRet && pRet->init()) \ if (pRet && pRet->init()) \
{ \ { \
pRet->autorelease(); \ pRet->autorelease(); \
@ -61,7 +62,7 @@ static __TYPE__* create() \
#define NODE_FUNC(__TYPE__) \ #define NODE_FUNC(__TYPE__) \
CC_DEPRECATED_ATTRIBUTE static __TYPE__* node() \ CC_DEPRECATED_ATTRIBUTE static __TYPE__* node() \
{ \ { \
__TYPE__ *pRet = new __TYPE__(); \ __TYPE__ *pRet = new(std::nothrow) __TYPE__(); \
if (pRet && pRet->init()) \ if (pRet && pRet->init()) \
{ \ { \
pRet->autorelease(); \ pRet->autorelease(); \