瀏覽代碼

Merge topic 'autogen-std-bind-to-lambdas'

d6fbd438c4 Autogen: Refactor std::bind calls to lambdas

Acked-by: Kitware Robot <[email protected]>
Merge-request: !2766
Brad King 6 年之前
父節點
當前提交
0933707d5c
共有 2 個文件被更改,包括 2 次插入6 次删除
  1. 1 2
      Source/cmQtAutoGeneratorMocUic.cxx
  2. 1 4
      Source/cmQtAutoGeneratorRcc.cxx

+ 1 - 2
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(); });
     }
   }
 }

+ 1 - 4
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