Cleaned up internal evolve functions. This patch removes the `mesos::` prefix from declarations where possible, uses a consistent number of empty lines in the header, and reorders some declarations.
Review: https://reviews.apache.org/r/66489/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c265ae60 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c265ae60 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c265ae60 Branch: refs/heads/master Commit: c265ae60b9976d16e74736704f8005029d4137a8 Parents: 50b315a Author: Gaston Kleiman <[email protected]> Authored: Mon Apr 23 13:43:26 2018 -0700 Committer: Greg Mann <[email protected]> Committed: Mon Apr 23 13:48:21 2018 -0700 ---------------------------------------------------------------------- src/internal/evolve.cpp | 11 +++++------ src/internal/evolve.hpp | 18 ++++++++++-------- 2 files changed, 15 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/c265ae60/src/internal/evolve.cpp ---------------------------------------------------------------------- diff --git a/src/internal/evolve.cpp b/src/internal/evolve.cpp index 6e8bf6a..5ef5838 100644 --- a/src/internal/evolve.cpp +++ b/src/internal/evolve.cpp @@ -217,19 +217,19 @@ v1::UUID evolve(const UUID& uuid) } -v1::agent::Call evolve(const mesos::agent::Call& call) +v1::agent::Call evolve(const agent::Call& call) { return evolve<v1::agent::Call>(call); } -v1::agent::ProcessIO evolve(const mesos::agent::ProcessIO& processIO) +v1::agent::ProcessIO evolve(const agent::ProcessIO& processIO) { return evolve<v1::agent::ProcessIO>(processIO); } -v1::agent::Response evolve(const mesos::agent::Response& response) +v1::agent::Response evolve(const agent::Response& response) { return evolve<v1::agent::Response>(response); } @@ -253,14 +253,13 @@ v1::master::Response evolve(const mesos::master::Response& response) } -v1::resource_provider::Call evolve(const mesos::resource_provider::Call& call) +v1::resource_provider::Call evolve(const resource_provider::Call& call) { return evolve<v1::resource_provider::Call>(call); } -v1::resource_provider::Event evolve( - const mesos::resource_provider::Event& event) +v1::resource_provider::Event evolve(const resource_provider::Event& event) { return evolve<v1::resource_provider::Event>(event); } http://git-wip-us.apache.org/repos/asf/mesos/blob/c265ae60/src/internal/evolve.hpp ---------------------------------------------------------------------- diff --git a/src/internal/evolve.hpp b/src/internal/evolve.hpp index 388c4f8..e792ff5 100644 --- a/src/internal/evolve.hpp +++ b/src/internal/evolve.hpp @@ -84,20 +84,19 @@ v1::TaskInfo evolve(const TaskInfo& taskInfo); v1::TaskStatus evolve(const TaskStatus& status); v1::UUID evolve(const UUID& uuid); -v1::agent::Call evolve(const mesos::agent::Call& call); -v1::agent::ProcessIO evolve(const mesos::agent::ProcessIO& processIO); -v1::agent::Response evolve(const mesos::agent::Response& response); + +v1::agent::Call evolve(const agent::Call& call); +v1::agent::ProcessIO evolve(const agent::ProcessIO& processIO); +v1::agent::Response evolve(const agent::Response& response); + v1::maintenance::ClusterStatus evolve( const maintenance::ClusterStatus& cluster); v1::maintenance::Schedule evolve(const maintenance::Schedule& schedule); -v1::master::Response evolve(const mesos::master::Response& response); - -v1::resource_provider::Call evolve(const mesos::resource_provider::Call& call); -v1::resource_provider::Event evolve( - const mesos::resource_provider::Event& event); +v1::resource_provider::Call evolve(const resource_provider::Call& call); +v1::resource_provider::Event evolve(const resource_provider::Event& event); // Helper for repeated field evolving to 'T1' from 'T2'. @@ -135,6 +134,7 @@ v1::scheduler::Event evolve(const RescindResourceOfferMessage& message); v1::scheduler::Event evolve(const StatusUpdateMessage& message); v1::scheduler::Event evolve(const UpdateOperationStatusMessage& message); + v1::executor::Call evolve(const executor::Call& call); v1::executor::Event evolve(const executor::Event& event); @@ -150,6 +150,7 @@ v1::executor::Event evolve(const StatusUpdateAcknowledgementMessage& message); v1::master::Event evolve(const mesos::master::Event& event); +v1::master::Response evolve(const mesos::master::Response& response); // Before the v1 API we had REST endpoints that returned JSON. The JSON was not @@ -170,6 +171,7 @@ v1::master::Response evolve(const JSON::Object& object); template <v1::agent::Response::Type T> v1::agent::Response evolve(const JSON::Object& object); + template <v1::agent::Response::Type T> v1::agent::Response evolve(const JSON::Array& array);
