diff options
| author | Robin Barker <RMBarker@cpan.org> | 2008-01-23 18:51:24 +0000 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2008-03-31 12:32:56 +0000 |
| commit | a7e65131111e91a276548c9d04be96fac8fbd0b7 (patch) | |
| tree | d08a9cc9aeecfe80b5659cf9b38aad4d3b6e08fb /op.c | |
| parent | a380fcf718a3797529b634251411eecec3b14b89 (diff) | |
| download | perl-a7e65131111e91a276548c9d04be96fac8fbd0b7.tar.gz | |
Integrate:
[ 33085]
Subject: FW: [PATCH] RE: [PATCH] volatile, avoid clobbered
From: "Robin Barker" <Robin.Barker@npl.co.uk>
Date: Wed, 23 Jan 2008 18:51:24 -0000
Message-ID: <46A0F33545E63740BC7563DE59CA9C6D093A06@exchsvr2.npl.ad.local>
[ 33106]
Fix Win32 compiler warnings introduced by #33081 and #33085
[just the 33081 part]
[ 33152]
Subject: [PATCH] don't forbid brace groups with g++ 4.2.2
From: "Robin Barker" <Robin.Barker@npl.co.uk>
Date: Wed, 30 Jan 2008 18:42:25 -0000
Message-ID: <46A0F33545E63740BC7563DE59CA9C6D093A17@exchsvr2.npl.ad.local>
[ 33368]
Two break; statements that aren't (yet) needed, but may trip someone up
in the future.
p4raw-link: @33368 on //depot/perl: 553e7bb0c885d7b666ab73f45e41f7e6dab46330
p4raw-link: @33152 on //depot/perl: 70aab261fe2e372e4c553e86fe28c568f5686804
p4raw-link: @33106 on //depot/perl: 8c54174d094a78800e8ccba3f591a61aef9be2bf
p4raw-link: @33085 on //depot/perl: 001d637e39d61293255c8b6c91da77ebdca4e4d6
p4raw-id: //depot/maint-5.10/perl@33611
p4raw-integrated: from //depot/perl@33152 'edit in' perl.h (@33085..)
p4raw-integrated: from //depot/perl@33106 'merge in' embed.fnc
pod/perlapi.pod proto.h (@33103..)
p4raw-integrated: from //depot/perl@33085 'edit in' op.c (@33072..)
'merge in' perl.c (@33026..)
Diffstat (limited to 'op.c')
| -rw-r--r-- | op.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -870,6 +870,7 @@ Perl_scalar(pTHX_ OP *o) case OP_SORT: if (ckWARN(WARN_VOID)) Perl_warner(aTHX_ packWARN(WARN_VOID), "Useless use of sort in scalar context"); + break; } return o; } @@ -2339,7 +2340,7 @@ OP * Perl_fold_constants(pTHX_ register OP *o) { dVAR; - register OP *curop; + register OP * VOL curop; OP *newop; VOL I32 type = o->op_type; SV * VOL sv = NULL; @@ -2384,6 +2385,7 @@ Perl_fold_constants(pTHX_ register OP *o) /* XXX what about the numeric ops? */ if (PL_hints & HINT_LOCALE) goto nope; + break; } if (PL_parser && PL_parser->error_count) |