From 7fe2b87574903e5c699fbe825fc7efecbd9eb773 Mon Sep 17 00:00:00 2001 From: namhyeonuk Date: Sat, 31 Oct 2015 20:18:39 +0900 Subject: [PATCH] CREATE_FUNC macro NULL -> nullptr --- cocos/platform/CCPlatformMacros.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos/platform/CCPlatformMacros.h b/cocos/platform/CCPlatformMacros.h index 9e00d7f4d1..d758e74c13 100644 --- a/cocos/platform/CCPlatformMacros.h +++ b/cocos/platform/CCPlatformMacros.h @@ -50,8 +50,8 @@ static __TYPE__* create() \ else \ { \ delete pRet; \ - pRet = NULL; \ - return NULL; \ + pRet = nullptr; \ + return nullptr; \ } \ }