From fcecd68702f48a8b9f2a07d933a50d42a83c0399 Mon Sep 17 00:00:00 2001 From: Julian Hinxlage Date: Wed, 8 Jan 2020 12:11:15 +0100 Subject: [PATCH 1/3] reset shared memory if reset() is called --- src/vkvm.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/vkvm.cpp b/src/vkvm.cpp index 5c03457..23066b3 100644 --- a/src/vkvm.cpp +++ b/src/vkvm.cpp @@ -187,6 +187,8 @@ namespace vkvm { } auto reset() -> void { + impl.sharedMemory = nullptr; + impl.localSharedMemory.clear(); setDefaultValues(); } From ea6d685df48a6d53c5afce591d2357ea2272faf0 Mon Sep 17 00:00:00 2001 From: "@Nurullah.Damla" Date: Wed, 8 Jan 2020 13:15:27 +0100 Subject: [PATCH 2/3] add for MACOS --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e7c069..31eb3d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,9 @@ if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}") endif() set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "bin" "doc" "CMakeFiles" "lib" "include") +set(CMAKE_C_COMPILER "clang") +set(CMAKE_CXX_COMPILER "clang++") + project(library) set(CMAKE_CXX_STANDARD 14) From a4d2bf8b75bb89e95220e53128a3a0a404b86e36 Mon Sep 17 00:00:00 2001 From: Johannes Theiner Date: Wed, 8 Jan 2020 16:36:56 +0000 Subject: [PATCH 3/3] ~use clang instead of g++ --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52e2f38..a8359dd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ make_test: - docker-ci script: - apt-get update - - apt-get install -y g++ make cmake clang-tidy + - apt-get install -y clang make cmake clang-tidy - git clone https://github.com/catchorg/Catch2.git - cd Catch2 - cmake -Bbuild -H. -DBUILD_TESTING=OFF @@ -40,7 +40,7 @@ cmake_build: - docker-ci script: - apt-get update - - apt-get install -y g++ make cmake clang-tidy + - apt-get install -y clang make cmake clang-tidy - git clone https://github.com/catchorg/Catch2.git - cd Catch2 - cmake -Bbuild -H. -DBUILD_TESTING=OFF