Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
submodules: true

# Setup python
- uses: actions/setup-python@v5
- uses: actions/setup-python@v7
if: ${{ matrix.proof }}
with:
python-version: "3.x"
Expand All @@ -59,11 +59,6 @@ jobs:
with:
cmake-version: "3.22.x"

# Setup Ninja
- name: Setup Ninja
uses: ashutoshvarma/setup-ninja@v1.1
with:
version: 1.13.0
# Create a build directory to store all the CMake generated files
- name: Create Build Environment
run: cmake -E make_directory ${{github.workspace}}/build
Expand Down Expand Up @@ -168,7 +163,6 @@ jobs:
cmake -E make_directory deps/inkcpp
cp ../../build/comp_cl/* deps/inkcpp/


# Run it
- name: Run Ink Proof
if: ${{ matrix.proof }}
Expand Down Expand Up @@ -211,7 +205,7 @@ jobs:
with:
submodules: true
- name: Set upt Python
uses: actions/setup-python@v5
uses: actions/setup-python@v7
with:
python-version: "3.x"
- name: install pyton libs
Expand Down Expand Up @@ -262,7 +256,7 @@ jobs:
with:
submodules: true
- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@v7
with:
python-version: "3.x"
- name: install build
Expand Down Expand Up @@ -334,12 +328,12 @@ jobs:
- uses: actions/checkout@v6

# Download Ink Proof page for Linux
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: linux-www
path: www/proof

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: doxygen
path: www
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

steps:
# Download Ink Proof Results from the triggering workflow run
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
pattern: result-*
path: "results"
Expand Down
13 changes: 13 additions & 0 deletions inkcpp/array.h
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,21 @@ void managed_array<T, dynamic, initialCapacity, simple>::extend(size_t capacity)
// type-puns between two classes with different vtbls here. Copying these elementwise would
// change the stored C++ type.
if (_dynamic_data) {

#ifdef _MSC_VER
# pragma warning(push)
# pragma warning(disable : 4201)
#else
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wclass-memaccess"
#endif
memcpy(new_data, _dynamic_data, sizeof(T) * _capacity);
delete[] reinterpret_cast<char*>(_dynamic_data);
#ifdef _MSC_VER
# pragma warning(pop)
#else
# pragma GCC diagnostic pop
#endif
}
} else {
// Allocate and copy typed data normally
Expand Down
2 changes: 1 addition & 1 deletion inkcpp/list_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* https://github.com/JBenda/inkcpp for full license details.
*/
#include "list_impl.h"
#include "list.h"
#include "./include/list.h"
#include "list_table.h"

namespace ink::runtime::internal
Expand Down
2 changes: 1 addition & 1 deletion inkcpp/list_table.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "config.h"
#include "system.h"
#include "array.h"
#include "list.h"
#include "./include/list.h"

#ifdef INK_ENABLE_STL
# include <iosfwd>
Expand Down
Loading