Merge branch 'master' into typed-thread

Aidan Lee · Aidan Lee · commit 0053fa39b115 · 2026-04-28T19:14:59.000+01:00
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -135,8 +135,8 @@ jobs:
           uses: ncipollo/release-action@v1
           with:
             tag: v${{ env.hxcpp_release }}
-            commit: ${{ github.head_ref }}
+            commit: ${{ github.ref }}
             name: Release ${{ env.hxcpp_release }}
             draft: false
             prerelease: false
-            artifacts: ./hxcpp-${{ env.hxcpp_release }}.zip
+            artifacts: ./hxcpp-${{ env.hxcpp_release }}.zip
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -233,4 +233,9 @@ jobs:
           haxe: ${{ inputs.haxe }}
       - name: test c/cxx_standard attributes
         working-directory: test/cxx_standard
-        run: haxelib run hxcpp Build.xml
+        shell: bash
+        run: |
+          for xml in *.xml; do
+            haxelib run hxcpp $xml
+            haxelib run hxcpp $xml clean
+          done
diff --git a/include/Dynamic.h b/include/Dynamic.h
@@ -168,7 +168,7 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES Dynamic : public hx::ObjectPtr<hx::Object>
       bool operator op (const ::String &inRHS)  const { return mPtr && ((::String)(*this) op inRHS); } \
       bool operator op (double inRHS)  const { return IsNumeric() && ((double)(*this) op inRHS); } \
       bool operator op (::cpp::Int64 inRHS)  const { return IsNumeric() && ((::cpp::Int64)(*this) op inRHS); } \
-      bool operator op (::cpp::UInt64 inRHS)  const { return IsNumeric() && ((::cpp::Int64)(*this) op inRHS); } \
+      bool operator op (::cpp::UInt64 inRHS)  const { return IsNumeric() && ((::cpp::UInt64)(*this) op inRHS); } \
       bool operator op (float inRHS)  const { return IsNumeric() && ((double)(*this) op inRHS); } \
       bool operator op (int inRHS)  const { return IsNumeric() && ((double)(*this) op (double)inRHS); } \
       bool operator op (unsigned int inRHS)  const { return IsNumeric() && ((double)(*this) op (double)inRHS); } \
@@ -183,7 +183,7 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES Dynamic : public hx::ObjectPtr<hx::Object>
    bool operator != (const String &inRHS)  const { return !mPtr || ((String)(*this) != inRHS); }
    bool operator != (double inRHS)  const { return !IsNumeric() || ((double)(*this) != inRHS); }
    bool operator != (cpp::Int64 inRHS)  const { return !IsNumeric() || ((cpp::Int64)(*this) != inRHS); }
-   bool operator != (cpp::UInt64 inRHS)  const { return !IsNumeric() || ((cpp::Int64)(*this) != inRHS); }
+   bool operator != (cpp::UInt64 inRHS)  const { return !IsNumeric() || ((cpp::UInt64)(*this) != inRHS); }
    bool operator != (float inRHS)  const { return !IsNumeric() || ((double)(*this) != inRHS); }
    bool operator != (int inRHS)  const { return !IsNumeric() || ((double)(*this) != (double)inRHS); }
    bool operator != (unsigned int inRHS)  const { return !IsNumeric() || ((double)(*this) != (double)inRHS); }
@@ -381,9 +381,9 @@ inline int Dynamic::Cast<int>() const { return mPtr ? mPtr->__ToInt() : 0; }
 template<>
 inline bool Dynamic::Cast<bool>() const { return mPtr ? mPtr->__ToInt() : 0; }
 template<>
-inline double Dynamic::Cast<double>() const { return mPtr ? mPtr->__ToDouble() : 0; }
+inline double Dynamic::Cast<double>() const { return mPtr ? mPtr->__ToDouble() : 0.0; }
 template<>
-inline float Dynamic::Cast<float>() const { return mPtr ? mPtr->__ToDouble() : 0; }
+inline float Dynamic::Cast<float>() const { return (float)(mPtr ? mPtr->__ToDouble() : 0.0f); }
 template<>
 inline String Dynamic::Cast<String>() const { return mPtr ? mPtr->toString() : String(null()); }
 
@@ -466,8 +466,8 @@ COMPARE_DYNAMIC_OP( >  )
 
 
 #define ARITH_DYNAMIC( op ) \
