Changeset 3147

Timestamp:

Feb 7, 2005, 2:17:37 PM (21 years ago)

Author:

desonia

Message:

* empty log message *

Location:

trunk/psLib/src

Files:

• sys/psMemory.h (modified) (6 diffs)
• sysUtils/psMemory.h (modified) (6 diffs)
• sysUtils/sysUtils.i (modified) (1 diff)

trunk/psLib/src/sys/psMemory.h

@@ -12 +12 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-07 23:26:24 $
+ *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-08 00:17:37 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -127 +127 @@
  *  @see psFree 
  */
-#if defined(DOXYGEN) || defined(SWIG)
+#ifdef DOXYGEN
 psPtr psAlloc(size_t size       ///< Size required
              );
-#endif
-
-#ifndef DOXYGEN
+#else
 psPtr p_psAlloc(size_t size,    ///< Size required
                 const char *file,       ///< File of call
@@ -204 +202 @@
  *  @see psAlloc, psFree
  */
-#if defined(DOXYGEN) || defined(SWIG)
+#ifdef DOXYGEN
 psPtr psRealloc(
     psPtr ptr,                          ///< Pointer to re-allocate
     size_t size                         ///< Size required
 );
-#endif
-
-#ifndef DOXYGEN
+#else
 psPtr p_psRealloc(
     psPtr ptr,                         ///< Pointer to re-allocate
@@ -230 +226 @@
  *  @see psAlloc, psRealloc
  */
-#if defined(DOXYGEN) || defined(SWIG)
+#ifdef DOXYGEN
 void psFree(
     psPtr ptr                          ///< Pointer to free, if NULL, function returns immediately.
 );
-#endif
-
-#ifndef DOXYGEN
+#else
 void p_psFree(
     psPtr ptr,                         ///< Pointer to free
@@ -292 +286 @@
  *  @ingroup memRefCount
  */
-#if defined(DOXYGEN) || defined(SWIG)
+#ifdef DOXYGEN
 psPtr psMemIncrRefCounter(
     psPtr vptr                         ///< Pointer to increment refCounter, and return
 );
-#endif
-
-#ifndef DOXYGEN
+#else
 psPtr p_psMemIncrRefCounter(
     psPtr vptr,                        ///< Pointer to increment refCounter, and return
@@ -318 +310 @@
  *                   fully dereferenced.
  */
-#if defined(DOXYGEN) || defined(SWIG)
+#ifdef DOXYGEN
 psPtr psMemDecrRefCounter(
     psPtr vptr                         ///< Pointer to decrement refCounter, and return
 );
-#endif
-
-#ifndef DOXYGEN
+#else
 psPtr p_psMemDecrRefCounter(
     psPtr vptr,                        ///< Pointer to decrement refCounter, and return

trunk/psLib/src/sysUtils/psMemory.h

@@ -12 +12 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-07 23:26:24 $
+ *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-08 00:17:37 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -127 +127 @@
  *  @see psFree 
  */
-#if defined(DOXYGEN) || defined(SWIG)
+#ifdef DOXYGEN
 psPtr psAlloc(size_t size       ///< Size required
              );
-#endif
-
-#ifndef DOXYGEN
+#else
 psPtr p_psAlloc(size_t size,    ///< Size required
                 const char *file,       ///< File of call
@@ -204 +202 @@
  *  @see psAlloc, psFree
  */
-#if defined(DOXYGEN) || defined(SWIG)
+#ifdef DOXYGEN
 psPtr psRealloc(
     psPtr ptr,                          ///< Pointer to re-allocate
     size_t size                         ///< Size required
 );
-#endif
-
-#ifndef DOXYGEN
+#else
 psPtr p_psRealloc(
     psPtr ptr,                         ///< Pointer to re-allocate
@@ -230 +226 @@
  *  @see psAlloc, psRealloc
  */
-#if defined(DOXYGEN) || defined(SWIG)
+#ifdef DOXYGEN
 void psFree(
     psPtr ptr                          ///< Pointer to free, if NULL, function returns immediately.
 );
-#endif
-
-#ifndef DOXYGEN
+#else
 void p_psFree(
     psPtr ptr,                         ///< Pointer to free
@@ -292 +286 @@
  *  @ingroup memRefCount
  */
-#if defined(DOXYGEN) || defined(SWIG)
+#ifdef DOXYGEN
 psPtr psMemIncrRefCounter(
     psPtr vptr                         ///< Pointer to increment refCounter, and return
 );
-#endif
-
-#ifndef DOXYGEN
+#else
 psPtr p_psMemIncrRefCounter(
     psPtr vptr,                        ///< Pointer to increment refCounter, and return
@@ -318 +310 @@
  *                   fully dereferenced.
  */
-#if defined(DOXYGEN) || defined(SWIG)
+#ifdef DOXYGEN
 psPtr psMemDecrRefCounter(
     psPtr vptr                         ///< Pointer to decrement refCounter, and return
 );
-#endif
-
-#ifndef DOXYGEN
+#else
 psPtr p_psMemDecrRefCounter(
     psPtr vptr,                        ///< Pointer to decrement refCounter, and return

trunk/psLib/src/sysUtils/sysUtils.i

@@ -13 +13 @@
 
 psErrorCode psError(psErrorCode code, psBool new, const char* msg) {
-    return p_psError("UNKNOWN",0,"SWIG",code,new,"%s",msg);
+    return p_psError("UNKNOWN",0,"SWIG",code,new,msg);
 }