You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2017/07/11 01:39:30 UTC
[44/50] mesos git commit: Windows: Updated job object name types to
`wstring`.
Windows: Updated job object name types to `wstring`.
Review: https://reviews.apache.org/r/60341/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/fd40752f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/fd40752f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/fd40752f
Branch: refs/heads/master
Commit: fd40752f2a3fb860e0964491c6d7f8330825e68a
Parents: dc81df5
Author: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Authored: Mon Jul 10 15:37:49 2017 -0700
Committer: Joseph Wu <jo...@apache.org>
Committed: Mon Jul 10 17:15:39 2017 -0700
----------------------------------------------------------------------
3rdparty/libprocess/include/process/windows/jobobject.hpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/fd40752f/3rdparty/libprocess/include/process/windows/jobobject.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/windows/jobobject.hpp b/3rdparty/libprocess/include/process/windows/jobobject.hpp
index 5fb41c4..0de374d 100644
--- a/3rdparty/libprocess/include/process/windows/jobobject.hpp
+++ b/3rdparty/libprocess/include/process/windows/jobobject.hpp
@@ -41,7 +41,7 @@ public:
void manage(
const pid_t pid,
- const std::string& name,
+ const std::wstring& name,
const SharedHandle& handle)
{
jobs.emplace(pid, JobData{name, handle});
@@ -68,7 +68,7 @@ protected:
private:
struct JobData {
- std::string name;
+ std::wstring name;
SharedHandle handle;
};
@@ -91,7 +91,7 @@ inline Subprocess::ParentHook Subprocess::ParentHook::CREATE_JOB() {
// object is greater than the lifetime of the processes it contains. Thus
// the job object handle is explicitly owned by the global job object
// manager process.
- Try<std::string> name = os::name_job(pid);
+ Try<std::wstring> name = os::name_job(pid);
if (name.isError()) {
return Error(name.error());
}