Merge remote-tracking branch 'official-hxcpp/master'

Author: intoxopox

azure-pipelines.yml

@@ -25,7 +25,7 @@ stages:
       - template: tools/azure-pipelines/build.yml
         parameters:
           name: Mac
-          vmImage: macOS-10.15
+          vmImage: macOS-12
           platform: mac
           arch: 64
       - template: tools/azure-pipelines/build.yml

include/Dynamic.h

@@ -38,7 +38,7 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES Dynamic : public hx::ObjectPtr<hx::Object>
    Dynamic(const cpp::Variant &inRHS) : super(inRHS.asDynamic()) { }
    template<typename T>
    Dynamic(const hx::Native<T *> &inInterface):super(inInterface.ptr ? inInterface->__GetRealObject() : (hx::Object *)0 ) { }
-   #if !defined(__GNUC__) || (defined(__WORDSIZE) && (__WORDSIZE != 64))
+   #if !defined(__GNUC__) || defined(__MINGW32__) || (defined(__WORDSIZE) && (__WORDSIZE != 64))
    Dynamic(long inVal);
    Dynamic(unsigned long inVal);
    #endif
@@ -408,7 +408,7 @@ HXCPP_EXTERN_CLASS_ATTRIBUTES hx::Class &GetInt64Class();
 template<>
 inline bool Dynamic::IsClass<int>() { return mPtr && mPtr->__GetClass()==hx::GetIntClass(); }
 template<>
-inline bool Dynamic::IsClass<double>() { return mPtr && 
+inline bool Dynamic::IsClass<double>() { return mPtr &&
    ( mPtr->__GetClass()==hx::GetIntClass() || mPtr->__GetClass()==hx::GetFloatClass()) ; }
 template<>
 inline bool Dynamic::IsClass<float>() { return mPtr && mPtr->__GetClass()==hx::GetFloatClass(); }
@@ -458,7 +458,7 @@ bool operator==(Platform::Box<T> ^inPtr, nullptr_t)
    inline bool operator op (float inLHS,const ::Dynamic &inRHS) \
       { return inRHS.IsNumeric() && ((double)inLHS op (double)inRHS); } \
    inline bool operator op (int inLHS,const ::Dynamic &inRHS) \
-      { return inRHS.IsNumeric() && (inLHS op (double)inRHS); } 
+      { return inRHS.IsNumeric() && (inLHS op (double)inRHS); }
 
 COMPARE_DYNAMIC_OP( < )
 COMPARE_DYNAMIC_OP( <= )

src/Dynamic.cpp

@@ -302,7 +302,7 @@ class StructData : public hx::Object
          diff = __GetType() - inRHS->__GetType();
       if (diff==0)
          diff = memcmp( mValue, inRHS->__GetHandle(), mLength );
-       
+
       if (diff<0) return -1;
       if (diff>0) return 1;
       return 0;
@@ -386,7 +386,7 @@ Dynamic::Dynamic(short inVal)
    mPtr = fromInt(inVal);
 }
 
-#if !defined(__GNUC__) || (defined(__WORDSIZE) && (__WORDSIZE != 64))
+#if !defined(__GNUC__) || defined(__MINGW32__) || (defined(__WORDSIZE) && (__WORDSIZE != 64))
 Dynamic::Dynamic(unsigned long inVal)
 {
    mPtr = fromInt(inVal);
@@ -642,5 +642,3 @@ void Dynamic::__boot()
    Static(__ObjcClass) = hx::_hx_RegisterClass(HX_CSTRING("objc::BoxedType"),IsPointer,sNone,sNone, 0,0,&__ObjcClass );
 #endif
 }
-
-

src/hx/Debug.cpp

@@ -89,7 +89,7 @@ static void CriticalErrorHandler(String inErr, bool allowFixup)
     DBGLOG("Critical Error: %s\n", inErr.utf8_str());
 
 #if defined(HX_WINDOWS) && !defined(HX_WINRT)
-    MessageBoxA(0, inErr.utf8_str(), "Critial Error - program must terminate",
+    MessageBoxA(0, inErr.utf8_str(), "Critical Error - program must terminate",
         MB_ICONEXCLAMATION|MB_OK);
 #endif
 

src/hx/libs/std/Socket.cpp

@@ -11,7 +11,7 @@
    // Mingw / gcc on windows
    #define _WIN32_WINNT 0x0501
    #include <winsock2.h>
-   #   include <Ws2tcpip.h>
+   #include <ws2tcpip.h>
 #else
    // Windows...
    #include <winsock2.h>
@@ -412,7 +412,7 @@ Array<unsigned char> _hx_std_host_resolve_ipv6( String host, bool )
       memset(&hints, 0, sizeof(struct addrinfo));
       hints.ai_family = AF_INET6;  //  IPv6
       hints.ai_socktype = 0;  // any - SOCK_STREAM or SOCK_DGRAM
-      hints.ai_flags = AI_PASSIVE;  // For wildcard IP address 
+      hints.ai_flags = AI_PASSIVE;  // For wildcard IP address
       hints.ai_protocol = 0;        // Any protocol
       hints.ai_canonname = 0;
       hints.ai_addr = 0;

test/native/tests/TestNativeEnum.hx

@@ -2,7 +2,7 @@ package tests;
 
 // Uses native enum, which does not play nice with Dynamic - must use @:unreflective
 @:unreflective
-@:enum extern abstract SystemMetric(SystemMetricImpl) {
+#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SystemMetric(SystemMetricImpl) {
     @:native("wxSYS_MOUSE_BUTTONS")      var MOUSE_BUTTONS;
     @:native("wxSYS_OS")      var OS;
 }
@@ -13,7 +13,7 @@ extern class SystemMetricImpl { }
 
 
 // Wraps enum in struct, which does play nice...
-@:enum extern abstract SystemMetricStruct(SystemMetricStructImpl) {
+#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SystemMetricStruct(SystemMetricStructImpl) {
     @:native("wxSYS_MOUSE_BUTTONS")      var MOUSE_BUTTONS;
     @:native("wxSYS_OS")      var OS;
 }

tools/hxcpp/CopyFile.hx

@@ -88,8 +88,7 @@ class CopyFile
    }
 }
 
-@:enum
-abstract Overwrite(String) from String to String
+#if (haxe_ver >= 4.0) enum #else @:enum #end abstract Overwrite(String) from String to String
 {
     var ALWAYS = "always";
     var IF_NEWER = "ifNewer";