diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2006-08-04 11:58:27 +0300 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2006-08-07 08:15:39 +0000 |
| commit | 10edeb5d2457364a70a6848a864cfa6b89dfc882 (patch) | |
| tree | 901034210efd6983fe16b782168144371eb95631 /gv.c | |
| parent | 435fbc73c32c7bd8a6a0cdb8a1ea0ca077918585 (diff) | |
| download | perl-10edeb5d2457364a70a6848a864cfa6b89dfc882.tar.gz | |
g++ large patch
Message-ID: <44D2E203.5050201@iki.fi>
p4raw-id: //depot/perl@28662
Diffstat (limited to 'gv.c')
| -rw-r--r-- | gv.c | 25 |
1 files changed, 15 insertions, 10 deletions
@@ -81,12 +81,13 @@ Perl_gv_IOadd(pTHX_ register GV *gv) * this is a dirhandle. */ const char * const fh = - PL_op->op_type == OP_READDIR || - PL_op->op_type == OP_TELLDIR || - PL_op->op_type == OP_SEEKDIR || - PL_op->op_type == OP_REWINDDIR || - PL_op->op_type == OP_CLOSEDIR ? - "dirhandle" : "filehandle"; + (const char *) + (PL_op->op_type == OP_READDIR || + PL_op->op_type == OP_TELLDIR || + PL_op->op_type == OP_SEEKDIR || + PL_op->op_type == OP_REWINDDIR || + PL_op->op_type == OP_CLOSEDIR ? + "dirhandle" : "filehandle"); Perl_croak(aTHX_ "Bad symbol for %s", fh); } @@ -161,7 +162,8 @@ GP * Perl_newGP(pTHX_ GV *const gv) { GP *gp; - const char *const file = CopFILE(PL_curcop) ? CopFILE(PL_curcop) : ""; + const char *const file = + CopFILE(PL_curcop) ? CopFILE(PL_curcop) : (const char *)""; STRLEN len = strlen(file); U32 hash; @@ -313,6 +315,7 @@ Perl_gv_fetchmeth(pTHX_ HV *stash, const char *name, STRLEN len, I32 level) GV** gvp; CV* cv; const char *hvname; + HV* lastchance = NULL; /* UNIVERSAL methods should be callable without a stash */ if (!stash) { @@ -400,7 +403,7 @@ Perl_gv_fetchmeth(pTHX_ HV *stash, const char *name, STRLEN len, I32 level) /* if at top level, try UNIVERSAL */ if (level == 0 || level == -1) { - HV* const lastchance = gv_stashpvs("UNIVERSAL", FALSE); + lastchance = gv_stashpvs("UNIVERSAL", FALSE); if (lastchance) { if ((gv = gv_fetchmeth(lastchance, name, len, @@ -1274,7 +1277,7 @@ Perl_gv_fullname4(pTHX_ SV *sv, const GV *gv, const char *prefix, bool keepmain) SvOK_off(sv); return; } - sv_setpv(sv, prefix ? prefix : ""); + sv_setpv(sv, prefix ? prefix : (const char *)""); name = HvNAME_get(hv); if (name) { @@ -1559,7 +1562,9 @@ Perl_Gv_AMupdate(pTHX_ HV *stash) FALSE))) { /* Can be an import stub (created by "can"). */ - const char * const name = (gvsv && SvPOK(gvsv)) ? SvPVX_const(gvsv) : "???"; + const char * const name = + (const char *) + ((gvsv && SvPOK(gvsv)) ? SvPVX_const(gvsv) : "???"); Perl_croak(aTHX_ "%s method \"%.256s\" overloading \"%s\" "\ "in package \"%.256s\"", (GvCVGEN(gv) ? "Stub found while resolving" |