diff options
Diffstat (limited to 'dep/g3dlite/include/G3D/debug.h')
| -rw-r--r-- | dep/g3dlite/include/G3D/debug.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/dep/g3dlite/include/G3D/debug.h b/dep/g3dlite/include/G3D/debug.h index a7697fe9c01..4f34e5b3b62 100644 --- a/dep/g3dlite/include/G3D/debug.h +++ b/dep/g3dlite/include/G3D/debug.h @@ -1,17 +1,17 @@ /** - @file debug.h + \file debug.h - @maintainer Morgan McGuire, http://graphics.cs.williams.edu + \maintainer Morgan McGuire, http://graphics.cs.williams.edu - @created 2001-08-26 - @edited 2006-02-16 + \created 2001-08-26 + \edited 2008-08-16 - Copyright 2000-2006, Morgan McGuire. + Copyright 2000-2006, Morgan McGuire. All rights reserved. */ -#ifndef G3D_DEBUG_H -#define G3D_DEBUG_H +#ifndef G3D_debug_h +#define G3D_debug_h #include "G3D/platform.h" #ifdef _MSC_VER @@ -38,7 +38,9 @@ namespace G3D { inline bool isValidHeapPointer(const void* x) { #ifdef _MSC_VER return - (x != (void*)0xcccccccc) && (x != (void*)0xdeadbeef) && (x != (void*)0xfeeefeee); + (x != NULL) && + (x != (void*)0xcccccccc) && (x != (void*)0xdeadbeef) && (x != (void*)0xfeeefeee) && + (x != (void*)0xcdcdcdcd) && (x != (void*)0xabababab) && (x != (void*)0xfdfdfdfd); #else return x != NULL; #endif @@ -51,7 +53,9 @@ inline bool isValidHeapPointer(const void* x) { */ inline bool isValidPointer(const void* x) { #ifdef _MSC_VER - return x != ((void*)0xcccccccc) && (x != (void*)0xdeadbeef) && (x != (void*)0xfeeefeee); + return (x != NULL) && + (x != (void*)0xcccccccc) && (x != (void*)0xdeadbeef) && (x != (void*)0xfeeefeee) && + (x != (void*)0xcdcdcdcd) && (x != (void*)0xabababab) && (x != (void*)0xfdfdfdfd); #else return x != NULL; #endif |