This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
inline.h: prevent cast warning on MSVC
authorTony Cook <tony@develop-help.com>
Thu, 13 Apr 2023 00:22:56 +0000 (10:22 +1000)
committerTony Cook <tony@develop-help.com>
Tue, 4 Jul 2023 00:31:07 +0000 (10:31 +1000)
MSVC complains about truncation (it isn't truncation) when casting
the pointer to bool.

inline.h

index 69fd8b0..85737f5 100644 (file)
--- a/inline.h
+++ b/inline.h
@@ -2834,7 +2834,7 @@ Perl_cx_popsub_common(pTHX_ PERL_CONTEXT *cx)
     assert(CxTYPE(cx) == CXt_SUB);
 
     PL_comppad = cx->blk_sub.prevcomppad;
-    PL_curpad = LIKELY(PL_comppad) ? AvARRAY(PL_comppad) : NULL;
+    PL_curpad = LIKELY(PL_comppad != NULL) ? AvARRAY(PL_comppad) : NULL;
     cv = cx->blk_sub.cv;
     CvDEPTH(cv) = cx->blk_sub.olddepth;
     cx->blk_sub.cv = NULL;
@@ -2916,7 +2916,7 @@ Perl_cx_popformat(pTHX_ PERL_CONTEXT *cx)
     SvREFCNT_dec_NN(dfout);
 
     PL_comppad = cx->blk_format.prevcomppad;
-    PL_curpad = LIKELY(PL_comppad) ? AvARRAY(PL_comppad) : NULL;
+    PL_curpad = LIKELY(PL_comppad != NULL) ? AvARRAY(PL_comppad) : NULL;
     cv = cx->blk_format.cv;
     cx->blk_format.cv = NULL;
     --CvDEPTH(cv);