Skip to content

add support for cpp20 #1232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add support for cpp20 #1232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/cpp/VirtualArray.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

};
Expand Down
2 changes: 1 addition & 1 deletion src/hx/libs/std/Sys.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
4 changes: 3 additions & 1 deletion toolchain/emscripten-toolchain.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions toolchain/linux-toolchain.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
1 change: 1 addition & 0 deletions toolchain/mac-toolchain.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions toolchain/msvc-toolchain.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down