VKVM/library
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev' into 'master'

Browse Source 
Final Merge

See merge request link/projekte/ws19/vkvm-new/library!5
This commit is contained in:
Julian Hinxlage 2020-01-09 06:51:12 +00:00
commit 397982e59a
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -22,7 +22,7 @@ make_test:
- docker-ci - docker-ci
script: script:
- apt-get update - 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 - git clone https://github.com/catchorg/Catch2.git
- cd Catch2 - cd Catch2
- cmake -Bbuild -H. -DBUILD_TESTING=OFF - cmake -Bbuild -H. -DBUILD_TESTING=OFF
@ -40,7 +40,7 @@ cmake_build:
- docker-ci - docker-ci
script: script:
- apt-get update - 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 - git clone https://github.com/catchorg/Catch2.git
- cd Catch2 - cd Catch2
- cmake -Bbuild -H. -DBUILD_TESTING=OFF - cmake -Bbuild -H. -DBUILD_TESTING=OFF

3
CMakeLists.txt
View File

@ -8,6 +8,9 @@ if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
endif() endif()
set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "bin" "doc" "CMakeFiles" "lib" "include") 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) project(library)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)

2
src/vkvm.cpp
View File

@ -187,6 +187,8 @@ namespace vkvm {
} }
auto reset() -> void { auto reset() -> void {
impl.sharedMemory = nullptr;
impl.localSharedMemory.clear();
setDefaultValues(); setDefaultValues();
} }