diff options
| author | Nick Ing-Simmons <nik@tiuk.ti.com> | 2001-05-15 08:39:14 +0000 |
|---|---|---|
| committer | Nick Ing-Simmons <nik@tiuk.ti.com> | 2001-05-15 08:39:14 +0000 |
| commit | 16ad5aca1f5177638c984f3315f96c0cd2f10334 (patch) | |
| tree | 9df74b62e1f5396d43f119b6065dca88c3bd7ff7 /hv.c | |
| parent | 2e117952781c322d29321f4d0b7193f45488d1cb (diff) | |
| parent | ec5f161023cc5696391a8f74e39775a6aaaa1bbb (diff) | |
| download | perl-16ad5aca1f5177638c984f3315f96c0cd2f10334.tar.gz | |
Integrate mainline.
p4raw-id: //depot/perlio@10111
Diffstat (limited to 'hv.c')
| -rw-r--r-- | hv.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -163,7 +163,7 @@ Perl_hv_fetch(pTHX_ HV *hv, const char *key, I32 klen, I32 lval) } if (SvRMAGICAL(hv)) { - if (mg_find((SV*)hv,'P')) { + if (mg_find((SV*)hv,'P') || SvGMAGICAL((SV*)hv)) { sv = sv_newmortal(); mg_copy((SV*)hv, sv, key, klen); PL_hv_fetch_sv = sv; @@ -283,7 +283,7 @@ Perl_hv_fetch_ent(pTHX_ HV *hv, SV *keysv, I32 lval, register U32 hash) return 0; if (SvRMAGICAL(hv)) { - if (mg_find((SV*)hv,'P')) { + if (mg_find((SV*)hv,'P') || SvGMAGICAL((SV*)hv)) { sv = sv_newmortal(); keysv = sv_2mortal(newSVsv(keysv)); mg_copy((SV*)hv, sv, (char*)keysv, HEf_SVKEY); @@ -836,7 +836,7 @@ Perl_hv_exists(pTHX_ HV *hv, const char *key, I32 klen) } if (SvRMAGICAL(hv)) { - if (mg_find((SV*)hv,'P')) { + if (mg_find((SV*)hv,'P') || SvGMAGICAL((SV*)hv)) { sv = sv_newmortal(); mg_copy((SV*)hv, sv, key, klen); magic_existspack(sv, mg_find(sv, 'p')); @@ -926,7 +926,7 @@ Perl_hv_exists_ent(pTHX_ HV *hv, SV *keysv, U32 hash) return 0; if (SvRMAGICAL(hv)) { - if (mg_find((SV*)hv,'P')) { + if (mg_find((SV*)hv,'P') || SvGMAGICAL((SV*)hv)) { SV* svret = sv_newmortal(); sv = sv_newmortal(); keysv = sv_2mortal(newSVsv(keysv)); |