From b0db806f5e9ee98c1e67250ff40e62ee262f82d6 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Mon, 11 Mar 2024 15:56:28 +0100
Subject: [PATCH] Update submodules

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 MSI/MSICA                | 2 +-
 Updater                  | 2 +-
 ZRColaCompile/dbsource.h | 2 +-
 ZRColaCompile/main.cpp   | 4 ++--
 include/common.props     | 1 +
 lib/WinStd               | 2 +-
 lib/oatpp                | 2 +-
 lib/stdex                | 2 +-
 lib/wxExtend             | 2 +-
 9 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/MSI/MSICA b/MSI/MSICA
index bfbdf0e..6f3710b 160000
--- a/MSI/MSICA
+++ b/MSI/MSICA
@@ -1 +1 @@
-Subproject commit bfbdf0eb3f37694ba65619817b2ad1b0609a764e
+Subproject commit 6f3710bd34d086946788c5244799c0bf50fd4335
diff --git a/Updater b/Updater
index 4649577..22c3352 160000
--- a/Updater
+++ b/Updater
@@ -1 +1 @@
-Subproject commit 46495773c213359200e4294ddcac828a4887e5a9
+Subproject commit 22c335242b6a28f530939f307048293ca005df14
diff --git a/ZRColaCompile/dbsource.h b/ZRColaCompile/dbsource.h
index 5527dd6..702d9ee 100644
--- a/ZRColaCompile/dbsource.h
+++ b/ZRColaCompile/dbsource.h
@@ -308,7 +308,7 @@ namespace ZRCola {
         ///
         /// Character description index key comparator
         ///
-        struct character_desc_idx_less : public std::binary_function<std::wstring, std::wstring, bool>
+        struct character_desc_idx_less
         {
             inline bool operator()(const std::wstring& _Left, const std::wstring& _Right) const
             {
diff --git a/ZRColaCompile/main.cpp b/ZRColaCompile/main.cpp
index 14dd7ba..e4d703c 100644
--- a/ZRColaCompile/main.cpp
+++ b/ZRColaCompile/main.cpp
@@ -981,10 +981,10 @@ int _tmain(int argc, _TCHAR *argv[])
                 << "\"Content-Transfer-Encoding: 8bit\\n\"" << endl
                 << "\"X-Generator: ZRColaCompile\\n\"" << endl;
 
-            wstring_convert<codecvt_utf8<wchar_t>> conv;
+            charset_encoder<wchar_t, char> conv(stdex::wchar_t_charset, charset_id::utf8);
             for (auto p = pot.cbegin(); p != pot.cend(); ++p) {
                 // Convert UTF-16 to UTF-8 and escape.
-                string t(conv.to_bytes(*p)), u;
+                string t(conv.convert(*p)), u;
                 for (size_t i = 0, n = t.size(); i < n; i++) {
                     char c = t[i];
                     switch (c) {
diff --git a/include/common.props b/include/common.props
index 02e73b0..afcf78d 100644
--- a/include/common.props
+++ b/include/common.props
@@ -31,6 +31,7 @@
       <DisableSpecificWarnings>4100;4505</DisableSpecificWarnings>
       <SupportJustMyCode>false</SupportJustMyCode>
       <EnablePREfast>true</EnablePREfast>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <OptimizeReferences>true</OptimizeReferences>
diff --git a/lib/WinStd b/lib/WinStd
index 8e323ef..5be20dd 160000
--- a/lib/WinStd
+++ b/lib/WinStd
@@ -1 +1 @@
-Subproject commit 8e323efef9b1305cddc41137bd0483f0a390e2ec
+Subproject commit 5be20dde2352e7bf5c97e53243a11882b325b2c4
diff --git a/lib/oatpp b/lib/oatpp
index 1e5b0c4..17ef2a7 160000
--- a/lib/oatpp
+++ b/lib/oatpp
@@ -1 +1 @@
-Subproject commit 1e5b0c49179c75508498c91660ae12a7866edebf
+Subproject commit 17ef2a7f6c8a932498799b2a5ae5aab2869975c7
diff --git a/lib/stdex b/lib/stdex
index 9d50a87..5e86663 160000
--- a/lib/stdex
+++ b/lib/stdex
@@ -1 +1 @@
-Subproject commit 9d50a878dca6bf3af2a2bf7c1be03913ef2e5ce6
+Subproject commit 5e86663557e61a92bf745838c5f7be8d60a3b443
diff --git a/lib/wxExtend b/lib/wxExtend
index e3a59d1..79ec083 160000
--- a/lib/wxExtend
+++ b/lib/wxExtend
@@ -1 +1 @@
-Subproject commit e3a59d1118053ed48dc15b83d17125da87c434dd
+Subproject commit 79ec08365068ab6e03b06caef13de0ce6b06fcd5