This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
PL_amagic_generation is always non-zero, so remove the test for this.
authorNicholas Clark <nick@ccl4.org>
Wed, 28 Dec 2005 13:35:03 +0000 (13:35 +0000)
committerNicholas Clark <nick@ccl4.org>
Wed, 28 Dec 2005 13:35:03 +0000 (13:35 +0000)
(Since change 17990 added version object overloading)

p4raw-id: //depot/perl@26516

pp.h

diff --git a/pp.h b/pp.h
index 1dfd665..7992259 100644 (file)
--- a/pp.h
+++ b/pp.h
@@ -398,7 +398,6 @@ and C<PUSHu>.
 #define AMGf_unary     8
 
 #define tryAMAGICbinW_var(meth_enum,assign,set) STMT_START { \
-       if (PL_amagic_generation) { \
            SV* const left = *(sp-1); \
            SV* const right = *(sp); \
            if ((SvAMAGIC(left)||SvAMAGIC(right))) {\
@@ -410,7 +409,6 @@ and C<PUSHu>.
                    SPAGAIN; \
                    (void)POPs; set(tmpsv); RETURN; } \
                } \
-           } \
        } STMT_END
 
 #define tryAMAGICbinW(meth,assign,set) \
@@ -428,7 +426,6 @@ and C<PUSHu>.
             amagic_call(left,right,CAT2(meth,_amg),AMGf_noright)
 
 #define tryAMAGICunW(meth,set,shift,ret) STMT_START { \
-          if (PL_amagic_generation) { \
            SV* tmpsv; \
            SV* arg= sp[shift]; \
           if(0) goto am_again;  /* shut up unused warning */ \
@@ -437,7 +434,6 @@ and C<PUSHu>.
                (tmpsv=AMG_CALLun(arg,meth))) {\
               SPAGAIN; if (shift) sp += shift; \
               set(tmpsv); ret; } \
-         } \
        } STMT_END
 
 #define FORCE_SETs(sv) STMT_START { sv_setsv(TARG, (sv)); SETTARG; } STMT_END