You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2017/01/09 23:44:47 UTC
mesos git commit: Removed unsupported `friend` declaration.
Repository: mesos
Updated Branches:
refs/heads/master 40794cf3e -> b492d4458
Removed unsupported `friend` declaration.
The `friend` class declaration of nested, templated classes will raise
an error when compiling with Clang. This is a temporary fix, resolved by
making the constructor of `ControlFlow` public.
Review: https://reviews.apache.org/r/55339/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b492d445
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b492d445
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b492d445
Branch: refs/heads/master
Commit: b492d4458c97b5e025e96ca229bc87a6e2500b40
Parents: 40794cf
Author: Jan Schlicht <ja...@mesosphere.io>
Authored: Mon Jan 9 15:39:21 2017 -0800
Committer: Michael Park <mp...@apache.org>
Committed: Mon Jan 9 15:44:13 2017 -0800
----------------------------------------------------------------------
3rdparty/libprocess/include/process/loop.hpp | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b492d445/3rdparty/libprocess/include/process/loop.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/loop.hpp b/3rdparty/libprocess/include/process/loop.hpp
index 53f6243..8bd9715 100644
--- a/3rdparty/libprocess/include/process/loop.hpp
+++ b/3rdparty/libprocess/include/process/loop.hpp
@@ -202,6 +202,8 @@ public:
T t;
};
+ ControlFlow(Statement s, Option<T> t) : s(s), t(std::move(t)) {}
+
Statement statement() const { return s; }
T& value() & { return t.get(); }
@@ -210,14 +212,6 @@ public:
const T&& value() const && { return t.get(); }
private:
- template <typename U>
- friend class ControlFlow<U>::Continue;
- template <typename U>
- friend class ControlFlow<U>::Break;
-
- ControlFlow(Statement s, Option<T> t)
- : s(s), t(std::move(t)) {}
-
Statement s;
Option<T> t;
};