From 0e5cc4bf7a5e1e690b73b028839def1be53fce98 Mon Sep 17 00:00:00 2001 From: Andreas Stallinger Date: Tue, 21 Feb 2017 17:46:09 +0100 Subject: [PATCH] build: fix build on Unix systems * throw std::exception replaced with throw error * MANAGER to Manager in CMakelists --- .gitlab-ci.yml | 18 ++---------------- src/lib/CMakeLists.txt | 4 ++-- src/lib/utility/interprocess/SharedQueue.h | 2 +- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6ecc13e..0192f439 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,22 +3,7 @@ Linux64: stage: deploy only: - master - script: - - ./script/setup.sh - - ./script/buildonly.sh all - - ./script/buildonly.sh package - - ./build/Release/app/Coati --licenseFile ./setup/license.txt - - cd ./bin/test - - ../../build/Release/test/Coati_test - artifacts: - paths: - - distr/Coati*.tar.gz - expire_in: 3 days - -Linux64_manual: - image: st4ll1/coati_linux_64 - stage: deploy - when: manual + - triggers script: - ./script/setup.sh - ./script/buildonly.sh all @@ -52,6 +37,7 @@ Linux32: stage: deploy only: - master + - triggers script: - ./script/setup.sh - ./script/buildonly.sh all diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index c9412ebb..4e77dc28 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -249,8 +249,8 @@ add_files( utility/interprocess/SharedParserArguments.cpp utility/interprocess/SharedParserArguments.h utility/interprocess/SharedQueue.h - utility/interprocess/SharedUUIDMANAGER.cpp - utility/interprocess/SharedUUIDMANAGER.h + utility/interprocess/SharedUUIDManager.cpp + utility/interprocess/SharedUUIDManager.h utility/logging/ConsoleLogger.cpp utility/logging/ConsoleLogger.h diff --git a/src/lib/utility/interprocess/SharedQueue.h b/src/lib/utility/interprocess/SharedQueue.h index 2b43dda2..3046eb5a 100644 --- a/src/lib/utility/interprocess/SharedQueue.h +++ b/src/lib/utility/interprocess/SharedQueue.h @@ -103,7 +103,7 @@ T SharedQueue::popValue() } else { - throw(std::exception("Deque was not initialized")); + throw(std::runtime_error("Deque was not initialized")); } }