Merge pull request #61 from blackberry-gaming/next-sgrenier

Next sgrenier

gameplay/src/Base.h

@@ -34,6 +34,7 @@ using std::isspace;
 using std::isdigit;
 using std::toupper;
 using std::tolower;
+using std::size_t;
 
 // Common
 #ifndef NULL

gameplay/src/DebugNew.cpp

@@ -18,39 +18,39 @@ struct MemoryAllocationRecord
 MemoryAllocationRecord* __memoryAllocations = 0;
 int __memoryAllocationCount = 0;
 
-void* debugAlloc(size_t size, const char* file, int line);
+void* debugAlloc(std::size_t size, const char* file, int line);
 void debugFree(void* p);
 
 #ifdef _MSC_VER
 #pragma warning( disable : 4290 )
 #endif
 
-void* operator new (size_t size, const char* file, int line)
+void* operator new (std::size_t size, const char* file, int line)
 {
     return debugAlloc(size, file, line);
 }
 
-void* operator new[] (size_t size, const char* file, int line)
+void* operator new[] (std::size_t size, const char* file, int line)
 {
     return operator new (size, file, line);
 }
 
-void* operator new (size_t size) throw(bad_alloc)
+void* operator new (std::size_t size) throw(std::bad_alloc)
 {
     return operator new (size, "", 0);
 }
 
-void* operator new[] (size_t size) throw(bad_alloc)
+void* operator new[] (std::size_t size) throw(std::bad_alloc)
 {
     return operator new (size, "", 0);
 }
 
-void* operator new (size_t size, const nothrow_t&) throw()
+void* operator new (std::size_t size, const std::nothrow_t&) throw()
 {
     return operator new (size, "", 0);
 }
 
-void* operator new[] (size_t size, const nothrow_t&) throw()
+void* operator new[] (std::size_t size, const std::nothrow_t&) throw()
 {
     return operator new (size, "", 0);
 }
@@ -82,7 +82,7 @@ void operator delete[] (void* p, const char* file, int line) throw()
 // Include Base.h (needed for logging macros) AFTER new operator impls
 #include "Base.h"
 
-void* debugAlloc(size_t size, const char* file, int line)
+void* debugAlloc(std::size_t size, const char* file, int line)
 {
     // Allocate memory + size for a MemoryAlloctionRecord
     unsigned char* mem = (unsigned char*)malloc(size + sizeof(MemoryAllocationRecord));

gameplay/src/DebugNew.h

@@ -18,12 +18,12 @@ extern void printMemoryLeaks();
 #ifdef _MSC_VER
 #pragma warning( disable : 4290 ) // C++ exception specification ignored.
 #endif
-void* operator new (size_t size, const char* file, int line);
-void* operator new[] (size_t size, const char* file, int line);
-void* operator new (size_t size) throw(bad_alloc);
-void* operator new[] (size_t size) throw(bad_alloc);
-void* operator new (size_t size, const nothrow_t&) throw();
-void* operator new[] (size_t size, const nothrow_t&) throw();
+void* operator new (std::size_t size, const char* file, int line);
+void* operator new[] (std::size_t size, const char* file, int line);
+void* operator new (std::size_t size) throw(std::bad_alloc);
+void* operator new[] (std::size_t size) throw(std::bad_alloc);
+void* operator new (std::size_t size, const std::nothrow_t&) throw();
+void* operator new[] (std::size_t size, const std::nothrow_t&) throw();
 void operator delete (void* p) throw();
 void operator delete[] (void* p) throw();
 void operator delete (void* p, const char* file, int line) throw();