From 98a15bbf8ebe5a40f5098ebe95abcc04c2bd05b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20L=C3=BChne?= Date: Wed, 25 May 2016 23:01:42 +0200 Subject: [PATCH 1/2] Removed gtest package from Travis configuration to properly use the git submodule instead. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5c55ae6..67a336a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,10 @@ matrix: packages: - g++-5 - libboost1.55-all-dev - - libgtest-dev env: COMPILER=g++-5 script: + - git submodule init + - git submodule update - mkdir build - cd build - cmake .. -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON -DCMAKE_CXX_COMPILER=$COMPILER From 045239b6201296cbb3fd1a4b67e4f2b83221f30d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20L=C3=BChne?= Date: Wed, 25 May 2016 23:22:25 +0200 Subject: [PATCH 2/2] Fixed wrong operator in debug output. --- include/plasp/sas/Debugging.h | 2 +- src/plasp/sas/Debugging.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/plasp/sas/Debugging.h b/include/plasp/sas/Debugging.h index 3f8f778..811ec13 100644 --- a/include/plasp/sas/Debugging.h +++ b/include/plasp/sas/Debugging.h @@ -16,7 +16,7 @@ namespace sas // //////////////////////////////////////////////////////////////////////////////////////////////////// -std::ostream &operator >>(std::ostream &ostream, const Description &description); +std::ostream &operator <<(std::ostream &ostream, const Description &description); //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/plasp/sas/Debugging.cpp b/src/plasp/sas/Debugging.cpp index f84e8c1..1fb2ffa 100644 --- a/src/plasp/sas/Debugging.cpp +++ b/src/plasp/sas/Debugging.cpp @@ -13,7 +13,7 @@ namespace sas // //////////////////////////////////////////////////////////////////////////////////////////////////// -std::ostream &operator >>(std::ostream &ostream, const Description &description) +std::ostream &operator <<(std::ostream &ostream, const Description &description) { // Metric section ostream << "uses action costs: " << (description.usesActionCosts() ? "yes" : "no") << std::endl;