From d7f101250998ab2e57a85d066cf89a0485062d0d Mon Sep 17 00:00:00 2001 From: dehnert Date: Mon, 10 Aug 2015 19:37:37 +0200 Subject: [PATCH] got rid of more warnings Former-commit-id: 514624a4b1cc2a423fd1572b25e5307c38702424 --- .../log4cplus-1.1.3-rc1/src/CMakeLists.txt | 2 +- .../MaximalEndComponentDecompositionTest.cpp | 4 ++-- ...glyConnectedComponentDecompositionTest.cpp | 24 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/resources/3rdparty/log4cplus-1.1.3-rc1/src/CMakeLists.txt b/resources/3rdparty/log4cplus-1.1.3-rc1/src/CMakeLists.txt index 44ff45da4..a70f5c5d2 100644 --- a/resources/3rdparty/log4cplus-1.1.3-rc1/src/CMakeLists.txt +++ b/resources/3rdparty/log4cplus-1.1.3-rc1/src/CMakeLists.txt @@ -76,7 +76,7 @@ if (WIN32) endif (WIN32) if(CMAKE_COMPILER_IS_GNUCC) - # nothing to do in this case + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable") else(CLANG) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable") endif() diff --git a/test/performance/storage/MaximalEndComponentDecompositionTest.cpp b/test/performance/storage/MaximalEndComponentDecompositionTest.cpp index 2dc879341..7af8bdb2c 100644 --- a/test/performance/storage/MaximalEndComponentDecompositionTest.cpp +++ b/test/performance/storage/MaximalEndComponentDecompositionTest.cpp @@ -11,7 +11,7 @@ TEST(MaximalEndComponentDecomposition, AsynchronousLeader) { storm::storage::MaximalEndComponentDecomposition mecDecomposition; ASSERT_NO_THROW(mecDecomposition = storm::storage::MaximalEndComponentDecomposition(*mdp)); - ASSERT_EQ(7, mecDecomposition.size()); + ASSERT_EQ(7ul, mecDecomposition.size()); mdp = nullptr; } @@ -22,6 +22,6 @@ TEST(MaximalEndComponentDecomposition, Consensus) { storm::storage::MaximalEndComponentDecomposition mecDecomposition; ASSERT_NO_THROW(mecDecomposition = storm::storage::MaximalEndComponentDecomposition(*mdp)); - ASSERT_EQ(384, mecDecomposition.size()); + ASSERT_EQ(384ul, mecDecomposition.size()); mdp = nullptr; } diff --git a/test/performance/storage/StronglyConnectedComponentDecompositionTest.cpp b/test/performance/storage/StronglyConnectedComponentDecompositionTest.cpp index 1a368b807..9f4f0ad5c 100644 --- a/test/performance/storage/StronglyConnectedComponentDecompositionTest.cpp +++ b/test/performance/storage/StronglyConnectedComponentDecompositionTest.cpp @@ -12,13 +12,13 @@ TEST(StronglyConnectedComponentDecomposition, Crowds) { storm::storage::StronglyConnectedComponentDecomposition sccDecomposition; ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition(*dtmc)); - ASSERT_EQ(1290297ull, sccDecomposition.size()); + ASSERT_EQ(1290297ul, sccDecomposition.size()); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition(*dtmc, true)); - ASSERT_EQ(437690, sccDecomposition.size()); + ASSERT_EQ(437690ul, sccDecomposition.size()); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition(*dtmc, true, true)); - ASSERT_EQ(425040, sccDecomposition.size()); + ASSERT_EQ(425040ul, sccDecomposition.size()); dtmc = nullptr; } @@ -30,13 +30,13 @@ TEST(StronglyConnectedComponentDecomposition, SynchronousLeader) { storm::storage::StronglyConnectedComponentDecomposition sccDecomposition; ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition(*dtmc)); - ASSERT_EQ(2611835, sccDecomposition.size()); + ASSERT_EQ(2611835ul, sccDecomposition.size()); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition(*dtmc, true)); - ASSERT_EQ(2, sccDecomposition.size()); + ASSERT_EQ(2ul, sccDecomposition.size()); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition(*dtmc, true, true)); - ASSERT_EQ(1, sccDecomposition.size()); + ASSERT_EQ(1ul, sccDecomposition.size()); dtmc = nullptr; } @@ -48,13 +48,13 @@ TEST(StronglyConnectedComponentDecomposition, AsynchronousLeader) { storm::storage::StronglyConnectedComponentDecomposition sccDecomposition; ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition(*mdp)); - ASSERT_EQ(1461930, sccDecomposition.size()); + ASSERT_EQ(1461930ul, sccDecomposition.size()); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition(*mdp, true)); - ASSERT_EQ(127, sccDecomposition.size()); + ASSERT_EQ(127ul, sccDecomposition.size()); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition(*mdp, true, true)); - ASSERT_EQ(7, sccDecomposition.size()); + ASSERT_EQ(7ul, sccDecomposition.size()); mdp = nullptr; } @@ -66,13 +66,13 @@ TEST(StronglyConnectedComponentDecomposition, Consensus) { storm::storage::StronglyConnectedComponentDecomposition sccDecomposition; ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition(*mdp)); - ASSERT_EQ(121251, sccDecomposition.size()); + ASSERT_EQ(121251ul, sccDecomposition.size()); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition(*mdp, true)); - ASSERT_EQ(1049, sccDecomposition.size()); + ASSERT_EQ(1049ul, sccDecomposition.size()); ASSERT_NO_THROW(sccDecomposition = storm::storage::StronglyConnectedComponentDecomposition(*mdp, true, true)); - ASSERT_EQ(384, sccDecomposition.size()); + ASSERT_EQ(384ul, sccDecomposition.size()); mdp = nullptr; }