You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by dm...@apache.org on 2014/09/29 21:25:06 UTC
[3/3] git commit: Switch [mesos] to using compiler intrinsics for
unreachable, exit, and abort
Switch [mesos] to using compiler intrinsics for unreachable, exit, and abort
Use compiler intrinsics for unreachable, exit, and abort
Makes the functions not need to pretend to return something while
still silencing the compiler warnings.
Replaces 25193
Review: https://reviews.apache.org/r/26103
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9a3001c0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9a3001c0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9a3001c0
Branch: refs/heads/master
Commit: 9a3001c0b9eacbd47361c21fc15aac693d95c419
Parents: 92631b2
Author: Cody Maloney <co...@mesosphere.io>
Authored: Mon Sep 29 12:03:00 2014 -0700
Committer: Dominic Hamon <dh...@twitter.com>
Committed: Mon Sep 29 12:03:00 2014 -0700
----------------------------------------------------------------------
src/log/leveldb.cpp | 2 +-
src/log/network.hpp | 2 +-
src/slave/containerizer/mesos/launch.cpp | 3 +--
src/tests/routing_tests.cpp | 2 --
src/zookeeper/zookeeper.cpp | 2 +-
5 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/9a3001c0/src/log/leveldb.cpp
----------------------------------------------------------------------
diff --git a/src/log/leveldb.cpp b/src/log/leveldb.cpp
index 2967a1f..ad9e2f0 100644
--- a/src/log/leveldb.cpp
+++ b/src/log/leveldb.cpp
@@ -54,7 +54,7 @@ public:
// if (left < right) return -1;
// if (left == right) return 0;
// if (left > right) return 1;
- return UNREACHABLE();
+ UNREACHABLE();
}
virtual const char* Name() const
http://git-wip-us.apache.org/repos/asf/mesos/blob/9a3001c0/src/log/network.hpp
----------------------------------------------------------------------
diff --git a/src/log/network.hpp b/src/log/network.hpp
index 7d6b592..7c74a55 100644
--- a/src/log/network.hpp
+++ b/src/log/network.hpp
@@ -303,7 +303,7 @@ private:
return pids.size() >= size;
default:
LOG(FATAL) << "Invalid watch mode";
- return UNREACHABLE();
+ UNREACHABLE();
}
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/9a3001c0/src/slave/containerizer/mesos/launch.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/launch.cpp b/src/slave/containerizer/mesos/launch.cpp
index 9819381..2f2d60e 100644
--- a/src/slave/containerizer/mesos/launch.cpp
+++ b/src/slave/containerizer/mesos/launch.cpp
@@ -244,8 +244,7 @@ int MesosContainerizerLaunch::execute()
// If we get here, the execle call failed.
cerr << "Failed to execute command" << endl;
-
- return UNREACHABLE();
+ UNREACHABLE();
}
} // namespace slave {
http://git-wip-us.apache.org/repos/asf/mesos/blob/9a3001c0/src/tests/routing_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/routing_tests.cpp b/src/tests/routing_tests.cpp
index 35bdf8f..179f50b 100644
--- a/src/tests/routing_tests.cpp
+++ b/src/tests/routing_tests.cpp
@@ -287,8 +287,6 @@ static int child(void*)
// Should not reach here.
ABORT("Child process should not reach here");
-
- return -1;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/9a3001c0/src/zookeeper/zookeeper.cpp
----------------------------------------------------------------------
diff --git a/src/zookeeper/zookeeper.cpp b/src/zookeeper/zookeeper.cpp
index 72c9fc3..d4c24cd 100644
--- a/src/zookeeper/zookeeper.cpp
+++ b/src/zookeeper/zookeeper.cpp
@@ -686,6 +686,6 @@ bool ZooKeeper::retryable(int code)
default:
LOG(FATAL) << "Unknown ZooKeeper code: " << code;
- return UNREACHABLE(); // Make compiler happy.
+ UNREACHABLE(); // Make compiler happy.
}
}