diff options
| -rw-r--r-- | gv.h | 3 | ||||
| -rw-r--r-- | pp_sys.c | 20 | ||||
| -rw-r--r-- | t/op/tie.t | 23 |
3 files changed, 2 insertions, 44 deletions
@@ -145,9 +145,6 @@ Return the SV from the GV. #define GVf_IMPORTED_HV 0x40 #define GVf_IMPORTED_CV 0x80 -/* Temporary flag for the tie $handle deprecation warnings. */ -#define GVf_TIEWARNED 0x100 - #define GvINTRO(gv) (GvFLAGS(gv) & GVf_INTRO) #define GvINTRO_on(gv) (GvFLAGS(gv) |= GVf_INTRO) #define GvINTRO_off(gv) (GvFLAGS(gv) &= ~GVf_INTRO) @@ -837,10 +837,6 @@ PP(pp_tie) case SVt_PVGV: case SVt_PVLV: if (isGV_with_GP(varsv)) { - if (SvFAKE(varsv) && !(GvFLAGS(varsv) & GVf_TIEWARNED)) { - deprecate("tie on a handle without *"); - GvFLAGS(varsv) |= GVf_TIEWARNED; - } methname = "TIEHANDLE"; how = PERL_MAGIC_tiedscalar; /* For tied filehandles, we apply tiedscalar magic to the IO @@ -917,14 +913,8 @@ PP(pp_untie) const char how = (SvTYPE(sv) == SVt_PVHV || SvTYPE(sv) == SVt_PVAV) ? PERL_MAGIC_tied : PERL_MAGIC_tiedscalar; - if (isGV_with_GP(sv)) { - if (SvFAKE(sv) && !(GvFLAGS(sv) & GVf_TIEWARNED)) { - deprecate("untie on a handle without *"); - GvFLAGS(sv) |= GVf_TIEWARNED; - } - if (!(sv = MUTABLE_SV(GvIOp(sv)))) + if (isGV_with_GP(sv) && !(sv = MUTABLE_SV(GvIOp(sv)))) RETPUSHYES; - } if ((mg = SvTIED_mg(sv, how))) { SV * const obj = SvRV(SvTIED_obj(sv, mg)); @@ -961,14 +951,8 @@ PP(pp_tied) const char how = (SvTYPE(sv) == SVt_PVHV || SvTYPE(sv) == SVt_PVAV) ? PERL_MAGIC_tied : PERL_MAGIC_tiedscalar; - if (isGV_with_GP(sv)) { - if (SvFAKE(sv) && !(GvFLAGS(sv) & GVf_TIEWARNED)) { - deprecate("tied on a handle without *"); - GvFLAGS(sv) |= GVf_TIEWARNED; - } - if (!(sv = MUTABLE_SV(GvIOp(sv)))) + if (isGV_with_GP(sv) && !(sv = MUTABLE_SV(GvIOp(sv)))) RETPUSHUNDEF; - } if ((mg = SvTIED_mg(sv, how))) { SV *osv = SvTIED_obj(sv, mg); diff --git a/t/op/tie.t b/t/op/tie.t index 0b53b140ef..8e17d16d06 100644 --- a/t/op/tie.t +++ b/t/op/tie.t @@ -925,29 +925,6 @@ fileno FOO; tie @a, "FOO" EXPECT Can't locate object method "TIEARRAY" via package "FOO" at - line 5. ######## - -# Deprecation warnings for tie $handle - -use warnings 'deprecated'; -$SIG{__WARN__} = sub { $w = shift }; -$handle = *foo; -eval { tie $handle, "" }; -print $w =~ /^Use of tie on a handle without \* is deprecated/ - ? "ok tie\n" : "$w\n"; -$handle = *bar; -tied $handle; -print $w =~ /^Use of tied on a handle without \* is deprecated/ - ? "ok tied\n" : "$w\n"; -$handle = *baz; -untie $handle; -print $w =~ /^Use of untie on a handle without \* is deprecated/ - ? "ok untie\n" : "$w\n"; - -EXPECT -ok tie -ok tied -ok untie -######## # # STORE freeing tie'd AV sub TIEARRAY { bless [] } |