--- Set-Object-1.28/Object.xs	2010-07-14 06:42:11.000000000 +0200
+++ /home/parmus/Projects/Set-Object-1.28/Object.xs	2011-08-04 02:01:56.357000046 +0200
@@ -358,23 +358,8 @@
 	 i--;
        }
        if (!c) {
-	 /* we should clear the magic, really. */
-	 MAGIC* last = 0;
-	 for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) {
-	   if (mg->mg_type == SET_OBJECT_MAGIC_backref) {
-	     if (last) {
-	       last->mg_moremagic = mg->mg_moremagic;
-	       Safefree(mg);
-	       break;
-	     } else if (mg->mg_moremagic) {
-	       SvMAGIC(sv) = mg->mg_moremagic;
-	     } else {
-	       SvMAGIC(sv) = 0;
-	       SvAMAGIC_off(sv);
-	     }
-	   }
-	   last=mg;
-	 }
+	 sv_unmagic(sv, SET_OBJECT_MAGIC_backref);
+	 SvREFCNT_dec(wand);
        }
     }
 }

##</code><code>##

#!/usr/bin/perl -w
use strict;
use warnings;
use Set::Object;
use Memory::Usage;

{
    package Foo;
    use Moose;
    __PACKAGE__->meta->make_immutable;
    1;
}

my $mu = Memory::Usage->new;

$mu->record('Start');

{
    my $set = Set::Object::Weak->new;
    $mu->record('After creating the set');
    for my $outer (1..5){
        for my $inner (1..10000){
            my $obj = Foo->new;
            $set->insert($obj);
            $set->remove($obj);
        }
        $mu->record(join ' ', 'After doing', 10000*$outer, 'inserts and removes');
    }
}
$mu->record('After destroying the set');
print $mu->report;

##</code><code>##

#!/usr/bin/perl -w
use strict;
use warnings;
use Test::More;
use Set::Object;
use Scalar::Util qw(refaddr);

{
    package Foo;
    use Moose;
    __PACKAGE__->meta->make_immutable;
    1;
}

eval 'use Test::Valgrind';
plan skip_all => 'Test::Valgrind is required to test your distribution with valgrind' if $@;

{
    my $set = Set::Object::Weak->new;
    {
        my $obj = Foo->new;
        $set->insert($obj);
        $set->remove($obj);
    }
}

##</code><code>##

#!/usr/bin/perl -w
use strict;
use warnings;
use Config;
use Test::More;
use Test::LeakTrace;
use Set::Object;

{
    package Foo;
    use Moose;
    __PACKAGE__->meta->make_immutable;
    1;
}

{
    no strict;
    note join ' ', map {$Config{$_}} qw(osname archname);
    note 'perl version ', $];
    note $_,'-',${"${_}::VERSION"} for qw{Moose Set::Object Test::LeakTrace};
}

my $set;
{
    $set = Set::Object->new;
    no_leaks_ok {
        {
            my $obj = Foo->new;
            $set->insert($obj);
            $set->remove($obj);
        }
    } 'Testing Set::Object for leaking';
}

{
    $set = Set::Object::Weak->new;
    no_leaks_ok {
        {
            my $obj = Foo->new;
            $set->insert($obj);
            $set->remove($obj);
        }
    } 'Testing Set::Object::Weak for leaking';
}

done_testing;