Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix re-declared scoped enum as unscoped (Causes issues with some compilers) #13180

Merged
merged 1 commit into from
May 7, 2018
Merged

Fix re-declared scoped enum as unscoped (Causes issues with some compilers) #13180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/rest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ enum class RetFormat {
};

static const struct {
enum RetFormat rf;
RetFormat rf;
const char* name;
} rf_names[] = {
{RetFormat::UNDEF, ""},
Expand Down Expand Up @@ -68,7 +68,7 @@ static bool RESTERR(HTTPRequest* req, enum HTTPStatusCode status, std::string me
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('.');
if (pos == std::string::npos)
Expand Down