summaryrefslogtreecommitdiff
path: root/sv.h
diff options
context:
space:
mode:
authorFather Chrysostomos <sprout@cpan.org>2012-07-28 00:33:33 -0700
committerFather Chrysostomos <sprout@cpan.org>2012-07-28 22:20:04 -0700
commit8a68f32879ab48ea5a7fbacc6abdca4a65ec0d23 (patch)
treed24bcd1c222d8d038c51ba0a3356af8650f95532 /sv.h
parent562aee6bf50bd2244cded74c1addaf1f2a395cbd (diff)
downloadperl-8a68f32879ab48ea5a7fbacc6abdca4a65ec0d23.tar.gz
Oust sv_gmagical_2iv_please
The magic flags patch prevents this from ever being called, since the OK flags work the same way for magic variables now as they have for muggle vars, avoid these fiddly games. (It was when writing it that I realised the value of the magic flags proposal.)
Diffstat (limited to 'sv.h')
-rw-r--r--sv.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/sv.h b/sv.h
index 4c58ee4354..06b214cb25 100644
--- a/sv.h
+++ b/sv.h
@@ -1236,12 +1236,7 @@ the scalar's value cannot change unless written to.
#define SvIV_please_nomg(sv) \
(!SvIOKp(sv) && (SvNOK(sv) || SvPOK(sv)) \
? (SvIV_nomg(sv), SvIOK(sv)) \
- : SvGMAGICAL(sv) \
- ? SvIOKp(sv) || ( \
- (SvNOKp(sv) || SvPOKp(sv)) \
- && sv_gmagical_2iv_please(sv) \
- ) \
- : SvIOK(sv))
+ : SvIOK(sv))
#define SvIV_set(sv, val) \
STMT_START { \
assert(PL_valid_types_IV_set[SvTYPE(sv) & SVt_MASK]); \