Remove the black_magic namespace
The black_magic namespace has been eradicated of what most would call
"black magic" and while there's some non-trivial stuff in there, it's
far from the most complicated part of this stack.
This commit takes the two remaining things in the black_magic namespace,
namely the parameter tagging functionality, and moves them into the
utility namespace.
Tested: Redfish service validator passes
Change-Id: I9e2686fff5ef498cafc4cb83d4d808ea849f7737
Signed-off-by: Ed Tanous <edtanous@google.com>
diff --git a/http/app.hpp b/http/app.hpp
index b983bec..0f0f47b 100644
--- a/http/app.hpp
+++ b/http/app.hpp
@@ -25,7 +25,7 @@
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage, clang-diagnostic-unused-macros)
#define BMCWEB_ROUTE(app, url) \
- app.template route<crow::black_magic::getParameterTag(url)>(url)
+ app.template route<crow::utility::getParameterTag(url)>(url)
namespace crow
{
diff --git a/http/utility.hpp b/http/utility.hpp
index 94d89fb..d64b995 100644
--- a/http/utility.hpp
+++ b/http/utility.hpp
@@ -28,7 +28,7 @@
namespace crow
{
-namespace black_magic
+namespace utility
{
enum class TypeCode : uint8_t
@@ -101,10 +101,6 @@
}
return tagValue;
}
-} // namespace black_magic
-
-namespace utility
-{
template <typename T>
struct FunctionTraits
@@ -119,7 +115,7 @@
while (tag > 0)
{
// Move to the next tag by removing the bottom bits from the number
- tag /= black_magic::toUnderlying(black_magic::TypeCode::Max);
+ tag /= toUnderlying(TypeCode::Max);
ret++;
}
return ret;
diff --git a/test/http/router_test.cpp b/test/http/router_test.cpp
index 79320f7..edd9054 100644
--- a/test/http/router_test.cpp
+++ b/test/http/router_test.cpp
@@ -25,7 +25,7 @@
namespace
{
-using ::crow::black_magic::getParameterTag;
+using ::crow::utility::getParameterTag;
TEST(Router, AllowHeader)
{
diff --git a/test/http/utility_test.cpp b/test/http/utility_test.cpp
index 6506fcf..0ebba0b 100644
--- a/test/http/utility_test.cpp
+++ b/test/http/utility_test.cpp
@@ -24,7 +24,7 @@
namespace
{
-using ::crow::black_magic::getParameterTag;
+using ::crow::utility::getParameterTag;
TEST(Utility, Base64DecodeAuthString)
{