build: fix build on Unix systems

* throw std::exception replaced with throw error
* MANAGER to Manager in CMakelists
This commit is contained in:
Andreas Stallinger
2017-02-21 17:46:09 +01:00
parent 1fbc16e098
commit 0e5cc4bf7a
3 changed files with 5 additions and 19 deletions
+2 -16
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -103,7 +103,7 @@ T SharedQueue<T>::popValue()
}
else
{
throw(std::exception("Deque was not initialized"));
throw(std::runtime_error("Deque was not initialized"));
}
}