Skip to content

Commit cd3bdc3

Browse files
committed
fix merge error
1 parent eff0299 commit cd3bdc3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/crow/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ namespace crow
279279

280280
// clang-format off
281281
#ifndef CROW_MSVC_WORKAROUND
282-
constexpr crow::HTTPMethod operator"" _method(const char* str, size_t /*len*/)
282+
constexpr crow::HTTPMethod method_from_string(const char* str)
283283
{
284284
return crow::black_magic::is_equ_p(str, "GET", 3) ? crow::HTTPMethod::Get :
285285
crow::black_magic::is_equ_p(str, "DELETE", 6) ? crow::HTTPMethod::Delete :

0 commit comments

Comments
 (0)