From 288f4c294ac1be89b151a3f96eb9d5cb9d91055f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Ankarstr=C3=B6m?= Date: Sun, 31 Jul 2022 20:03:54 +0200 Subject: Make WsoFromSz and WsoCopy static member functions of wstring_owner. --- c/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'c/main.cpp') diff --git a/c/main.cpp b/c/main.cpp index f896ef3..ebce3a6 100644 --- a/c/main.cpp +++ b/c/main.cpp @@ -56,9 +56,9 @@ void OnTerminate() noexcept try { why = PlString(t); } catch (...) {} } catch (const Win32Error& e) { what = L"a Windows error"; - try { why = WsoCopy(e.WhatW()); } catch (...) {} + try { why = wstring_owner::copy(e.WhatW()); } catch (...) {} } catch (const std::exception& e) { - try { why = WsoFromSz(e.what()); } catch (...) {} + try { why = wstring_owner::from_narrow(e.what()); } catch (...) {} } catch (...) {} wchar_t msg[256] = {0}; @@ -502,7 +502,7 @@ void WaitFor(const char* mod, const char* pred) Plx(mod,"thread_create",pred,&aThread); SendMessage(g_hWndStatus, SB_SETTEXT, MAKEWPARAM(1,0), (LPARAM)L"."); if (prefer(iTimer = SetTimer(NULL, -1, 500, proc))) { - activePred = WsoFromSz(pred); + activePred = wstring_owner::from_narrow(pred); bActive = 1; } } -- cgit v1.2.3