diff options
| author | Jonas Schnelli <[email protected]> | 2018-05-07 13:28:22 +0200 |
|---|---|---|
| committer | Jonas Schnelli <[email protected]> | 2018-05-07 13:28:33 +0200 |
| commit | 6a01a50f4906a00ce55b4e542fe850d84de54d73 (patch) | |
| tree | d49b2dea1722e37d14cbad59c058ef094a99db65 /src | |
| parent | Merge #13162: [net] Don't incorrectly log that REJECT messages are unknown. (diff) | |
| parent | Remove enum specifier (to avoid re-declare scoped enum as unscoped) (diff) | |
| download | discoin-6a01a50f4906a00ce55b4e542fe850d84de54d73.tar.xz discoin-6a01a50f4906a00ce55b4e542fe850d84de54d73.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/rest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rest.cpp b/src/rest.cpp index 095655b3a..ffa75c241 100644 --- a/src/rest.cpp +++ b/src/rest.cpp @@ -33,7 +33,7 @@ enum class RetFormat { }; static const struct { - enum RetFormat rf; + RetFormat rf; const char* name; } rf_names[] = { {RetFormat::UNDEF, ""}, @@ -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) |