You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2017/11/30 00:22:22 UTC
mesos git commit: Fixed Windows build break due to use of GCC
extension.
Repository: mesos
Updated Branches:
refs/heads/master e580bb327 -> 63e621973
Fixed Windows build break due to use of GCC extension.
Commit 17d186e379d2db3edb04743a061dc05e24c32c9b introduced a
0 size array in `mesos::internal::master::MASTER_CAPABILITIES()`. This
is not valid C++, but instead a GCC C++ extension, so it broke the
Windows build. Since `MASTER_CAPABILITIES()` just returns an empty
vector for now, the code now just simply returns `{}`.
This code will be put back by review 64008, and is a temporary fix.
Review: https://reviews.apache.org/r/64183/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/63e62197
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/63e62197
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/63e62197
Branch: refs/heads/master
Commit: 63e621973c06b9f1aec224bcd8c0e2af156d8773
Parents: e580bb3
Author: Akash Gupta <ak...@hotmail.com>
Authored: Wed Nov 29 16:19:15 2017 -0800
Committer: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Committed: Wed Nov 29 16:19:15 2017 -0800
----------------------------------------------------------------------
src/master/constants.cpp | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/63e62197/src/master/constants.cpp
----------------------------------------------------------------------
diff --git a/src/master/constants.cpp b/src/master/constants.cpp
index bf3d3e4..55eecfb 100644
--- a/src/master/constants.cpp
+++ b/src/master/constants.cpp
@@ -22,16 +22,7 @@ namespace master {
std::vector<MasterInfo::Capability> MASTER_CAPABILITIES()
{
- MasterInfo::Capability::Type types[] = {}; // Empty for now.
-
- std::vector<MasterInfo::Capability> result;
- foreach (MasterInfo::Capability::Type type, types) {
- MasterInfo::Capability capability;
- capability.set_type(type);
- result.push_back(capability);
- }
-
- return result;
+ return {}; // Empty for now.
}
} // namespace master {