Changeset 461

Timestamp:

Apr 19, 2004, 3:41:09 PM (22 years ago)

Author:

desonia

Message:

modified the poisoning of the std. memory functions to use the "GCC poison" pragma if possible.

Location:

trunk/psLib/src

Files:

• sys/psMemory.h (modified) (2 diffs)
• sysUtils/psMemory.h (modified) (2 diffs)

trunk/psLib/src/sys/psMemory.h

@@ -14 +14 @@
  *  @author Robert Lupton, Princeton University
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-04-19 20:19:22 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-04-20 01:41:09 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -159 +159 @@
  */
 #ifndef PS_ALLOW_MALLOC
-#define malloc(S)       #pragma error Use of malloc is not allowed.  Use psAlloc instead.
-#define realloc(P,S)    #pragma error Use of realloc is not allowed.  Use psRealloc instead.
-#define calloc(S)       #pragma error Use of calloc is not allowed.  Use psAlloc instead.
-#define free(P)         #pragma error Use of free is not allowed.  Use psFree instead.
+#ifdef __GNUC__
+#pragma GCC poison malloc realloc calloc free
+#else
+#define malloc(S)       _Pragma("error Use of malloc is not allowed.  Use psAlloc instead.")
+#define realloc(P,S)    _Pragma("error Use of realloc is not allowed.  Use psRealloc instead.")
+#define calloc(S)       _Pragma("error Use of calloc is not allowed.  Use psAlloc instead.")
+#define free(P)         _Pragma("error Use of free is not allowed.  Use psFree instead.")
+#endif
 #endif
 

trunk/psLib/src/sysUtils/psMemory.h

@@ -14 +14 @@
  *  @author Robert Lupton, Princeton University
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-04-19 20:19:22 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-04-20 01:41:09 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -159 +159 @@
  */
 #ifndef PS_ALLOW_MALLOC
-#define malloc(S)       #pragma error Use of malloc is not allowed.  Use psAlloc instead.
-#define realloc(P,S)    #pragma error Use of realloc is not allowed.  Use psRealloc instead.
-#define calloc(S)       #pragma error Use of calloc is not allowed.  Use psAlloc instead.
-#define free(P)         #pragma error Use of free is not allowed.  Use psFree instead.
+#ifdef __GNUC__
+#pragma GCC poison malloc realloc calloc free
+#else
+#define malloc(S)       _Pragma("error Use of malloc is not allowed.  Use psAlloc instead.")
+#define realloc(P,S)    _Pragma("error Use of realloc is not allowed.  Use psRealloc instead.")
+#define calloc(S)       _Pragma("error Use of calloc is not allowed.  Use psAlloc instead.")
+#define free(P)         _Pragma("error Use of free is not allowed.  Use psFree instead.")
+#endif
 #endif