Changeset 14982 for trunk/psLib/src/sys/psAssert.h

Timestamp:

Sep 21, 2007, 5:01:08 PM (19 years ago)

Author:

Paul Price

Message:

Memory assertion should be in the memory code, so that I can include psAssert.h without getting psMemory.h, which poisons malloc.

File:

• trunk/psLib/src/sys/psAssert.h (modified) (2 diffs)

trunk/psLib/src/sys/psAssert.h

@@ -9 +9 @@
 #include <math.h>
 
-#include "psMemory.h"
 #include "psError.h"
 #include "psLogMsg.h"
@@ -18 +17 @@
     psError(PS_ERR_PROGRAMMING, false, "Error: %s is not true.", #VAR); \
     return(RVAL); \
-}
-
-// Ensure this is a psLib pointer
-#define PS_ASSERT_PTR(PTR, RVAL) \
-{ \
-    if (PTR && (!psMemIsAlloced(PTR))) { \
-        psError(PS_ERR_MEMORY_CORRUPTION, false, \
-            "Error: Pointer %p is corrupted or not on the PS memory system.", \
-            PTR); \
-        return RVAL; \
-    } \
 }