You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2015/09/21 21:27:59 UTC
[3/4] mesos git commit: libprocess: Renamed suppress macro to
SUPPRESS.
libprocess: Renamed suppress macro to SUPPRESS.
The macro suppress conflicts with suppress() for a call in master.
This patch updates macro suppress to SUPPRESS to resolve the conflict.
Review: https://reviews.apache.org/r/38544
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9d15cd3e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9d15cd3e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9d15cd3e
Branch: refs/heads/master
Commit: 9d15cd3eb9243abf07947b266a43791ce8d11d1e
Parents: 10ac36a
Author: Guangya Liu <gy...@gmail.com>
Authored: Mon Sep 21 12:09:19 2015 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Mon Sep 21 12:09:19 2015 -0700
----------------------------------------------------------------------
.../libprocess/3rdparty/stout/include/stout/os/posix/sendfile.hpp | 2 +-
3rdparty/libprocess/3rdparty/stout/include/stout/os/signals.hpp | 2 +-
.../libprocess/3rdparty/stout/include/stout/os/windows/signals.hpp | 2 +-
3rdparty/libprocess/3rdparty/stout/tests/os/signals_tests.cpp | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/9d15cd3e/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/sendfile.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/sendfile.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/sendfile.hpp
index 50ad49e..828c9c7 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/sendfile.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/sendfile.hpp
@@ -40,7 +40,7 @@ namespace os {
inline ssize_t sendfile(int s, int fd, off_t offset, size_t length)
{
#if defined(__linux__) || defined(__sun)
- suppress (SIGPIPE) {
+ SUPPRESS (SIGPIPE) {
// This will set errno to EPIPE if a SIGPIPE occurs.
return ::sendfile(s, fd, &offset, length);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/9d15cd3e/3rdparty/libprocess/3rdparty/stout/include/stout/os/signals.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/signals.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/signals.hpp
index 7a79024..16fd715 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/signals.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/signals.hpp
@@ -24,7 +24,7 @@
#endif // __WINDOWS__
-#define suppress(signal) \
+#define SUPPRESS(signal) \
if (os::signals::internal::Suppressor suppressor ## signal = \
os::signals::internal::Suppressor(signal))
http://git-wip-us.apache.org/repos/asf/mesos/blob/9d15cd3e/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/signals.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/signals.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/signals.hpp
index 8361a13..60aa9ad 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/signals.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/signals.hpp
@@ -79,7 +79,7 @@ struct Suppressor
UNIMPLEMENTED;
}
- // Needed for the suppress() macro.
+ // Needed for the SUPPRESS() macro.
operator bool() { return true; }
};
http://git-wip-us.apache.org/repos/asf/mesos/blob/9d15cd3e/3rdparty/libprocess/3rdparty/stout/tests/os/signals_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/tests/os/signals_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/os/signals_tests.cpp
index de86232..4bb79fd 100644
--- a/3rdparty/libprocess/3rdparty/stout/tests/os/signals_tests.cpp
+++ b/3rdparty/libprocess/3rdparty/stout/tests/os/signals_tests.cpp
@@ -40,7 +40,7 @@ TEST_F(OsSignalsTest, Suppress)
const string data = "hello";
// Let's make sure we can suppress SIGPIPE!
- suppress(SIGPIPE) {
+ SUPPRESS(SIGPIPE) {
// Writing to a pipe that has been closed generates SIGPIPE.
ASSERT_EQ(-1, write(pipes[1], data.c_str(), data.length()));