Fixed a compilation error on gcc-4.4. Review: https://reviews.apache.org/r/28357
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d9dd0796 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d9dd0796 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d9dd0796 Branch: refs/heads/master Commit: d9dd0796070786fa3d90d6849a5e6abc6a3c5efc Parents: b0efdfe Author: Jie Yu <[email protected]> Authored: Fri Nov 21 17:10:46 2014 -0800 Committer: Jie Yu <[email protected]> Committed: Fri Nov 21 17:10:58 2014 -0800 ---------------------------------------------------------------------- src/slave/containerizer/isolator.hpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/d9dd0796/src/slave/containerizer/isolator.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolator.hpp b/src/slave/containerizer/isolator.hpp index bdcf7a9..e82a142 100644 --- a/src/slave/containerizer/isolator.hpp +++ b/src/slave/containerizer/isolator.hpp @@ -41,10 +41,10 @@ namespace slave { // Forward declaration. class IsolatorProcess; -// Information when an executor is impacted by a resource limitation and should -// be terminated. Intended to support resources like memory where the Linux -// kernel may invoke the OOM killer, killing some/all of a container's -// processes. +// Information when an executor is impacted by a resource limitation +// and should be terminated. Intended to support resources like memory +// where the Linux kernel may invoke the OOM killer, killing some/all +// of a container's processes. struct Limitation { Limitation( @@ -54,9 +54,10 @@ struct Limitation message(_message) {} // Resource (type and value) that triggered the limitation. - const Resource resource; + Resource resource; + // Description of the limitation. - const std::string message; + std::string message; };
