From 6718301ac9f0385f3146bab70c9fd7d8fa305562 Mon Sep 17 00:00:00 2001 From: Alex Hultman Date: Thu, 17 Jan 2019 06:30:47 +0100 Subject: [PATCH] Make onAborted unique_function --- misc/main.cpp | 2 -- src/HttpResponse.h | 4 ++-- src/HttpResponseData.h | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/misc/main.cpp b/misc/main.cpp index 8d0a688..fec62c2 100644 --- a/misc/main.cpp +++ b/misc/main.cpp @@ -67,8 +67,6 @@ int main(int argc, char **argv) { } }).run(); - /* This is needed to properly free default loop and such resources */ - uWS::destroy(); std::cout << "Everything fine, falling through" << std::endl; diff --git a/src/HttpResponse.h b/src/HttpResponse.h index dd3dd5f..5f18058 100644 --- a/src/HttpResponse.h +++ b/src/HttpResponse.h @@ -239,10 +239,10 @@ public: } /* Attach handler for aborted HTTP request */ - HttpResponse *onAborted(std::function handler) { + HttpResponse *onAborted(fu2::unique_function &&handler) { HttpResponseData *httpResponseData = getHttpResponseData(); - httpResponseData->onAborted = handler; + httpResponseData->onAborted = std::move(handler); return this; } diff --git a/src/HttpResponseData.h b/src/HttpResponseData.h index f5bd247..3e455c4 100644 --- a/src/HttpResponseData.h +++ b/src/HttpResponseData.h @@ -44,7 +44,7 @@ private: /* Per socket event handlers */ fu2::unique_function onWritable; - std::function onAborted; + fu2::unique_function onAborted; //std::function onData; std::function inStream;