Repository: mesos Updated Branches: refs/heads/master 499173d39 -> a310bcc10
Removed unused lambda captures. This commit removes unused lambda captures of pointer and reference types which do not extend any lifetimes. Review: https://reviews.apache.org/r/57382/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a310bcc1 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a310bcc1 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a310bcc1 Branch: refs/heads/master Commit: a310bcc10b872b44fe6083756030daa96c21d141 Parents: 499173d Author: Benjamin Bannier <[email protected]> Authored: Wed Mar 8 14:54:47 2017 +0100 Committer: Till Toenshoff <[email protected]> Committed: Wed Mar 8 14:54:47 2017 +0100 ---------------------------------------------------------------------- src/master/http.cpp | 2 +- src/tests/api_tests.cpp | 20 ++++++++++---------- src/tests/master_quota_tests.cpp | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/a310bcc1/src/master/http.cpp ---------------------------------------------------------------------- diff --git a/src/master/http.cpp b/src/master/http.cpp index de2cc03..862b68f 100644 --- a/src/master/http.cpp +++ b/src/master/http.cpp @@ -2853,7 +2853,7 @@ Future<Response> Master::Http::state( // // TODO(neilc): Remove this once we break compatibility with // pre-1.0 agents. - writer->field("orphan_tasks", [this, &tasksApprover]( + writer->field("orphan_tasks", [this]( JSON::ArrayWriter* writer) { foreachvalue (const Slave* slave, master->slaves.registered) { typedef hashmap<TaskID, Task*> TaskMap; http://git-wip-us.apache.org/repos/asf/mesos/blob/a310bcc1/src/tests/api_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/api_tests.cpp b/src/tests/api_tests.cpp index 52f58a4..fae24eb 100644 --- a/src/tests/api_tests.cpp +++ b/src/tests/api_tests.cpp @@ -763,7 +763,7 @@ TEST_P(MasterAPITest, SetLoggingLevel) headers, serialize(contentType, v1Call), stringify(contentType)) - .then([contentType](const http::Response& response) -> Future<Nothing> { + .then([](const http::Response& response) -> Future<Nothing> { if (response.status != http::OK().status) { return Failure("Unexpected response status " + response.status); } @@ -1165,7 +1165,7 @@ TEST_P(MasterAPITest, UpdateAndGetMaintenanceSchedule) headers, serialize(contentType, v1UpdateScheduleCall), stringify(contentType)) - .then([contentType](const http::Response& response) -> Future<Nothing> { + .then([](const http::Response& response) -> Future<Nothing> { if (response.status != http::OK().status) { return Failure("Unexpected response status " + response.status); } @@ -1231,7 +1231,7 @@ TEST_P(MasterAPITest, GetMaintenanceStatus) headers, serialize(contentType, v1UpdateScheduleCall), stringify(contentType)) - .then([contentType](const http::Response& response) -> Future<Nothing> { + .then([](const http::Response& response) -> Future<Nothing> { if (response.status != http::OK().status) { return Failure("Unexpected response status " + response.status); } @@ -1303,7 +1303,7 @@ TEST_P(MasterAPITest, StartAndStopMaintenance) headers, serialize(contentType, v1UpdateScheduleCall), stringify(contentType)) - .then([contentType](const http::Response& response) -> Future<Nothing> { + .then([](const http::Response& response) -> Future<Nothing> { if (response.status != http::OK().status) { return Failure("Unexpected response status " + response.status); } @@ -1325,7 +1325,7 @@ TEST_P(MasterAPITest, StartAndStopMaintenance) headers, serialize(contentType, v1StartMaintenanceCall), stringify(contentType)) - .then([contentType](const http::Response& response) -> Future<Nothing> { + .then([](const http::Response& response) -> Future<Nothing> { if (response.status != http::OK().status) { return Failure("Unexpected response status " + response.status); } @@ -1347,7 +1347,7 @@ TEST_P(MasterAPITest, StartAndStopMaintenance) headers, serialize(contentType, v1StopMaintenanceCall), stringify(contentType)) - .then([contentType](const http::Response& response) -> Future<Nothing> { + .then([](const http::Response& response) -> Future<Nothing> { if (response.status != http::OK().status) { return Failure("Unexpected response status " + response.status); } @@ -2000,7 +2000,7 @@ TEST_P(MasterAPITest, CreateAndDestroyVolumes) headers, serialize(contentType, v1CreateVolumesCall), stringify(contentType)) - .then([contentType](const http::Response& response) -> Future<Nothing> { + .then([](const http::Response& response) -> Future<Nothing> { if (response.status != http::Accepted().status) { return Failure("Unexpected response status " + response.status); } @@ -2072,7 +2072,7 @@ TEST_P(MasterAPITest, CreateAndDestroyVolumes) headers, serialize(contentType, v1DestroyVolumesCall), stringify(contentType)) - .then([contentType](const http::Response& response) -> Future<Nothing> { + .then([](const http::Response& response) -> Future<Nothing> { if (response.status != http::Accepted().status) { return Failure("Unexpected response status " + response.status); } @@ -2152,7 +2152,7 @@ TEST_P(MasterAPITest, UpdateWeights) headers, serialize(contentType, updateCall), stringify(contentType)) - .then([contentType](const http::Response& response) -> Future<Nothing> { + .then([](const http::Response& response) -> Future<Nothing> { if (response.status != http::OK().status) { return Failure("Unexpected response status " + response.status); } @@ -2591,7 +2591,7 @@ TEST_P(AgentAPITest, SetLoggingLevel) headers, serialize(contentType, v1Call), stringify(contentType)) - .then([contentType](const http::Response& response) -> Future<Nothing> { + .then([](const http::Response& response) -> Future<Nothing> { if (response.status != http::OK().status) { return Failure("Unexpected response status " + response.status); } http://git-wip-us.apache.org/repos/asf/mesos/blob/a310bcc1/src/tests/master_quota_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_quota_tests.cpp b/src/tests/master_quota_tests.cpp index 91219d6..e109656 100644 --- a/src/tests/master_quota_tests.cpp +++ b/src/tests/master_quota_tests.cpp @@ -194,7 +194,7 @@ TEST_F(MasterQuotaTest, InvalidSetRequest) // we start looking at available resources. // Wrap the `http::post` into a lambda for readability of the test. - auto postQuota = [this, &master](const string& request) { + auto postQuota = [&master](const string& request) { return process::http::post( master.get()->pid, "quota", @@ -412,7 +412,7 @@ TEST_F(MasterQuotaTest, RemoveSingleQuota) const bool FORCE = true; // Wrap the `http::requestDelete` into a lambda for readability of the test. - auto removeQuota = [this, &master](const string& path) { + auto removeQuota = [&master](const string& path) { return process::http::requestDelete( master.get()->pid, path,
