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 2016/02/25 08:12:22 UTC
mesos git commit: Fixed compilation errors on clang-3.5.
Repository: mesos
Updated Branches:
refs/heads/master 1180c835d -> 68013b93f
Fixed compilation errors on clang-3.5.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/68013b93
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/68013b93
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/68013b93
Branch: refs/heads/master
Commit: 68013b93fc44d299795a605dee6db2cc73b6e580
Parents: 1180c83
Author: Joris Van Remoortere <jo...@gmail.com>
Authored: Wed Feb 24 23:11:55 2016 -0800
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Wed Feb 24 23:11:55 2016 -0800
----------------------------------------------------------------------
src/slave/containerizer/mesos/provisioner/docker/local_puller.cpp | 2 +-
.../containerizer/mesos/provisioner/docker/registry_puller.cpp | 2 +-
src/slave/containerizer/mesos/provisioner/docker/store.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/68013b93/src/slave/containerizer/mesos/provisioner/docker/local_puller.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/docker/local_puller.cpp b/src/slave/containerizer/mesos/provisioner/docker/local_puller.cpp
index dfd32dc..ea4c2ff 100644
--- a/src/slave/containerizer/mesos/provisioner/docker/local_puller.cpp
+++ b/src/slave/containerizer/mesos/provisioner/docker/local_puller.cpp
@@ -210,7 +210,7 @@ Future<vector<string>> LocalPullerProcess::_pull(
}
return extractLayers(directory, layerIds)
- .then([layerIds]() { return layerIds; });
+ .then([layerIds]() -> vector<string> { return layerIds; });
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/68013b93/src/slave/containerizer/mesos/provisioner/docker/registry_puller.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/docker/registry_puller.cpp b/src/slave/containerizer/mesos/provisioner/docker/registry_puller.cpp
index 153e6c0..3fd58f6 100644
--- a/src/slave/containerizer/mesos/provisioner/docker/registry_puller.cpp
+++ b/src/slave/containerizer/mesos/provisioner/docker/registry_puller.cpp
@@ -354,7 +354,7 @@ Future<hashset<string>> RegistryPullerProcess::fetchBlobs(
}
return collect(futures)
- .then([blobSums]() { return blobSums; });
+ .then([blobSums]() -> hashset<string> { return blobSums; });
}
} // namespace docker {
http://git-wip-us.apache.org/repos/asf/mesos/blob/68013b93/src/slave/containerizer/mesos/provisioner/docker/store.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/docker/store.cpp b/src/slave/containerizer/mesos/provisioner/docker/store.cpp
index 47d3dc1..eeec943 100644
--- a/src/slave/containerizer/mesos/provisioner/docker/store.cpp
+++ b/src/slave/containerizer/mesos/provisioner/docker/store.cpp
@@ -286,7 +286,7 @@ Future<vector<string>> StoreProcess::moveLayers(
}
return collect(futures)
- .then([layerIds]() { return layerIds; });
+ .then([layerIds]() -> vector<string> { return layerIds; });
}