summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Ryt <artur.ryt@gmail.com>2019-01-29 19:51:12 (GMT)
committerArtur Ryt <artur.ryt@gmail.com>2019-01-29 19:51:12 (GMT)
commitd6fbd438c4ca89a4e5e7eec612b142f8e86faa17 (patch)
tree9d1ccaaee9c542af3cc8870edfdf503bb430f4ae
parentd75fec5a88f81a8c16cdeab46766e92a14d1d3cf (diff)
downloadCMake-d6fbd438c4ca89a4e5e7eec612b142f8e86faa17.zip
CMake-d6fbd438c4ca89a4e5e7eec612b142f8e86faa17.tar.gz
CMake-d6fbd438c4ca89a4e5e7eec612b142f8e86faa17.tar.bz2
Autogen: Refactor std::bind calls to lambdas
-rw-r--r--Source/cmQtAutoGeneratorMocUic.cxx3
-rw-r--r--Source/cmQtAutoGeneratorRcc.cxx5
2 files changed, 2 insertions, 6 deletions
diff --git a/Source/cmQtAutoGeneratorMocUic.cxx b/Source/cmQtAutoGeneratorMocUic.cxx
index bc496ac..0ba5224 100644
--- a/Source/cmQtAutoGeneratorMocUic.cxx
+++ b/Source/cmQtAutoGeneratorMocUic.cxx
@@ -1111,8 +1111,7 @@ void cmQtAutoGeneratorMocUic::WorkerT::UVProcessStart(uv_async_t* handle)
{
std::lock_guard<std::mutex> lock(wrk.ProcessMutex_);
if (wrk.Process_ && !wrk.Process_->IsStarted()) {
- wrk.Process_->start(handle->loop,
- std::bind(&WorkerT::UVProcessFinished, &wrk));
+ wrk.Process_->start(handle->loop, [&wrk] { wrk.UVProcessFinished(); });
}
}
}
diff --git a/Source/cmQtAutoGeneratorRcc.cxx b/Source/cmQtAutoGeneratorRcc.cxx
index 43ff172..021a15f 100644
--- a/Source/cmQtAutoGeneratorRcc.cxx
+++ b/Source/cmQtAutoGeneratorRcc.cxx
@@ -10,8 +10,6 @@
#include "cmSystemTools.h"
#include "cmUVHandlePtr.h"
-#include <functional>
-
// -- Class methods
cmQtAutoGeneratorRcc::cmQtAutoGeneratorRcc()
@@ -662,8 +660,7 @@ bool cmQtAutoGeneratorRcc::StartProcess(
Process_ = cm::make_unique<ReadOnlyProcessT>();
Process_->setup(&ProcessResult_, mergedOutput, command, workingDirectory);
// Start process
- if (!Process_->start(UVLoop(),
- std::bind(&cm::uv_async_ptr::send, &UVRequest()))) {
+ if (!Process_->start(UVLoop(), [this] { UVRequest().send(); })) {
Log().ErrorFile(GeneratorT::RCC, QrcFile_, ProcessResult_.ErrorMessage);
Error_ = true;
// Clean up