From a7916fbac400497b6ac35da8a689a3c2cb68141d Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Fri, 18 May 2018 06:08:48 -0700
Subject: C++ fixes related to recent Unicode work.

* lib.c (chk_wrealloc): convert needs to be a coerce.

* parser.l (grammar): Use yyg instead of yyscanner;
the latter is the same pointer but of void * type.
---
 lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib.c')

diff --git a/lib.c b/lib.c
index f40831c2..42facb48 100644
--- a/lib.c
+++ b/lib.c
@@ -2796,7 +2796,7 @@ wchar_t *chk_wrealloc(wchar_t *old, size_t nwchar)
   size_t size = nwchar * sizeof (wchar_t);
   if (size < nwchar)
     uw_throw(error_s, lit("string size overflow"));
-  return coerce(wchar_t *, chk_realloc(convert(mem_t *, old),
+  return coerce(wchar_t *, chk_realloc(coerce(mem_t *, old),
                                        sizeof (wchar_t) * nwchar));
 }
 
-- 
cgit v1.2.3