You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2015/12/02 23:36:16 UTC
mesos git commit: Removed extraneous std:: namespace in
"resources.cpp"
Repository: mesos
Updated Branches:
refs/heads/master ed936bebe -> 69cbf02d2
Removed extraneous std:: namespace in "resources.cpp"
Review: https://reviews.apache.org/r/40524
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/69cbf02d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/69cbf02d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/69cbf02d
Branch: refs/heads/master
Commit: 69cbf02d23d0cf2a212366b081e7ae17295479a8
Parents: ed936be
Author: Guangya Liu <gy...@gmail.com>
Authored: Wed Dec 2 17:31:59 2015 -0500
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Wed Dec 2 17:34:56 2015 -0500
----------------------------------------------------------------------
src/common/resources.cpp | 2 +-
src/v1/resources.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/69cbf02d/src/common/resources.cpp
----------------------------------------------------------------------
diff --git a/src/common/resources.cpp b/src/common/resources.cpp
index b5847db..0a65748 100644
--- a/src/common/resources.cpp
+++ b/src/common/resources.cpp
@@ -641,7 +641,7 @@ bool Resources::isPersistentVolume(const Resource& resource)
bool Resources::isReserved(
const Resource& resource,
- const Option<std::string>& role)
+ const Option<string>& role)
{
if (role.isSome()) {
return !isUnreserved(resource) && role.get() == resource.role();
http://git-wip-us.apache.org/repos/asf/mesos/blob/69cbf02d/src/v1/resources.cpp
----------------------------------------------------------------------
diff --git a/src/v1/resources.cpp b/src/v1/resources.cpp
index bcaeb9f..90830c9 100644
--- a/src/v1/resources.cpp
+++ b/src/v1/resources.cpp
@@ -636,7 +636,7 @@ bool Resources::isPersistentVolume(const Resource& resource)
bool Resources::isReserved(
const Resource& resource,
- const Option<std::string>& role)
+ const Option<string>& role)
{
if (role.isSome()) {
return !isUnreserved(resource) && role.get() == resource.role();