commit 988403c64f7d1937eece8c52a076d5abedfb3b60
author Ed Tanous <ed@tanous.net> Mon Aug 24 11:29:49 2020 -0700
committer Ed Tanous <ed@tanous.net> Wed Oct 07 18:39:41 2020 +0000
tree 290144bdce8cf1189d9f89a525243058eab44099
parent cc0904473c19977eb0b9789b3c1be54a74ca873d

Clean up utils

Lots of the utils functions have been superceeded or replaced by std::
implementations, or are no longer needed because of the removal of
middlewares.


Tested:
Ran on a bmc with this implemented.  Pulled down the webui, and
observed no issues.  Code compiles and passes clang-tidy cert checks.

Change-Id: If29bb5f4ba9979912aeb2a8fa4cbd9f4e4f32006
Signed-off-by: Ed Tanous <ed@tanous.net>

http/routing.h

diff --git a/http/routing.h b/http/routing.h
index f07e51b..b49e15e 100644
--- a/http/routing.h
+++ b/http/routing.h
@@ -270,7 +270,7 @@
         using type =
             std::function<void(const crow::Request&, crow::Response&, Args...)>;
         using args_type =
-            black_magic::S<typename black_magic::promote_t<Args>...>;
+            black_magic::S<typename black_magic::PromoteT<Args>...>;
     };
 
     template <typename... Args>
@@ -279,7 +279,7 @@
         using type =
             std::function<void(const crow::Request&, crow::Response&, Args...)>;
         using args_type =
-            black_magic::S<typename black_magic::promote_t<Args>...>;
+            black_magic::S<typename black_magic::PromoteT<Args>...>;
     };
 
     template <typename... Args>
@@ -288,7 +288,7 @@
         using type =
             std::function<void(const crow::Request&, crow::Response&, Args...)>;
         using args_type =
-            black_magic::S<typename black_magic::promote_t<Args>...>;
+            black_magic::S<typename black_magic::PromoteT<Args>...>;
     };
 
     typename HandlerTypeHelper<ArgsWrapped...>::type handler;
@@ -469,9 +469,9 @@
     void operator()(Func f)
     {
         using function_t = utility::function_traits<Func>;
-
         erasedHandler =
-            wrap(std::move(f), black_magic::gen_seq<function_t::arity>());
+            wrap(std::move(f),
+                 std::make_integer_sequence<unsigned, function_t::arity>{});
     }
 
     // enable_if Arg1 == request && Arg2 == Response
@@ -479,15 +479,14 @@
     // enable_if Arg1 != request
 
     template <typename Func, unsigned... Indices>
-
     std::function<void(const Request&, Response&, const RoutingParams&)>
-        wrap(Func f, black_magic::Seq<Indices...>)
+        wrap(Func f, std::integer_sequence<unsigned, Indices...>)
     {
-        using function_t = utility::function_traits<Func>;
+        using function_t = crow::utility::function_traits<Func>;
 
         if (!black_magic::isParameterTagCompatible(
-                black_magic::getParameterTagRuntime(rule.c_str()),
-                black_magic::compute_parameter_tag_from_args_list<
+                black_magic::getParameterTag(rule.c_str()),
+                black_magic::computeParameterTagFromArgsList<
                     typename function_t::template arg<Indices>...>::value))
         {
             throw std::runtime_error("routeDynamic: Handler type is mismatched "