diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-31 16:14:30 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-31 16:15:11 (GMT) |
| commit | 0933707d5c8b18401834e0787157e2de68f98e51 (patch) | |
| tree | e365bb6df072e8e0b328da65ee005d250051face | |
| parent | dc9f4f9eca3ee046bbb2f974ab9ae9af7ffc46cf (diff) | |
| parent | d6fbd438c4ca89a4e5e7eec612b142f8e86faa17 (diff) | |
| download | CMake-0933707d5c8b18401834e0787157e2de68f98e51.zip CMake-0933707d5c8b18401834e0787157e2de68f98e51.tar.gz CMake-0933707d5c8b18401834e0787157e2de68f98e51.tar.bz2 | |
Merge topic 'autogen-std-bind-to-lambdas'
d6fbd438c4 Autogen: Refactor std::bind calls to lambdas
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2766
| -rw-r--r-- | Source/cmQtAutoGeneratorMocUic.cxx | 3 | ||||
| -rw-r--r-- | Source/cmQtAutoGeneratorRcc.cxx | 5 |
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 |