Repository: mesos Updated Branches: refs/heads/master c4df8f7b0 -> 51da8c4bf
Removed `const` in implicit conversion to `RepeatedPtrField<Resource>`. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7c38f297 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7c38f297 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7c38f297 Branch: refs/heads/master Commit: 7c38f297f11b2462bea87f8a24758bd7d63c41dd Parents: c4df8f7 Author: Michael Park <mp...@apache.org> Authored: Thu May 4 13:08:00 2017 -0700 Committer: Michael Park <mp...@apache.org> Committed: Thu May 25 18:25:28 2017 -0700 ---------------------------------------------------------------------- include/mesos/resources.hpp | 2 +- include/mesos/v1/resources.hpp | 2 +- src/common/resources.cpp | 2 +- src/v1/resources.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/7c38f297/include/mesos/resources.hpp ---------------------------------------------------------------------- diff --git a/include/mesos/resources.hpp b/include/mesos/resources.hpp index 74583e3..5d16a80 100644 --- a/include/mesos/resources.hpp +++ b/include/mesos/resources.hpp @@ -525,7 +525,7 @@ public: // a protocol buffer field. // Note that the google::protobuf::RepeatedPtrField<Resource> is // generated at runtime. - operator const google::protobuf::RepeatedPtrField<Resource>() const; + operator google::protobuf::RepeatedPtrField<Resource>() const; bool operator==(const Resources& that) const; bool operator!=(const Resources& that) const; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c38f297/include/mesos/v1/resources.hpp ---------------------------------------------------------------------- diff --git a/include/mesos/v1/resources.hpp b/include/mesos/v1/resources.hpp index 132ef3e..e1c3577 100644 --- a/include/mesos/v1/resources.hpp +++ b/include/mesos/v1/resources.hpp @@ -525,7 +525,7 @@ public: // a protocol buffer field. // Note that the google::protobuf::RepeatedPtrField<Resource> is // generated at runtime. - operator const google::protobuf::RepeatedPtrField<Resource>() const; + operator google::protobuf::RepeatedPtrField<Resource>() const; bool operator==(const Resources& that) const; bool operator!=(const Resources& that) const; http://git-wip-us.apache.org/repos/asf/mesos/blob/7c38f297/src/common/resources.cpp ---------------------------------------------------------------------- diff --git a/src/common/resources.cpp b/src/common/resources.cpp index 1d07f1a..03e85ec 100644 --- a/src/common/resources.cpp +++ b/src/common/resources.cpp @@ -1695,7 +1695,7 @@ Option<Resources> Resources::find(const Resource& target) const // Overloaded operators. ///////////////////////////////////////////////// -Resources::operator const RepeatedPtrField<Resource>() const +Resources::operator RepeatedPtrField<Resource>() const { RepeatedPtrField<Resource> all; foreach(const Resource& resource, resources) { http://git-wip-us.apache.org/repos/asf/mesos/blob/7c38f297/src/v1/resources.cpp ---------------------------------------------------------------------- diff --git a/src/v1/resources.cpp b/src/v1/resources.cpp index 1bb5d07..46a63a0 100644 --- a/src/v1/resources.cpp +++ b/src/v1/resources.cpp @@ -1697,7 +1697,7 @@ Option<Resources> Resources::find(const Resource& target) const // Overloaded operators. ///////////////////////////////////////////////// -Resources::operator const RepeatedPtrField<Resource>() const +Resources::operator RepeatedPtrField<Resource>() const { RepeatedPtrField<Resource> all; foreach(const Resource& resource, resources) {
