From 4f653e02e564ff2506c754672a01207590283ee2 Mon Sep 17 00:00:00 2001 From: Emmett Lalish Date: Tue, 9 Jul 2024 11:46:07 -0700 Subject: [PATCH] update to emscripten 3.1.61 --- .github/workflows/manifold.yml | 4 ++-- src/utilities/include/hashtable.h | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/manifold.yml b/.github/workflows/manifold.yml index 3daeb520b..fc9a8390c 100644 --- a/.github/workflows/manifold.yml +++ b/.github/workflows/manifold.yml @@ -123,8 +123,8 @@ jobs: # setup emscripten git clone https://github.com/emscripten-core/emsdk.git cd emsdk - ./emsdk install 3.1.45 - ./emsdk activate 3.1.45 + ./emsdk install 3.1.61 + ./emsdk activate 3.1.61 - uses: jwlawson/actions-setup-cmake@v2 - name: Build WASM run: | diff --git a/src/utilities/include/hashtable.h b/src/utilities/include/hashtable.h index 7d971d015..591295c1c 100644 --- a/src/utilities/include/hashtable.h +++ b/src/utilities/include/hashtable.h @@ -132,10 +132,9 @@ class HashTable { step_(step) {} HashTable(const HashTable& other) - : keys_(other.keys_), - values_(other.values_), - used_(other.used_), - step_(other.step_) {} + : keys_(other.keys_), values_(other.values_), step_(other.step_) { + used_.store(other.used_.load()); + } HashTable& operator=(const HashTable& other) { if (this == &other) return *this;