From 23dc657f0af27bdac887f8d18208d544cc9f010e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Ankarstr=C3=B6m?= Date: Tue, 2 Aug 2022 23:50:58 +0200 Subject: Improve wstring_owner, rename to wchar_ptr. The user-defined conversion function makes the interface a lot simpler AND safer. --- c/pl.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'c/pl.h') diff --git a/c/pl.h b/c/pl.h index 1c526a0..28e13b0 100644 --- a/c/pl.h +++ b/c/pl.h @@ -7,7 +7,7 @@ #include "common.h" -wstring_owner PlString(const term_t t, const int flags = CVT_WRITE); +wchar_ptr PlString(const term_t t, const int flags = CVT_WRITE); struct Frame { @@ -54,7 +54,7 @@ inline int PlPut(term_t, long*) { return -1; } inline int PlPut(term_t, long long*) { return -1; } inline int PlPut(term_t, atom_t*) { return -1; } inline int PlPut(term_t, char**) { return -1; } -inline int PlPut(term_t, wstring_owner*) { return -1; } +inline int PlPut(term_t, wchar_ptr*) { return -1; } inline int PlGet(term_t, int) { return -1; } inline int PlGet(term_t, long) { return -1; } @@ -67,11 +67,11 @@ inline int PlGet(term_t t, long* x) { return PL_get_long(t, x); } inline int PlGet(term_t t, long long* x) { return PL_get_int64(t, x); } inline int PlGet(term_t t, atom_t* x) { return PL_get_atom(t, x); } inline int PlGet(term_t t, char** x) { return PL_get_atom_chars(t, x); } -inline int PlGet(term_t t, wstring_owner* x) { +inline int PlGet(term_t t, wchar_ptr* x) { Mark m; char* s; if (!PlGet(t, &s)) return 0; - *x = wstring_owner::from_narrow(s); + *x = wchar_ptr::from_narrow(s); return 1; /* or catch potential exception from BstrFromSz? */ } -- cgit v1.2.3