[4/6] mesos git commit: Added the ability to devolve v1 Resources.

[bm...@apache.org]

Added the ability to devolve v1 Resources.

Review: https://reviews.apache.org/r/55827


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8d41ca4a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8d41ca4a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8d41ca4a

Branch: refs/heads/master
Commit: 8d41ca4a395ed355604b54fea14cca464f768277
Parents: ce14cd4
Author: Benjamin Mahler <bm...@apache.org>
Authored: Fri Jan 20 18:37:58 2017 -0800
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Thu Jan 26 16:37:37 2017 -0800

----------------------------------------------------------------------
 src/internal/devolve.cpp | 15 +++++++++++++++
 src/internal/devolve.hpp |  4 ++++
 2 files changed, 19 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/8d41ca4a/src/internal/devolve.cpp
----------------------------------------------------------------------
diff --git a/src/internal/devolve.cpp b/src/internal/devolve.cpp
index a49171a..73774d9 100644
--- a/src/internal/devolve.cpp
+++ b/src/internal/devolve.cpp
@@ -20,6 +20,8 @@
 
 using std::string;
 
+using google::protobuf::RepeatedPtrField;
+
 namespace mesos {
 namespace internal {
 
@@ -102,6 +104,19 @@ Offer devolve(const v1::Offer& offer)
 }
 
 
+Resource devolve(const v1::Resource& resource)
+{
+  return devolve<Resource>(resource);
+}
+
+
+Resources devolve(const v1::Resources& resources)
+{
+  return devolve<Resource>(
+      static_cast<const RepeatedPtrField<v1::Resource>&>(resources));
+}
+
+
 SlaveID devolve(const v1::AgentID& agentId)
 {
   // NOTE: Not using 'devolve<v1::AgentID, SlaveID>(agentId)' since

http://git-wip-us.apache.org/repos/asf/mesos/blob/8d41ca4a/src/internal/devolve.hpp
----------------------------------------------------------------------
diff --git a/src/internal/devolve.hpp b/src/internal/devolve.hpp
index 6d9503d..a8c5007 100644
--- a/src/internal/devolve.hpp
+++ b/src/internal/devolve.hpp
@@ -22,6 +22,7 @@
 #include <mesos/agent/agent.hpp>
 
 #include <mesos/mesos.hpp>
+#include <mesos/resources.hpp>
 
 #include <mesos/executor/executor.hpp>
 
@@ -30,6 +31,7 @@
 #include <mesos/scheduler/scheduler.hpp>
 
 #include <mesos/v1/mesos.hpp>
+#include <mesos/v1/resources.hpp>
 
 #include <mesos/v1/agent/agent.hpp>
 
@@ -54,6 +56,8 @@ FrameworkInfo devolve(const v1::FrameworkInfo& frameworkInfo);
 HealthCheck devolve(const v1::HealthCheck& check);
 InverseOffer devolve(const v1::InverseOffer& inverseOffer);
 Offer devolve(const v1::Offer& offer);
+Resource devolve(const v1::Resource& resource);
+Resources devolve(const v1::Resources& resources);
 SlaveID devolve(const v1::AgentID& agentId);
 SlaveInfo devolve(const v1::AgentInfo& agentInfo);
 TaskID devolve(const v1::TaskID& taskId);