-   inline double operator op (const ::cpp::Int64 &inLHS,const ::Dynamic &inRHS) { return inLHS op (::cpp::Int64)inRHS;} \
-   inline double operator op (const ::cpp::UInt64 &inLHS,const ::Dynamic &inRHS) { return inLHS op (::cpp::UInt64)inRHS;} \
+   inline double operator op (const ::cpp::Int64 &inLHS,const ::Dynamic &inRHS) { return (double)( inLHS op (::cpp::Int64)inRHS );} \
+   inline double operator op (const ::cpp::UInt64 &inLHS,const ::Dynamic &inRHS) { return (double)( inLHS op (::cpp::UInt64)inRHS );} \
    inline double operator op (const double &inLHS,const ::Dynamic &inRHS) { return inLHS op (double)inRHS;} \
    inline double operator op (const float &inLHS,const ::Dynamic &inRHS) { return inLHS op (double)inRHS;} \
    inline double operator op (const int &inLHS,const ::Dynamic &inRHS) { return inLHS op (double)inRHS; } \
diff --git a/include/cpp/Variant.h b/include/cpp/Variant.h
@@ -102,7 +102,7 @@ namespace cpp
       inline operator double() const { return asDouble(); }
       inline operator int() const { return asInt(); }
       inline operator bool() const { return asInt(); }
-      inline operator float () const { return asDouble(); }
+      inline operator float () const { return (float)asDouble(); }
       inline operator unsigned int () const { return asInt(); }
       inline operator short () const { return asInt(); }
       inline operator unsigned short () const { return asInt(); }
