From 5c05dc6eb66c1f36b8ed0669a13cd5d8ca86d623 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Wed, 2 Mar 2022 16:33:44 +0100
Subject: [PATCH] WinStd: Update

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 ZRCola/zrcolaapp.h         | 2 +-
 ZRColaCompile/dbsource.cpp | 2 +-
 ZRColaCompile/dbsource.h   | 2 +-
 lib/WinStd                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ZRCola/zrcolaapp.h b/ZRCola/zrcolaapp.h
index 27ddb82..4adc1ce 100644
--- a/ZRCola/zrcolaapp.h
+++ b/ZRCola/zrcolaapp.h
@@ -82,7 +82,7 @@ public:
 
 protected:
 #ifdef __WXMSW__
-    winstd::win_handle<NULL> m_running; ///< Global Win32 event to determine if another instance of ZRCola is already running
+    winstd::event m_running;        ///< Global Win32 event to determine if another instance of ZRCola is already running
 #endif
 };
 
diff --git a/ZRColaCompile/dbsource.cpp b/ZRColaCompile/dbsource.cpp
index e76af0c..d21ee4d 100644
--- a/ZRColaCompile/dbsource.cpp
+++ b/ZRColaCompile/dbsource.cpp
@@ -42,7 +42,7 @@ void ZRCola::DBSource::character_bank::build_related()
 
 
 ZRCola::DBSource::character_bank::build_related_worker::build_related_worker(_In_ const character_bank *cb, _In_ iterator from, _In_ iterator to) :
-    win_handle<INVALID_HANDLE_VALUE>((HANDLE)_beginthreadex(NULL, 0, process, this, CREATE_SUSPENDED, NULL)),
+    thread((HANDLE)_beginthreadex(NULL, 0, process, this, CREATE_SUSPENDED, NULL)),
     m_heap(HeapCreate(0, 0, 0)),
     m_cb(cb),
     m_from(from),
diff --git a/ZRColaCompile/dbsource.h b/ZRColaCompile/dbsource.h
index 7fd22df..9710046 100644
--- a/ZRColaCompile/dbsource.h
+++ b/ZRColaCompile/dbsource.h
@@ -275,7 +275,7 @@ namespace ZRCola {
             void build_related();
 
         protected:
-            class build_related_worker : public winstd::win_handle<INVALID_HANDLE_VALUE>
+            class build_related_worker : public winstd::thread
             {
             public:
                 build_related_worker(_In_ const character_bank *cb, _In_ iterator from, _In_ iterator to);
diff --git a/lib/WinStd b/lib/WinStd
index 328646b..b21f2ef 160000
--- a/lib/WinStd
+++ b/lib/WinStd
@@ -1 +1 @@
-Subproject commit 328646b2d9d7100afe9d2d0a25e2c656241bb25b
+Subproject commit b21f2efa91fb601363a7535ecd9367a4b1aa5866