wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename OPTIONAL to avoid windows macro conflict

This commit is contained in:
A.J. Beamon 2022-03-08 13:45:29 -08:00
parent 6f7adb04a5
commit 6a2e54d955
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fdbclient/FDBTypes.h
View File

@ -30,10 +30,6 @@
#include "flow/Arena.h"
#include "flow/flow.h"
#ifdef _WIN32
#undef OPTIONAL
#endif
typedef int64_t Version;
typedef uint64_t LogEpoch;
typedef uint64_t Sequence;
@ -1188,7 +1184,8 @@ struct StorageMigrationType {
struct TenantMode {
// These enumerated values are stored in the database configuration, so can NEVER be changed. Only add new ones
// just before END.
enum Mode { DISABLED = 0, OPTIONAL = 1, REQUIRED = 2, END = 3 };
// Note: OPTIONAL_TENANT is not named OPTIONAL because of a collision with a Windows macro.
enum Mode { DISABLED = 0, OPTIONAL_TENANT = 1, REQUIRED = 2, END = 3 };
TenantMode() : mode(DISABLED) {}
TenantMode(Mode mode) : mode(mode) {
@ -1207,7 +1204,7 @@ struct TenantMode {
switch (mode) {
case DISABLED:
return "disabled";
case OPTIONAL:
case OPTIONAL_TENANT:
return "optional_experimental";
case REQUIRED:
return "required_experimental";

2
fdbclient/ManagementAPI.actor.cpp
View File

@ -179,7 +179,7 @@ std::map<std::string, std::string> configForToken(std::string const& mode) {
if (value == "disabled") {
tenantMode = TenantMode::DISABLED;
} else if (value == "optional_experimental") {
tenantMode = TenantMode::OPTIONAL;
tenantMode = TenantMode::OPTIONAL_TENANT;
} else if (value == "required_experimental") {
tenantMode = TenantMode::REQUIRED;
} else {