Removed unneeded Resources::add/remove(const Resource&).

We can remove these given that they already call `Resources::add/remove(const Resource_&)` internally and a Resource is implicitly convertible to a Resource_. Review: https://reviews.apache.org/r/51850
apache · Sep 13, 2016 · c09214e · c09214e
1 parent 87e7088
commit c09214e
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 40 deletions.
diff --git a/include/mesos/resources.hpp b/include/mesos/resources.hpp
@@ -500,14 +500,6 @@ class Resources
   // returns Resources.
   Option<Resources> find(const Resource& target) const;
 
-  // Validation-free versions of += and -= `Resource` operators.
-  // These can be used when `r` is already validated.
-  void add(const Resource& r);
-  void subtract(const Resource& r);
-
-  // The add and subtract methods and operators on Resource_ are only
-  // allowed from within Resources class so we hide them.
-
   // Validation-free versions of += and -= `Resource_` operators.
   // These can be used when `r` is already validated.
   void add(const Resource_& r);

diff --git a/include/mesos/v1/resources.hpp b/include/mesos/v1/resources.hpp
@@ -500,14 +500,6 @@ class Resources
   // returns Resources.
   Option<Resources> find(const Resource& target) const;
 
-  // Validation-free versions of += and -= `Resource` operators.
-  // These can be used when `r` is already validated.
-  void add(const Resource& r);
-  void subtract(const Resource& r);
-
-  // The add and subtract methods and operators on Resource_ are only
-  // allowed from within Resources class so we hide them.
-
   // Validation-free versions of += and -= `Resource_` operators.
   // These can be used when `r` is already validated.
   void add(const Resource_& r);

diff --git a/src/common/resources.cpp b/src/common/resources.cpp
@@ -1597,12 +1597,6 @@ void Resources::add(const Resource_& that)
 }
 
 
-void Resources::add(const Resource& that)
-{
-  add(Resource_(that));
-}
-
-
 Resources& Resources::operator+=(const Resource_& that)
 {
   if (that.validate().isNone()) {
@@ -1695,12 +1689,6 @@ void Resources::subtract(const Resource_& that)
 }
 
 
-void Resources::subtract(const Resource& that)
-{
-  subtract(Resource_(that));
-}
-
-
 Resources& Resources::operator-=(const Resource_& that)
 {
   if (that.validate().isNone()) {

diff --git a/src/v1/resources.cpp b/src/v1/resources.cpp
@@ -1600,12 +1600,6 @@ void Resources::add(const Resource_& that)
 }
 
 
-void Resources::add(const Resource& that)
-{
-  add(Resource_(that));
-}
-
-
 Resources& Resources::operator+=(const Resource_& that)
 {
   if (that.validate().isNone()) {
@@ -1698,12 +1692,6 @@ void Resources::subtract(const Resource_& that)
 }
 
 
-void Resources::subtract(const Resource& that)
-{
-  subtract(Resource_(that));
-}
-
-
 Resources& Resources::operator-=(const Resource_& that)
 {
   if (that.validate().isNone()) {