Merge branch 'master' into typed-functions

HaxeFoundation · Mar 5, 2025 · 864e93f · 864e93f
2 parents 4625a2a + dd050c0
commit 864e93f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/setup/action.yml b/.github/workflows/setup/action.yml
@@ -22,7 +22,9 @@ runs:
     - name: install native libraries
       if: runner.os == 'Linux'
       shell: pwsh
-      run: sudo apt-get install -qqy gcc-multilib g++-multilib
+      run: |
+        sudo apt-get update -qqy
+        sudo apt-get install -qqy gcc-multilib g++-multilib
 
     - name: build run.n
       working-directory: tools/run

diff --git a/src/String.cpp b/src/String.cpp
@@ -2452,6 +2452,7 @@ void String::__boot()
    {
       #ifdef HX_SMART_STRINGS
       if (c>127)
+      #endif
       {
          char16_t buf[20];
          buf[0] = c;
@@ -2462,8 +2463,8 @@ void String::__boot()
          sConstStrings[c].__w = w;
          fixHashPerm16(sConstStrings[c]);
       }
+      #ifdef HX_SMART_STRINGS
       else
-      #endif
       {
          char buf[20];
          int  utf8Len = UTF8Bytes(c);
@@ -2473,6 +2474,7 @@ void String::__boot()
          sConstStrings[c].__s = (char *)InternalCreateConstBuffer(buf,utf8Len+1,true);
          sConstStrings[c].length = utf8Len;
       }
+      #endif
    }
 
    sConstEmptyString.mPtr = new (hx::NewObjConst)StringData(emptyString);
@@ -2481,8 +2483,3 @@ void String::__boot()
            &CreateEmptyString, &CreateString, 0, 0, 0
     );
 }
-
-
-
-
-