#define __PACKAGE__ "Variable::Magic"
+#undef VOID2
+#ifdef __cplusplus
+# define VOID2(T, P) static_cast<T>(P)
+#else
+# define VOID2(T, P) (P)
+#endif
+
#ifndef VMG_PERL_PATCHLEVEL
# ifdef PERL_PATCHNUM
# define VMG_PERL_PATCHLEVEL PERL_PATCHNUM
#if VMG_THREADSAFE
#define PTABLE_NAME ptable
-#define PTABLE_VAL_FREE(V) vmg_mgwiz_free(V)
+#define PTABLE_VAL_FREE(V) vmg_mgwiz_free(VOID2(MGWIZ *, (V)))
#define pPTBL pTHX
#define pPTBL_ pTHX_
#if VMG_THREADSAFE
STATIC void vmg_ptable_clone(pTHX_ ptable_ent *ent, void *ud_) {
- my_cxt_t *ud = ud_;
+ my_cxt_t *ud = VOID2(my_cxt_t *, ud_);
MGWIZ *w;
if (ud->owner == aTHX)
return;
- w = vmg_mgwiz_clone(ent->val);
+ w = vmg_mgwiz_clone(VOID2(MGWIZ *, ent->val));
if (w)
ptable_store(ud->wizards, ent->key, w);
}
{
dMY_CXT;
- return ptable_fetch(MY_CXT.wizards, w);
+ return VOID2(const MGWIZ *, ptable_fetch(MY_CXT.wizards, w));
}
}
STATIC UV vmg_cast(pTHX_ SV *sv, const SV *wiz, SV **args, I32 items) {
#define vmg_cast(S, W, A, I) vmg_cast(aTHX_ (S), (W), (A), (I))
- MAGIC *mg, *moremagic = NULL;
+ MAGIC *mg;
SV *data;
const MGWIZ *w;
U32 oldgmg;
#if VMG_UVAR
if (w->uvar) {
- MAGIC *prevmagic;
+ MAGIC *prevmagic, *moremagic = NULL;
struct ufuncs uf[2];
uf[0].uf_val = vmg_svt_val;
for (prevmagic = NULL, mg = SvMAGIC(sv); mg; prevmagic = mg, mg = moremagic) {
moremagic = mg->mg_moremagic;
if (mg->mg_type == PERL_MAGIC_ext && mg->mg_private == SIG_WIZ) {
+#if VMG_UVAR
const MGWIZ *z = vmg_wizard_mgwiz(mg->mg_ptr);
+#endif /* VMG_UVAR */
IV zid = vmg_wizard_id(mg->mg_ptr);
if (zid == wid) {
#if VMG_UVAR
case VMG_OP_INFO_OBJECT: {
dMY_CXT;
if (!MY_CXT.b__op_stashes[0]) {
- opclass c;
+ int c;
require_pv("B.pm");
for (c = OPc_NULL; c < OPc_MAX; ++c)
MY_CXT.b__op_stashes[c] = gv_stashpv(vmg_opclassnames[c], 1);
if (t < SVt_PVAV) {
STRLEN l;
#if VMG_HAS_PERL(5, 9, 3)
- const U8 *s = SvPV_const(sv, l);
+ const U8 *s = VOID2(const U8 *, VOID2(const void *, SvPV_const(sv, l)));
#else
U8 *s = SvPV(sv, l);
#endif
PREINIT:
ptable *t;
U32 had_b__op_stash = 0;
- opclass c;
+ int c;
PPCODE:
{
my_cxt_t ud;