From 707eec6b9d1d1ca99127b2682a5726774bf3b6ff Mon Sep 17 00:00:00 2001
From: Michael Bickel <mib@developium.net>
Date: Sun, 1 Jun 2025 17:54:57 +0200
Subject: [PATCH] add support for cpp20

---
 include/cpp/VirtualArray.h         | 4 ++--
 src/hx/libs/std/Sys.cpp            | 2 +-
 toolchain/emscripten-toolchain.xml | 4 +++-
 toolchain/linux-toolchain.xml      | 1 +
 toolchain/mac-toolchain.xml        | 1 +
 toolchain/msvc-toolchain.xml       | 1 +
 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/include/cpp/VirtualArray.h b/include/cpp/VirtualArray.h
index a95f65ff5..5371eeb77 100644
--- a/include/cpp/VirtualArray.h
+++ b/include/cpp/VirtualArray.h
@@ -38,10 +38,10 @@ class VirtualArray : public hx::ObjectPtr<VirtualArray_obj>
    inline VirtualArray Add(const T &inVal);
 
 
-   inline bool operator==(const Dynamic &value) const { return value==*this; }
+   inline bool operator==(const Dynamic &value) const { return value==(Dynamic)*this; }
    template<typename SOURCE_> inline bool operator==( const Array<SOURCE_> &inRHS );
 
-   inline bool operator!=(Dynamic value) const { return value!=*this; }
+   inline bool operator!=(Dynamic value) const { return value!=(Dynamic)*this; }
    template<typename SOURCE_> inline bool operator!=( const Array<SOURCE_> &inRHS ) { return inRHS!=*this; }
 
 };
diff --git a/src/hx/libs/std/Sys.cpp b/src/hx/libs/std/Sys.cpp
index 371addf93..0fc55275f 100644
--- a/src/hx/libs/std/Sys.cpp
+++ b/src/hx/libs/std/Sys.cpp
@@ -99,7 +99,7 @@ void _hx_std_put_env( String e, String v )
 #ifdef HX_WINRT
    // Do nothing
 #elif defined(NEKO_WINDOWS)
-   String set = e + HX_CSTRING("=") + (v != null()?v:"");
+   String set = e + HX_CSTRING("=") + (v != null()?v:HX_CSTRING(""));
 
    #ifdef HX_SMART_STRINGS
    if (set.isUTF16Encoded())
diff --git a/toolchain/emscripten-toolchain.xml b/toolchain/emscripten-toolchain.xml
index 61c73fffb..2beb5185f 100644
--- a/toolchain/emscripten-toolchain.xml
+++ b/toolchain/emscripten-toolchain.xml
@@ -83,7 +83,9 @@
   <cppflag value="-frtti"/>
   <pchflag value="-x" />
   <pchflag value="c++-header" />
-  <cppflag value="--std=c++11" />
+  <cppflag value="--std=c++11" unless="HXCPP_CPP17 || HXCPP_CPP20"/>
+  <cppflag value="--std=c++17" if="HXCPP_CPP17"/>
+  <cppflag value="--std=c++20" if="HXCPP_CPP20"/>
   <section unless="HXCPP_LINK_NO_EXCEPTIONS" >
      <flag name="-s" value="DISABLE_EXCEPTION_CATCHING=0" if="HXCPP_NO_WASM_EXEPTIONS" />
      <flag value="-fwasm-exceptions" unless="HXCPP_NO_WASM_EXEPTIONS" />
diff --git a/toolchain/linux-toolchain.xml b/toolchain/linux-toolchain.xml
index b151ec211..7cce3c0c0 100644
--- a/toolchain/linux-toolchain.xml
+++ b/toolchain/linux-toolchain.xml
@@ -42,6 +42,7 @@
   <cppflag value="-frtti"/>
   <cppflag value="-std=c++11" if="HXCPP_CPP11" />
   <cppflag value="-std=c++17" if="HXCPP_CPP17"/>
+  <cppflag value="-std=c++20" if="HXCPP_CPP20"/>
   <flag value="-g" if="debug"/>
   <flag value="-O2" unless="debug"/>
   <flag value="-fpic"/>
diff --git a/toolchain/mac-toolchain.xml b/toolchain/mac-toolchain.xml
index f7928cdb0..21c06bcb7 100644
--- a/toolchain/mac-toolchain.xml
+++ b/toolchain/mac-toolchain.xml
@@ -30,6 +30,7 @@
   <cppflag value="-std=c++14" if="HXCPP_CPP14"/>
   <cppflag value="-Wc++14-extensions" if="HXCPP_CPP14"/>
   <cppflag value="-std=c++17" if="HXCPP_CPP17"/>
+  <cppflag value="-std=c++20" if="HXCPP_CPP20"/>
   <cppflag value="-Wc++17-extensions" if="HXCPP_CPP17"/>
   <cppflag value="-stdlib=libc++" unless="STDLIBCPP" />
   <cppflag value="-stdlib=libstdc++" if="STDLIBCPP" />
diff --git a/toolchain/msvc-toolchain.xml b/toolchain/msvc-toolchain.xml
index e504a6b62..736c228d9 100644
--- a/toolchain/msvc-toolchain.xml
+++ b/toolchain/msvc-toolchain.xml
@@ -70,6 +70,7 @@
   <flag value="-D${HXCPP_XP_DEFINE}" if="HXCPP_XP_DEFINE"/>
   <flag value="-GR"/>
   <flag value="/std:c++17" if="HXCPP_CPP17"/>
+  <flag value="/std:c++20" if="HXCPP_CPP20"/>
 
   <!-- standard optimization flags -->
   <flag value="-Od" if="debug" tag="optim-std" />