[Swig-cvs] SF.net SVN: swig:[11897] trunk/Source/DOH/base.c

[<wsf...@us...>]

Revision: 11897
          http://swig.svn.sourceforge.net/swig/?rev=11897&view=rev
Author:   wsfulton
Date:     2010-03-04 21:45:26 +0000 (Thu, 04 Mar 2010)

Log Message:
-----------
DohDelete and DohCopy assertions called if not a DOH object

Modified Paths:
--------------
    trunk/Source/DOH/base.c

Modified: trunk/Source/DOH/base.c
===================================================================
--- trunk/Source/DOH/base.c	2010-03-04 21:27:23 UTC (rev 11896)
+++ trunk/Source/DOH/base.c	2010-03-04 21:45:26 UTC (rev 11897)
@@ -30,12 +30,15 @@
 
   if (!obj)
     return;
+  if (!DohCheck(b)) {
 #if SWIG_DEBUG_DELETE
-  if (!DohCheck(b)) {
     fputs("DOH: Fatal error. Attempt to delete a non-doh object.\n", stderr);
     abort();
+#else
+    assert(0);
+#endif
+    return;
   }
-#endif
   if (b->flag_intern)
     return;
   assert(b->refcount > 0);
@@ -62,6 +65,15 @@
 
   if (!obj)
     return 0;
+  if (!DohCheck(b)) {
+#if SWIG_DEBUG_DELETE
+    fputs("DOH: Fatal error. Attempt to copy a non-doh object.\n", stderr);
+    abort();
+#else
+    assert(0);
+#endif
+    return 0;
+  }
   objinfo = b->type;
   if (objinfo->doh_copy) {
     DohBase *bc = (DohBase *) (objinfo->doh_copy) (b);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.