You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2018/08/07 22:35:40 UTC
[mesos] branch master updated: Removed unused operator overloads in
`Resources`.
This is an automated email from the ASF dual-hosted git repository.
bmahler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
The following commit(s) were added to refs/heads/master by this push:
new 2116a3e Removed unused operator overloads in `Resources`.
2116a3e is described below
commit 2116a3e95db60a1023ca4d65c7d62bd99c561bb3
Author: Meng Zhu <mz...@mesosphere.io>
AuthorDate: Tue Aug 7 15:35:15 2018 -0700
Removed unused operator overloads in `Resources`.
`Resources::operator+(Resource_)` (and minus counterparts) are
currently not used. This patch removes these overloads.
Review: https://reviews.apache.org/r/68262/
---
include/mesos/resources.hpp | 4 ----
include/mesos/v1/resources.hpp | 4 ----
src/common/resources.cpp | 24 ------------------------
src/v1/resources.cpp | 24 ------------------------
4 files changed, 56 deletions(-)
diff --git a/include/mesos/resources.hpp b/include/mesos/resources.hpp
index 6d81d0e..6f81b14 100644
--- a/include/mesos/resources.hpp
+++ b/include/mesos/resources.hpp
@@ -668,13 +668,9 @@ private:
void add(Resource_&& r);
void subtract(const Resource_& r);
- Resources operator+(const Resource_& that) const;
Resources& operator+=(const Resource_& that);
-
- Resources operator+(Resource_&& that) const;
Resources& operator+=(Resource_&& that);
- Resources operator-(const Resource_& that) const;
Resources& operator-=(const Resource_& that);
std::vector<Resource_> resources;
diff --git a/include/mesos/v1/resources.hpp b/include/mesos/v1/resources.hpp
index f34f38f..0911053 100644
--- a/include/mesos/v1/resources.hpp
+++ b/include/mesos/v1/resources.hpp
@@ -662,13 +662,9 @@ private:
void add(Resource_&& r);
void subtract(const Resource_& r);
- Resources operator+(const Resource_& that) const;
Resources& operator+=(const Resource_& that);
-
- Resources operator+(Resource_&& that) const;
Resources& operator+=(Resource_&& that);
- Resources operator-(const Resource_& that) const;
Resources& operator-=(const Resource_& that);
std::vector<Resource_> resources;
diff --git a/src/common/resources.cpp b/src/common/resources.cpp
index cef2acd..0110c0e 100644
--- a/src/common/resources.cpp
+++ b/src/common/resources.cpp
@@ -2003,22 +2003,6 @@ bool Resources::operator!=(const Resources& that) const
}
-Resources Resources::operator+(const Resource_& that) const
-{
- Resources result = *this;
- result += that;
- return result;
-}
-
-
-Resources Resources::operator+(Resource_&& that) const
-{
- Resources result = *this;
- result += std::move(that);
- return result;
-}
-
-
Resources Resources::operator+(const Resource& that) const &
{
Resources result = *this;
@@ -2183,14 +2167,6 @@ Resources& Resources::operator+=(Resources&& that)
}
-Resources Resources::operator-(const Resource_& that) const
-{
- Resources result = *this;
- result -= that;
- return result;
-}
-
-
Resources Resources::operator-(const Resource& that) const
{
Resources result = *this;
diff --git a/src/v1/resources.cpp b/src/v1/resources.cpp
index aa775bd..228a732 100644
--- a/src/v1/resources.cpp
+++ b/src/v1/resources.cpp
@@ -2010,22 +2010,6 @@ bool Resources::operator!=(const Resources& that) const
}
-Resources Resources::operator+(const Resource_& that) const
-{
- Resources result = *this;
- result += that;
- return result;
-}
-
-
-Resources Resources::operator+(Resource_&& that) const
-{
- Resources result = *this;
- result += std::move(that);
- return result;
-}
-
-
Resources Resources::operator+(const Resource& that) const &
{
Resources result = *this;
@@ -2190,14 +2174,6 @@ Resources& Resources::operator+=(Resources&& that)
}
-Resources Resources::operator-(const Resource_& that) const
-{
- Resources result = *this;
- result -= that;
- return result;
-}
-
-
Resources Resources::operator-(const Resource& that) const
{
Resources result = *this;