diff options
| author | Karl Williamson <khw@cpan.org> | 2016-11-17 06:21:54 -0700 |
|---|---|---|
| committer | Karl Williamson <khw@cpan.org> | 2016-11-18 09:41:07 -0700 |
| commit | 147e38468b8279e26a0ca11e4efd8492016f2702 (patch) | |
| tree | 4d3c3b5b692937fc40e2fed20aaa1b7afd3ba56e /universal.c | |
| parent | 51d89e3583b4182c42c21b343376f2286f67fc3b (diff) | |
| download | perl-147e38468b8279e26a0ca11e4efd8492016f2702.tar.gz | |
Change white space to avoid C++ deprecation warning
C++11 requires space between the end of a string literal and a macro, so
that a feature can unambiguously be added to the language. Starting in
g++ 6.2, the compiler emits a warning when there isn't a space
(presumably so that future versions can support C++11). Unfortunately
there are many such instances in the perl core. This commit fixes
those, including those in ext/, but individual commits will be used for
the other modules, those in dist/ and cpan/.
This commit also inserts space at the end of a macro before a string
literal, even though that is not deprecated, and removes useless ""
literals following a macro (instead of inserting a blank). The result
is easier to read, making the macro stand out, and be clearer as to the
intention.
Code and modules included with the Perl core need to be compilable using
C++. This is so that perl can be embedded in C++ programs. (Actually,
only the hdr files need to be so compilable, but it would be hard to
test that just the hdrs are compilable.) So we need to accommodate
changes to the C++ language.
Diffstat (limited to 'universal.c')
| -rw-r--r-- | universal.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/universal.c b/universal.c index a9d751438d..06f595f5a7 100644 --- a/universal.c +++ b/universal.c @@ -301,7 +301,7 @@ A specialised variant of C<croak()> for emitting the usage message for xsubs works out the package name and subroutine name from C<cv>, and then calls C<croak()>. Hence if C<cv> is C<&ouch::awk>, it would call C<croak> as: - Perl_croak(aTHX_ "Usage: %"SVf"::%"SVf"(%s)", "ouch" "awk", + Perl_croak(aTHX_ "Usage: %" SVf "::%" SVf "(%s)", "ouch" "awk", "eee_yow"); =cut @@ -320,13 +320,13 @@ Perl_croak_xs_usage(const CV *const cv, const char *const params) if (HvNAME_get(stash)) /* diag_listed_as: SKIPME */ - Perl_croak_nocontext("Usage: %"HEKf"::%"HEKf"(%s)", + Perl_croak_nocontext("Usage: %" HEKf "::%" HEKf "(%s)", HEKfARG(HvNAME_HEK(stash)), HEKfARG(GvNAME_HEK(gv)), params); else /* diag_listed_as: SKIPME */ - Perl_croak_nocontext("Usage: %"HEKf"(%s)", + Perl_croak_nocontext("Usage: %" HEKf "(%s)", HEKfARG(GvNAME_HEK(gv)), params); } else { dTHX; @@ -334,7 +334,7 @@ Perl_croak_xs_usage(const CV *const cv, const char *const params) /* Pants. I don't think that it should be possible to get here. */ /* diag_listed_as: SKIPME */ - Perl_croak(aTHX_ "Usage: CODE(0x%"UVxf")(%s)", PTR2UV(cv), params); + Perl_croak(aTHX_ "Usage: CODE(0x%" UVxf ")(%s)", PTR2UV(cv), params); } } @@ -744,7 +744,7 @@ XS(XS_PerlIO_get_layers) } else { if (namok && argok) - PUSHs(sv_2mortal(Perl_newSVpvf(aTHX_ "%"SVf"(%"SVf")", + PUSHs(sv_2mortal(Perl_newSVpvf(aTHX_ "%" SVf "(%" SVf ")", SVfARG(*namsvp), SVfARG(*argsvp)))); else if (namok) |