You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2016/02/06 03:08:23 UTC
mesos git commit: Fixed compilation on Ubuntu 15.
Repository: mesos
Updated Branches:
refs/heads/master 3500ce5a3 -> 4dbebcfaf
Fixed compilation on Ubuntu 15.
A few signed-unsigned comparisons introduced by
https://reviews.apache.org/r/42751/
Review: https://reviews.apache.org/r/43276/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4dbebcfa
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4dbebcfa
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4dbebcfa
Branch: refs/heads/master
Commit: 4dbebcfaf2e8c399b2343b932d19677790db020e
Parents: 3500ce5
Author: Joseph Wu <jo...@mesosphere.io>
Authored: Fri Feb 5 17:56:00 2016 -0800
Committer: Michael Park <mp...@apache.org>
Committed: Fri Feb 5 18:08:02 2016 -0800
----------------------------------------------------------------------
src/tests/resources_tests.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/4dbebcfa/src/tests/resources_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/resources_tests.cpp b/src/tests/resources_tests.cpp
index 3a33883..a190cc3 100644
--- a/src/tests/resources_tests.cpp
+++ b/src/tests/resources_tests.cpp
@@ -181,7 +181,7 @@ TEST(ResourcesTest, ParsingFromJSON)
ASSERT_EQ(Value::SCALAR, cpus->type());
EXPECT_EQ(45.55, cpus->scalar().value());
- EXPECT_EQ(1, cpuResources.size());
+ EXPECT_EQ(1u, cpuResources.size());
jsonString =
"["
@@ -953,7 +953,7 @@ TEST(ResourcesTest, ScalarAddition)
Resources sum = r1 + r2;
EXPECT_FALSE(sum.empty());
- EXPECT_EQ(2, sum.size());
+ EXPECT_EQ(2u, sum.size());
EXPECT_EQ(3, sum.get<Value::Scalar>("cpus").get().value());
EXPECT_EQ(15, sum.get<Value::Scalar>("mem").get().value());
@@ -961,7 +961,7 @@ TEST(ResourcesTest, ScalarAddition)
r += r2;
EXPECT_FALSE(r.empty());
- EXPECT_EQ(2, r.size());
+ EXPECT_EQ(2u, r.size());
EXPECT_EQ(3, r.get<Value::Scalar>("cpus").get().value());
EXPECT_EQ(15, r.get<Value::Scalar>("mem").get().value());
}
@@ -983,7 +983,7 @@ TEST(ResourcesTest, ScalarAddition2)
Resources sum = r1 + r2;
EXPECT_FALSE(sum.empty());
- EXPECT_EQ(2, sum.size());
+ EXPECT_EQ(2u, sum.size());
EXPECT_EQ(9, sum.cpus().get());
EXPECT_EQ(sum, Resources::parse("cpus(role1):6;cpus(role2):3").get());
}
@@ -1040,7 +1040,7 @@ TEST(ResourcesTest, ScalarSubtraction2)
Resources diff = r1 - r2;
EXPECT_FALSE(diff.empty());
- EXPECT_EQ(2, diff.size());
+ EXPECT_EQ(2u, diff.size());
EXPECT_EQ(7, diff.cpus().get());
EXPECT_EQ(diff, Resources::parse("cpus(role1):4;cpus(role2):3").get());
}