nodegit
diff --git a/‎generate/templates/manual/include/thread_pool.h‎
Lines changed: 1 addition & 1 deletion b/‎generate/templates/manual/include/thread_pool.h‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎generate/templates/manual/src/async_baton.cc‎
Lines changed: 7 additions & 14 deletions b/‎generate/templates/manual/src/async_baton.cc‎
Lines changed: 7 additions & 14 deletions
diff --git a/‎generate/templates/manual/src/thread_pool.cc‎
Lines changed: 4 additions & 5 deletions b/‎generate/templates/manual/src/thread_pool.cc‎
Lines changed: 4 additions & 5 deletions
@@ -17,7 +17,7 @@ namespace nodegit {
     public:
       typedef std::function<void()> Callback;
       typedef std::function<void(Callback, Callback)> QueueCallbackFn;
-      typedef std::function<Callback(QueueCallbackFn, Callback)> OnPostCallbackFn;
+      typedef std::function<void(QueueCallbackFn)> OnPostCallbackFn;
 
       // Initializes thread pool and spins up the requested number of threads
       // The provided loop will be used for completion callbacks, whenever
 
@@ -45,26 +45,19 @@ namespace nodegit {
 
       ThreadPool::PostCallbackEvent(
         [jsCallback, cancelCallback](
-          ThreadPool::QueueCallbackFn queueCallback,
-          ThreadPool::Callback callbackCompleted
-        ) -> ThreadPool::Callback {
+          ThreadPool::QueueCallbackFn queueCallback
+        ) {
           queueCallback(jsCallback, cancelCallback);
-          callbackCompleted();
-
-          return []() {};
         }
       );
     } else {
+      this->onCompletion = std::bind(&AsyncBaton::SignalCompletion, this);
+      
       ThreadPool::PostCallbackEvent(
-        [this, jsCallback, cancelCallback](
-          ThreadPool::QueueCallbackFn queueCallback,
-          ThreadPool::Callback callbackCompleted
-        ) -> ThreadPool::Callback {
-          this->onCompletion = std::bind(&AsyncBaton::SignalCompletion, this);
-
+        [jsCallback, cancelCallback](
+          ThreadPool::QueueCallbackFn queueCallback
+        ) {
           queueCallback(jsCallback, cancelCallback);
-
-          return []() {};
         }
       );
 
 
@@ -81,8 +81,8 @@ namespace nodegit {
           : Event(CALLBACK_TYPE), callback(initCallback)
         {}
 
-        ThreadPool::Callback operator()(ThreadPool::QueueCallbackFn queueCb, ThreadPool::Callback completedCb) {
-          return callback(queueCb, completedCb);
+        void operator()(ThreadPool::QueueCallbackFn queueCb) {
+          callback(queueCb);
         }
 
         private:
@@ -376,11 +376,10 @@ namespace nodegit {
             auto callbackEvent = std::static_pointer_cast<Executor::CallbackEvent>(event);
 
             LockMaster::TemporaryUnlock temporaryUnlock;
-            auto onCompletedCallback = (*callbackEvent)(
+            (*callbackEvent)(
               [this](ThreadPool::Callback callback, ThreadPool::Callback cancelCallback) {
                 queueCallbackOnJSThread(callback, cancelCallback, false);
-              },
-              []() {}
+              }
             );
           }