From 80356bee2bd0139d8108fd0e7f7279b163374296 Mon Sep 17 00:00:00 2001 From: William Baker Date: Fri, 3 May 2024 10:44:24 -0400 Subject: [PATCH] Huh, didn't see that error coming --- .github/workflows/build-and-deploy-pages.yml | 3 --- CHANGELOG.md | 7 +++++++ src/thread.hh | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-deploy-pages.yml b/.github/workflows/build-and-deploy-pages.yml index 05c2c24..65a37d7 100644 --- a/.github/workflows/build-and-deploy-pages.yml +++ b/.github/workflows/build-and-deploy-pages.yml @@ -3,15 +3,12 @@ name: Build & Deploy Pages push: tags: - '[0-9]+.[0-9]+.[0-9]+' - workflow_dispatch: ~ jobs: build-wasm: name: Build wasm runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - fetch-tags: true - uses: numworks/setup-emscripten@bbc4f5e15974bc13e69fdadecfd1858ecb1c4dbb # there is no v1 tag/branch - name: Get emscripten version id: em-version diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c64758..e5bf42b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. See [Keep a ## Unreleased +## [1.8.1] - 2024-05-03 + +### Changed + +- Removed some `constexpr` annotations so the code compiles on macOS. + ## [1.8.0] - 2024-05-03 ### Added @@ -227,3 +233,4 @@ First versioned release. [1.6.2]: https://github.com/bbrk24/Trilangle/tree/1.6.2 [1.7.0]: https://github.com/bbrk24/Trilangle/tree/1.7.0 [1.8.0]: https://github.com/bbrk24/Trilangle/tree/1.8.0 +[1.8.1]: https://github.com/bbrk24/Trilangle/tree/1.8.1 diff --git a/src/thread.hh b/src/thread.hh index 65ff30c..ad8d92e 100644 --- a/src/thread.hh +++ b/src/thread.hh @@ -19,7 +19,7 @@ public: // Currently only called with T = std::vector and T = const std::vector&. // Generic to allow both move- and copy-construction. template - CONSTEXPR_VECTOR thread(const thread& other, direction d, T&& stack) noexcept : + thread(const thread& other, direction d, T&& stack) noexcept : program_walker(other.m_program), m_stack(std::forward(stack)), m_ip{ other.m_ip.coords, d }, @@ -29,11 +29,11 @@ public: advance(); } - CONSTEXPR_VECTOR thread(const thread& other, direction d) noexcept : thread(other, d, other.m_stack) {} + inline thread(const thread& other, direction d) noexcept : thread(other, d, other.m_stack) {} void tick(); protected: - CONSTEXPR_VECTOR thread(NONNULL_PTR(const program) p, flags f) noexcept : + inline thread(NONNULL_PTR(const program) p, flags f) noexcept : program_walker(p), m_stack(), m_ip{ { SIZE_C(0), SIZE_C(0) }, direction::southwest },