In perl.git, the branch blead has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/30f5963ce0621352ef371c745bf5a965e143d835?hp=07efaa72c99996dca4a124f9c6084e8ee9fcc6d8>
- Log -----------------------------------------------------------------
commit 30f5963ce0621352ef371c745bf5a965e143d835
Author: Craig A. Berry <craigbe...@mac.com>
Date: Fri Sep 26 21:09:12 2014 -0500
Make DB_File compile under clang++.
Follow-up to 7f15aad6d6ce55cb. Also noted upstream at
https://rt.cpan.org/Ticket/Display.html?id=96126
the necessity of, when rolling one's own dNOOP, to do everything
the core dNOOP does.
M cpan/DB_File/DB_File.xs
M t/porting/customized.dat
commit b7ddc5bada637a1961bd44a02428c42f98955212
Author: Craig A. Berry <craigbe...@mac.com>
Date: Fri Sep 26 17:31:58 2014 -0500
A little help for clang++ in toke.c
This was failing to compile with Apple LLVM version 6.0 like so:
toke.c:6558:13: error: no member named 'Perl_rv2cv_op_cv' in 'gv';
did you mean simply 'Perl_rv2cv_op_cv'?
: (CV *)gv
^~
M toke.c
-----------------------------------------------------------------------
Summary of changes:
cpan/DB_File/DB_File.xs | 6 +++++-
t/porting/customized.dat | 2 +-
toke.c | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/cpan/DB_File/DB_File.xs b/cpan/DB_File/DB_File.xs
index c42a2af..d9317c0 100644
--- a/cpan/DB_File/DB_File.xs
+++ b/cpan/DB_File/DB_File.xs
@@ -164,7 +164,11 @@
# ifndef DB_VERSION_MAJOR
# undef dNOOP
-# define dNOOP extern int DB_File___notused
+# ifdef __cplusplus
+# define dNOOP (void)0
+# else
+# define dNOOP extern int DB_File___notused
+# endif
/* Ditto for dXSARGS. */
# undef dXSARGS
diff --git a/t/porting/customized.dat b/t/porting/customized.dat
index 5eeae87..9ff8207 100644
--- a/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@ -1,4 +1,4 @@
-DB_File cpan/DB_File/DB_File.xs 140cd1d47c6830d1cb51b2207fd7c7d5ce8fb924
+DB_File cpan/DB_File/DB_File.xs f364b661bbb0df075b0c425b104577e7176fe82b
Digest::MD5 cpan/Digest-MD5/t/files.t bdbe05b705d9da305fedce7a9f4b6ba63250c7cf
Digest::SHA cpan/Digest-SHA/hints/hpux.pl
8cf51e816894ee03826eac737bd6843300d6e64c
ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
f738b4b8d6dfdb2bae5f3e43106370867aa88f01
diff --git a/toke.c b/toke.c
index 8585b7a..aeaeb46 100644
--- a/toke.c
+++ b/toke.c
@@ -6555,7 +6555,7 @@ Perl_yylex(pTHX)
? GvCV(gv)
: SvROK(gv) && SvTYPE(SvRV(gv)) == SVt_PVCV
? (CV *)SvRV(gv)
- : (CV *)gv
+ : ((CV *)gv)
: rv2cv_op_cv(rv2cv_op, RV2CVOPCV_RETURN_STUB);
}
--
Perl5 Master Repository