@@ -345,7 +345,7 @@ namespace cpp
 
       switch(type)
       {
-         case typeDouble: return valDouble;
+         case typeDouble: return (int)valDouble;
          case typeInt64: return (int)valInt64;
          case typeBool: return valBool;
          case typeObject: return valObject ? valObject->__ToInt() : 0;
@@ -363,7 +363,7 @@ namespace cpp
 
       switch(type)
       {
-         case typeDouble: return valDouble;
+         case typeDouble: return (cpp::Int64)valDouble;
          case typeInt: return valInt;
          case typeBool: return valBool;
          case typeObject: return valObject ? valObject->__ToInt64() : 0;
@@ -381,7 +381,7 @@ namespace cpp
       else if (type==typeBool)
          return valBool ? 1.0 : 0.0;
       else if (type==typeInt64)
-         return valInt64;
+         return (double)valInt64;
       else if (type==typeObject)
          return valObject ? valObject->__ToDouble() : 0.0;
       return 0.0;
diff --git a/include/cpp/marshal/Marshal.hpp b/include/cpp/marshal/Marshal.hpp
@@ -414,9 +414,9 @@ inline void cpp::marshal::Marshal::writeLittleEndianUInt32(const View<uint8_t>&
 inline void cpp::marshal::Marshal::writeLittleEndianUInt64(const View<uint8_t>& view, const uint64_t& value)
 {
 #ifdef HXCPP_BIG_ENDIAN
-    writeUInt16(view, reverse(value));
+    writeUInt64(view, reverse(value));
 #else
-    writeUInt16(view, value);
+    writeUInt64(view, value);
 #endif
 }
 
@@ -496,9 +496,9 @@ inline void cpp::marshal::Marshal::writeBigEndianUInt32(const View<uint8_t>& vie
 inline void cpp::marshal::Marshal::writeBigEndianUInt64(const View<uint8_t>& view, const uint64_t& value)
 {
 #ifndef HXCPP_BIG_ENDIAN
-    writeUInt16(view, reverse(value));
+    writeUInt64(view, reverse(value));
 #else
-    writeUInt16(view, value);
+    writeUInt64(view, value);
 #endif
 }
 
diff --git a/include/hx/GC.h b/include/hx/GC.h
@@ -329,7 +329,7 @@ namespace hx
 
 
 
-class StackContext;
+struct StackContext;
 
 EXTERN_FAST_TLS_DATA(StackContext, tlsStackContext);
 
@@ -360,7 +360,7 @@ class ImmixAllocator
 
 
 
-   // These allocate the function using the garbage-colleced malloc
+   // These allocate the function using the garbage-collected malloc
    inline static void *alloc(ImmixAllocator *alloc, size_t inSize, bool inContainer, const char *inName )
    {
       #ifdef HXCPP_GC_NURSERY
@@ -406,7 +406,7 @@ class ImmixAllocator
             // Ensure odd alignment in 8 bytes
             start += 4 - (start & 4);
          #endif
-         int end = start + sizeof(int) + inSize;
+         int end = start + (int)(sizeof(int) + inSize);
 
          if ( end <= alloc->spaceEnd )
          {
@@ -420,11 +420,11 @@ class ImmixAllocator
 
             if (inContainer)
                *buffer++ =  (( (end+(IMMIX_LINE_LEN-1))>>IMMIX_LINE_BITS) -startRow) |
-                            (inSize<<IMMIX_ALLOC_SIZE_SHIFT) |
+                            ((int)inSize<<IMMIX_ALLOC_SIZE_SHIFT) |
                             hx::gMarkIDWithContainer;
             else
                *buffer++ =  (( (end+(IMMIX_LINE_LEN-1))>>IMMIX_LINE_BITS) -startRow) |
-                            (inSize<<IMMIX_ALLOC_SIZE_SHIFT) |
+                            ((int)inSize<<IMMIX_ALLOC_SIZE_SHIFT) |
                             hx::gMarkID;
 
             #if defined(HXCPP_GC_CHECK_POINTER) && defined(HXCPP_GC_DEBUG_ALWAYS_MOVE)
@@ -439,7 +439,7 @@ class ImmixAllocator
          }
 
          // Fall back to external method
-         void *result = alloc->CallAlloc(inSize, inContainer ? IMMIX_ALLOC_IS_CONTAINER : 0);
+         void *result = alloc->CallAlloc((int)inSize, inContainer ? IMMIX_ALLOC_IS_CONTAINER : 0);
 
          #ifdef HXCPP_TELEMETRY
             __hxt_gc_new((hx::StackContext *)alloc,result, inSize, inName);
diff --git a/include/hx/LessThanEq.h b/include/hx/LessThanEq.h
@@ -103,9 +103,9 @@ struct CompareTraits<double>
 {
    enum { type = (int)CompareAsDouble };
 
-   inline static int toInt(double inValue) { return inValue; }
+   inline static int toInt(double inValue) { return (int)inValue; }
    inline static double toDouble(double inValue) { return inValue; }
-   inline static cpp::Int64 toInt64(double inValue) { return inValue; }
+   inline static cpp::Int64 toInt64(double inValue) { return (cpp::Int64)inValue; }
    inline static String toString(double inValue) { return String(); }
    inline static hx::Object *toObject(double inValue) { return 0; }
 
@@ -122,7 +122,7 @@ struct CompareTraits<cpp::Int64>
    enum { type = (int)CompareAsInt64 };
 
    inline static int toInt(cpp::Int64 inValue) { return (int)inValue; }
-   inline static double toDouble(cpp::Int64 inValue) { return inValue; }
+   inline static double toDouble(cpp::Int64 inValue) { return (double)inValue; }
    inline static cpp::Int64 toInt64(cpp::Int64 inValue) { return inValue; }
    inline static String toString(cpp::Int64 inValue) { return String(); }
    inline static hx::Object *toObject(cpp::Int64 inValue) { return 0; }
@@ -137,7 +137,7 @@ struct CompareTraits<cpp::UInt64>
    enum { type = (int)CompareAsInt64 };
 
    inline static int toInt(cpp::UInt64 inValue) { return (int)inValue; }
-   inline static double toDouble(cpp::UInt64 inValue) { return inValue; }
+   inline static double toDouble(cpp::UInt64 inValue) { return (double)inValue; }
    // Return value is unsigned ...
    inline static cpp::UInt64 toInt64(cpp::UInt64 inValue) { return inValue; }
    inline static String toString(cpp::UInt64 inValue) { return String(); }
diff --git a/include/hx/Object.h b/include/hx/Object.h
@@ -42,7 +42,7 @@ HXCPP_EXTERN_CLASS_ATTRIBUTES null BadCast();
 // CPPIA_CALL = fastcall on x86(32), nothing otherwise
 #if (defined(_WIN32) && !defined(_M_X64) && !defined(__x86_64__) && !defined(_ARM_) ) || \
    defined(HXCPP_X86) || defined(__i386__) || defined(__i386) || \
-   (!defined(_WIN32) && !defined(_ARM_) && !defined(__arm__) && !defined(__x86_64__) )
+   (!defined(_WIN32) && !defined(_ARM_) && !defined(__arm__) && !defined(__aarch64__) && !defined(__x86_64__) )
 
    #if defined(__GNUC__) && !defined(__APPLE__) && !defined(EMSCRIPTEN)
       #define CPPIA_CALL __attribute__ ((fastcall))
diff --git a/include/hx/Operators.h b/include/hx/Operators.h
@@ -82,8 +82,8 @@ template<> inline double ToDouble(double inValue) { return inValue; }
 template<> inline double ToDouble(int inValue) { return inValue; }
 template<> inline double ToDouble(bool inValue) { return inValue; }
 template<> inline double ToDouble(float inValue) { return inValue; }
-template<> inline double ToDouble(cpp::UInt64 inValue) { return inValue; }
-template<> inline double ToDouble(cpp::Int64 inValue) { return inValue; }
+template<> inline double ToDouble(cpp::UInt64 inValue) { return (double)inValue; }
+template<> inline double ToDouble(cpp::Int64 inValue) { return (double)inValue; }
 template<> inline double ToDouble(null inValue) { return 0; }
 
 
@@ -261,7 +261,7 @@ template<> inline float TCastObject<float>(hx::Object *inObj)
 {
    if (!inObj || (inObj->__GetType()!=::vtFloat && inObj->__GetType()!=::vtInt64 && inObj->__GetType()!=::vtInt))
       return hx::BadCast();
-   return inObj->__ToDouble();
+   return (float)inObj->__ToDouble();
 }
 
 template<> inline String TCastObject<String>(hx::Object *inObj)
diff --git a/include/hxString.h b/include/hxString.h
@@ -331,7 +331,7 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES String
 
    inline int cca(int inPos) const
    {
-      if ((unsigned)inPos>=length) return 0;
+      if ( (inPos>=length) || (inPos<0) ) return 0;
       #ifdef HX_SMART_STRINGS
       if (isUTF16Encoded())
          return __w[inPos];
diff --git a/include/hxcpp.h b/include/hxcpp.h
@@ -249,7 +249,7 @@ namespace hx { class Object; }
 namespace hx { class FieldRef; }
 namespace hx { class IndexRef; }
 namespace hx { class NativeInterface; }
-namespace hx { class StackContext; }
+namespace hx { struct StackContext; }
 namespace hx { template<typename T> class Native; }
 namespace hx { template<typename O> class ObjectPtr; }
 namespace cpp { template<typename S,typename H> class Struct; }
@@ -261,7 +261,7 @@ namespace cpp { namespace marshal { template<class T> class ValueType; } }
 namespace cpp { namespace marshal { template<class T> class ValueReference; } }
 namespace cpp { namespace marshal { template<class T> class PointerType; } }
 namespace cpp { namespace marshal { template<class T> class PointerReference; } }
-namespace cpp { namespace marshal { template<class T> class View; } }
+namespace cpp { namespace marshal { template<class T> struct View; } }
 template<typename ELEM_> class Array_obj;
 template<typename ELEM_> class Array;
 namespace hx {
diff --git a/src/Dynamic.cpp b/src/Dynamic.cpp
@@ -123,7 +123,7 @@ class DoubleData : public hx::Object
    String __ToString() const { return String(mValue); }
    double __ToDouble() const { return mValue; }
    int __ToInt() const { return (int)mValue; }
-   cpp::Int64 __ToInt64() const { return mValue; }
+   cpp::Int64 __ToInt64() const { return (cpp::Int64)mValue; }
 
    int __Compare(const hx::Object *inRHS) const
    {
@@ -153,7 +153,7 @@ class Int64Data : public hx::Object
    virtual int __GetType() const { return vtInt64; }
    String toString() { return String(mValue); }
    String __ToString() const { return String(mValue); }
-   double __ToDouble() const { return mValue; }
+   double __ToDouble() const { return (double)mValue; }
    int __ToInt() const { return (int)mValue; }
    cpp::Int64 __ToInt64() const { return mValue; }
    void __GetFields(Array<String> &outFields)
@@ -414,7 +414,7 @@ Dynamic::Dynamic(double inVal)
       int idx = inVal+1;
       mPtr = sConstDynamicInts[idx].mPtr;
       if (!mPtr)
-         mPtr = sConstDynamicInts[idx].mPtr = new (hx::NewObjConst)IntData(inVal);
+         mPtr = sConstDynamicInts[idx].mPtr = new (hx::NewObjConst)IntData((int)inVal);
    }
    else
       mPtr = (hx::Object *)new DoubleData(inVal);
@@ -423,12 +423,13 @@ Dynamic::Dynamic(double inVal)
 
 Dynamic::Dynamic(cpp::Int64 inVal)
 {
-   if ( (int)inVal==inVal && inVal>=-1 && inVal<256 )
+   int ival = (int)inVal;
+   if ( ival==inVal && ival>=-1 && ival<256 )
    {
-      int idx = inVal+1;
+      int idx = ival+1;
       mPtr = sConstDynamicInts[idx].mPtr;
       if (!mPtr)
-         mPtr = sConstDynamicInts[idx].mPtr = new (hx::NewObjConst)IntData(inVal);
+         mPtr = sConstDynamicInts[idx].mPtr = new (hx::NewObjConst)IntData(ival);
    }
    else
       mPtr = (hx::Object *)new Int64Data(inVal);
diff --git a/src/String.cpp b/src/String.cpp
@@ -1418,8 +1418,11 @@ String String::fromCharCode( int c )
    else
    {
       #ifdef HX_SMART_STRINGS
-      if (IsUtf16Surrogate(c)||c>=0x110000)
-         c = 0xFFFD;
+      // Leave Utf16 surrogate handling up to the application - as far as hxcpp is concerned
+      // they are single characters. ie, mirror charAt. 
+      // If the application does not group them as a pair, then it may not be possible to convert to utf8.
+      //if (IsUtf16Surrogate(c))
+      //   hx::Throw(HX_CSTRING("Invalid unpaired surrogate code"));
       #endif
 
       int group = c>>10;
diff --git a/src/hx/Hash.h b/src/hx/Hash.h
@@ -243,7 +243,7 @@ inline void CopyValue(String &outValue, Float inValue) {  }
 inline void CopyValue(String &outValue, const Dynamic &inValue) { outValue = inValue; }
 inline void CopyValue(int &outValue, int inValue) { outValue = inValue; }
 inline void CopyValue(int &outValue, cpp::Int64 inValue) { }
-inline void CopyValue(int &outValue, Float inValue) { outValue = inValue; }
+inline void CopyValue(int &outValue, Float inValue) { outValue = (int)inValue; }
 inline void CopyValue(int &outValue, const Dynamic &inValue) { outValue = inValue; }
 inline void CopyValue(int &outValue, const String &inValue) {  }
 inline void CopyValue(Float &outValue, Float inValue) { outValue = inValue; }
diff --git a/src/hx/libs/std/Socket.cpp b/src/hx/libs/std/Socket.cpp
@@ -9,7 +9,9 @@
 
 #ifdef __GNUC__
    // Mingw / gcc on windows
+   #ifndef _WIN32_WINNT
    #define _WIN32_WINNT 0x0501
+   #endif
    #include <winsock2.h>
    #include <ws2tcpip.h>
 #else
@@ -19,14 +21,9 @@
    #include <Ws2tcpip.h>
 #endif
 
-
 #define DYNAMIC_INET_FUNCS 1
-typedef WINSOCK_API_LINKAGE  INT (WSAAPI *inet_pton_func)( INT Family, PCSTR pszAddrString, PVOID pAddrBuf);
-typedef WINSOCK_API_LINKAGE  PCSTR (WSAAPI *inet_ntop_func)(INT  Family, PVOID pAddr, PSTR pStringBuf, size_t StringBufSize);
-
-
-
-
+typedef INT (WSAAPI *inet_pton_func)( INT Family, PCSTR pszAddrString, PVOID pAddrBuf);
+typedef PCSTR (WSAAPI *inet_ntop_func)(INT  Family, PVOID pAddr, PSTR pStringBuf, size_t StringBufSize);
 
 #   define FDSIZE(n)   (sizeof(u_int) + (n) * sizeof(SOCKET))
 #   define SHUT_WR      SD_SEND
@@ -710,7 +707,7 @@ static void make_array_result_inplace(Array<Dynamic> a, fd_set *tmp)
 static struct timeval *init_timeval( double f, struct timeval *t ) {
    if (f<0)
       return 0;
-   t->tv_usec = (f - (int)f ) * 1000000;
+   t->tv_usec = (int)(  (f - (int)f ) * 1000000 );
    t->tv_sec = (int)f;
    return t;
 }
diff --git a/test/cxx_standard/Build_legacy.xml b/test/cxx_standard/Build_legacy.xml
@@ -0,0 +1,12 @@
+<xml>
+	<set name="HXCPP_CPP17" value="1" />
+
+	<files id="test">
+		<compilerflag value="/Zc:__cplusplus" if="isMsvc" />
+		<file name="main.cpp" />
+	</files>
+
+	<target id="default" tool="linker" toolid="exe" output="main">
+		<files id="test"/>
+	</target>
+</xml>
diff --git a/test/cxx_standard/Build_section.xml b/test/cxx_standard/Build_section.xml
@@ -0,0 +1,12 @@
+<xml>
+	<files id="test" cxx_standard="17">
+		<compilerflag value="/Zc:__cplusplus" if="isMsvc" />
+		<section>
+			<file name="main.cpp" />
+		</section>
+	</files>
+
+	<target id="default" tool="linker" toolid="exe" output="main">
+		<files id="test"/>
+	</target>
+</xml>
diff --git a/toolchain/haxe-target.xml b/toolchain/haxe-target.xml
@@ -1,7 +1,7 @@
 <xml>
 
 <!-- make sure hxcpp.n is up to date -->
-<pleaseUpdateHxcppTool version="7" />
+<pleaseUpdateHxcppTool version="8" />
 
 <pragma once="true" />
 
diff --git a/tools/hxcpp/BuildTool.hx b/tools/hxcpp/BuildTool.hx
diff --git a/tools/hxcpp/Compiler.hx b/tools/hxcpp/Compiler.hx
diff --git a/tools/hxcpp/FileGroup.hx b/tools/hxcpp/FileGroup.hx
diff --git a/tools/hxcpp/GenMsvc.hx b/tools/hxcpp/GenMsvc.hx
diff --git a/tools/hxcpp/PathManager.hx b/tools/hxcpp/PathManager.hx
diff --git a/tools/hxcpp/Setup.hx b/tools/hxcpp/Setup.hx

Original file line number	Diff line number	Diff line change
`@@ -414,9 +414,9 @@ inline void cpp::marshal::Marshal::writeLittleEndianUInt32(const View<uint8_t>&`
`414`	`414`	`inline void cpp::marshal::Marshal::writeLittleEndianUInt64(const View<uint8_t>& view, const uint64_t& value)`
`415`	`415`	`{`
`416`	`416`	`#ifdef HXCPP_BIG_ENDIAN`
`417`		`- writeUInt16(view, reverse(value));`
	`417`	`+ writeUInt64(view, reverse(value));`
`418`	`418`	`#else`
`419`		`- writeUInt16(view, value);`
	`419`	`+ writeUInt64(view, value);`
`420`	`420`	`#endif`
`421`	`421`	`}`
`422`	`422`
`@@ -496,9 +496,9 @@ inline void cpp::marshal::Marshal::writeBigEndianUInt32(const View<uint8_t>& vie`
`496`	`496`	`inline void cpp::marshal::Marshal::writeBigEndianUInt64(const View<uint8_t>& view, const uint64_t& value)`
`497`	`497`	`{`
`498`	`498`	`#ifndef HXCPP_BIG_ENDIAN`
`499`		`- writeUInt16(view, reverse(value));`
	`499`	`+ writeUInt64(view, reverse(value));`
`500`	`500`	`#else`
`501`		`- writeUInt16(view, value);`
	`501`	`+ writeUInt64(view, value);`
`502`	`502`	`#endif`
`503`	`503`	`}`
`504`	`504`
Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ class HXCPP_EXTERN_CLASS_ATTRIBUTES String`
`331`	`331`
`332`	`332`	`inline int cca(int inPos) const`
`333`	`333`	`{`
`334`		`- if ((unsigned)inPos>=length) return 0;`
	`334`	`+ if ( (inPos>=length) \|\| (inPos<0) ) return 0;`
`335`	`335`	`#ifdef HX_SMART_STRINGS`
`336`	`336`	`if (isUTF16Encoded())`
`337`	`337`	`return __w[inPos];`