From c2bbc06340709fddde8bc5be62c5ecf227d9d34a Mon Sep 17 00:00:00 2001
From: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed, 6 May 2015 08:46:48 -0700
Subject: [PATCH] compiles on win32

---
 cocos/base/allocator/CCAllocatorGlobalNewDelete.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cocos/base/allocator/CCAllocatorGlobalNewDelete.cpp b/cocos/base/allocator/CCAllocatorGlobalNewDelete.cpp
index b53d6bb864..0a5104cd52 100644
--- a/cocos/base/allocator/CCAllocatorGlobalNewDelete.cpp
+++ b/cocos/base/allocator/CCAllocatorGlobalNewDelete.cpp
@@ -28,7 +28,7 @@
 #include <new>
 #include <exception>
 
-#include "base/ccMacros.h"
+#include <assert.h>
 
 USING_NS_CC_ALLOCATOR;
 
@@ -45,7 +45,7 @@ namespace
 void* operator new[] (std::size_t size)
 {
     void* ptr = global.allocate(size);
-    CCASSERT(ptr, "No memory");
+    assert(ptr && "No memory");
 
     // dissabling exceptions since cocos2d-x doesn't use them
 //#if CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID
@@ -59,7 +59,7 @@ void* operator new[] (std::size_t size)
 void* operator new(std::size_t size)
 {
     void* ptr = global.allocate(size);
-    CCASSERT(ptr, "No memory");
+    assert(ptr && "No memory");
 
     // dissabling exceptions since cocos2d-x doesn't use them
 //#if CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID