Skip to content

Commit

Permalink
update workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
RedSkittleFox committed Jan 20, 2024
1 parent 2c14832 commit e174ddc
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cmake-clang-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ jobs:
- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: cmake -B ${{github.workspace}}/build -T ClangCL -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
run: cmake -B ${{github.workspace}}/build -G "Visual Studio 17 2022" -T ClangCL -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}

- name: Build
# Build your program with the given configuration
run: cmake --build ${{github.workspace}}/build -T ClangCL --config ${{env.BUILD_TYPE}}
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

- name: Test
working-directory: ${{github.workspace}}/build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cmake-gcc-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
run: cmake -B ${{github.workspace}}/build -DCMAKE_CXX_COMPILER=g++ -DCMAKE_C_COMPILER=gcc -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}

- name: Build
# Build your program with the given configuration
Expand Down
6 changes: 2 additions & 4 deletions include/fox/serialize.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <span>
#include <ranges>
#include <vector>
#include <format>
#include <variant>
#include <memory_resource>

Expand Down Expand Up @@ -784,9 +783,8 @@ namespace fox::serialize
{
if (size != std::size(value))
{
throw std::out_of_range(std::format("Trying to read ranges ({} elements) of a different size than the array ({} elements).",
size, std::size(value))
);
throw std::out_of_range("Trying to read ranges (" + std::to_string(size) + " elements) of a different size than the array (" +
std::to_string(std::size(value)) + " elements).");
}

// Memcpy array
Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ add_executable(

if(MSVC)
target_compile_options(
serialize-test
serialize-test
PRIVATE /W4
PRIVATE /MP
PRIVATE /arch:AVX2
Expand Down

0 comments on commit e174ddc

Please sign in to comment.