[svn:parrot] r44299 - in trunk: include/parrot src/ops

[whiteknight at svn.parrot.org]

Author: whiteknight
Date: Mon Feb 22 18:58:10 2010
New Revision: 44299
URL: https://trac.parrot.org/parrot/changeset/44299

Log:
[TT #968] remove last remnants of PObj_active_destroy_* which were supposed to be removed as part of this ticket

Modified:
   trunk/include/parrot/pobj.h
   trunk/src/ops/set.ops

Modified: trunk/include/parrot/pobj.h
==============================================================================
--- trunk/include/parrot/pobj.h	Mon Feb 22 18:32:11 2010	(r44298)
+++ trunk/include/parrot/pobj.h	Mon Feb 22 18:58:10 2010	(r44299)
@@ -331,15 +331,6 @@
      | ~PObj_custom_mark_FLAG \
      | ~PObj_live_FLAG)
 
-/*******************************************************
- * DEPRECATED -- use PObj_custom_destroy_FOO() instead *
- *******************************************************/
-#define PObj_active_destroy_FLAG     PObj_custom_destroy_FLAG
-#define PObj_active_destroy_SET(o)   PObj_flag_SET(custom_destroy,   o)
-#define PObj_active_destroy_TEST(o)  PObj_flag_TEST(custom_destroy,  o)
-#define PObj_active_destroy_CLEAR(o) PObj_flag_CLEAR(custom_destroy, o)
-
-
 #endif /* PARROT_POBJ_H_GUARD */
 
 /*

Modified: trunk/src/ops/set.ops
==============================================================================
--- trunk/src/ops/set.ops	Mon Feb 22 18:32:11 2010	(r44298)
+++ trunk/src/ops/set.ops	Mon Feb 22 18:58:10 2010	(r44299)
@@ -510,7 +510,7 @@
         memmove($1, clone, sizeof (PMC));
 
         /* don't let the clone's destruction destroy the destination's data */
-        PObj_active_destroy_CLEAR(clone);
+        PObj_custom_destroy_CLEAR(clone);
         PMC_data(clone)        = NULL;
         PMC_sync(clone)        = NULL;
         PMC_metadata(clone)    = NULL;