Merge #13180: Fix re-declared scoped enum as unscoped (Causes issues with some compilers)
43f3dec00
Remove enum specifier (to avoid re-declare scoped enum as unscoped) (donaloconnor)
Pull request description:
MSVC fails to compile with the changes made in #10742
The problem is enum types were changed to scoped (`enum class`) but in some places `enum` as an unscoped is used.
This is a very simple fix and I've tested it.
Edit: Had to remove enum altogether - `enum class` doesn't compile on clang.
Tree-SHA512: 13e21666243585a133c74c81249a1fa4098d6b7aa3cda06be871fa017c0ad9bb7b0725f801160b9d31678448d668718197941fd84702ebdef15128c27d92cd70
This commit is contained in:
commit
6a01a50f49
1 changed files with 2 additions and 2 deletions
|
@ -33,7 +33,7 @@ enum class RetFormat {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct {
|
static const struct {
|
||||||
enum RetFormat rf;
|
RetFormat rf;
|
||||||
const char* name;
|
const char* name;
|
||||||
} rf_names[] = {
|
} rf_names[] = {
|
||||||
{RetFormat::UNDEF, ""},
|
{RetFormat::UNDEF, ""},
|
||||||
|
@ -68,7 +68,7 @@ static bool RESTERR(HTTPRequest* req, enum HTTPStatusCode status, std::string me
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
static enum RetFormat ParseDataFormat(std::string& param, const std::string& strReq)
|
static RetFormat ParseDataFormat(std::string& param, const std::string& strReq)
|
||||||
{
|
{
|
||||||
const std::string::size_type pos = strReq.rfind('.');
|
const std::string::size_type pos = strReq.rfind('.');
|
||||||
if (pos == std::string::npos)
|
if (pos == std::string::npos)
|
||||||
|
|
Loading…
Reference in a new issue