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 2016/01/30 03:14:23 UTC
mesos git commit: Renamed `IO::DUPLICATE` to avoid conflict with
Windows macro.
Repository: mesos
Updated Branches:
refs/heads/master fcc6f9549 -> b068da891
Renamed `IO::DUPLICATE` to avoid conflict with Windows macro.
Review: https://reviews.apache.org/r/42981/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b068da89
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b068da89
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b068da89
Branch: refs/heads/master
Commit: b068da89181a60b3fad6aa5bf37b69ea4371d7a1
Parents: fcc6f95
Author: Alex Clemmer <cl...@gmail.com>
Authored: Fri Jan 29 18:14:00 2016 -0800
Committer: Michael Park <mp...@apache.org>
Committed: Fri Jan 29 18:14:00 2016 -0800
----------------------------------------------------------------------
3rdparty/libprocess/include/process/subprocess.hpp | 4 ++--
3rdparty/libprocess/src/subprocess.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b068da89/3rdparty/libprocess/include/process/subprocess.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/subprocess.hpp b/3rdparty/libprocess/include/process/subprocess.hpp
index 482ea23..bb50cc3 100644
--- a/3rdparty/libprocess/include/process/subprocess.hpp
+++ b/3rdparty/libprocess/include/process/subprocess.hpp
@@ -98,7 +98,7 @@ public:
* The file descriptor is duplicated before being passed to the
* subprocess. The original file descriptor remains open.
*/
- DUPLICATE,
+ DUPLICATED,
/**
* The file descriptor is not duplicated before being passed to the
@@ -143,7 +143,7 @@ public:
// Some syntactic sugar to create an IO::PIPE redirector.
static IO PIPE();
static IO PATH(const std::string& path);
- static IO FD(int fd, IO::FDType type = IO::DUPLICATE);
+ static IO FD(int fd, IO::FDType type = IO::DUPLICATED);
/**
* @return The operating system PID for this subprocess.
http://git-wip-us.apache.org/repos/asf/mesos/blob/b068da89/3rdparty/libprocess/src/subprocess.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/subprocess.cpp b/3rdparty/libprocess/src/subprocess.cpp
index ef05687..ff477e3 100644
--- a/3rdparty/libprocess/src/subprocess.cpp
+++ b/3rdparty/libprocess/src/subprocess.cpp
@@ -175,7 +175,7 @@ Subprocess::IO Subprocess::FD(int fd, IO::FDType type)
[fd, type]() -> Try<InputFileDescriptors> {
int prepared_fd = -1;
switch (type) {
- case IO::DUPLICATE:
+ case IO::DUPLICATED:
prepared_fd = ::dup(fd);
break;
case IO::OWNED:
@@ -198,7 +198,7 @@ Subprocess::IO Subprocess::FD(int fd, IO::FDType type)
[fd, type]() -> Try<OutputFileDescriptors> {
int prepared_fd = -1;
switch (type) {
- case IO::DUPLICATE:
+ case IO::DUPLICATED:
prepared_fd = ::dup(fd);
break;
case IO::OWNED: