talksik/uWebSockets
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make the router use move-only functions

Browse Source
This commit is contained in:
Alex Hultman
2019-01-23 11:51:38 +01:00
parent 9829f7fb37
commit ce286017ee
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/HttpRouter.h
+7 -3
View File
@@ -30,6 +30,8 @@
#include <sstream> #include <sstream>
#include <string> #include <string>
#include "f2/function2.hpp"
namespace uWS { namespace uWS {
template <class USERDATA> template <class USERDATA>
@@ -59,7 +61,9 @@ private:
} }
} routeParameters; } routeParameters;
std::vector<std::function<bool(USERDATA &, std::pair<int, std::string_view *>)>> handlers; std::vector<fu2::unique_function<bool(USERDATA &, std::pair<int, std::string_view *>)>> handlers;
HttpRouter(const HttpRouter &other) = delete;
struct Node { struct Node {
std::string name; std::string name;
@@ -190,7 +194,7 @@ public:
} }
/* Register a route to be routed */ /* Register a route to be routed */
HttpRouter *add(std::string method, std::string_view pattern, std::function<bool(USERDATA &, std::pair<int, std::string_view *>)> handler) { HttpRouter *add(std::string method, std::string_view pattern, fu2::unique_function<bool(USERDATA &, std::pair<int, std::string_view *>)> &&handler) {
/* Step over any initial slash */ /* Step over any initial slash */
if (pattern[0] == '/') { if (pattern[0] == '/') {
pattern = pattern.substr(1); pattern = pattern.substr(1);
@@ -215,7 +219,7 @@ public:
/* Add this handler to the list of handlers */ /* Add this handler to the list of handlers */
short handlerIndex = handlers.size(); short handlerIndex = handlers.size();
handlers.push_back(handler); handlers.emplace_back(std::move(handler));
/* Build the routing tree */ /* Build the routing tree */
Node *parent = &tree; Node *parent = &tree;