summaryrefslogtreecommitdiff
path: root/src/mongo/db/server_options.h
diff options
context:
space:
mode:
authorSpencer T Brody <spencer@mongodb.com>2015-08-18 16:56:31 -0400
committerSpencer T Brody <spencer@mongodb.com>2015-08-18 19:27:49 -0400
commit5dd1be3ba35121f4ba501c322d48041ae748ac9c (patch)
tree4eac913fa66515a55e5d6129c11a97058dc93e3c /src/mongo/db/server_options.h
parent594d851e53c85b2711db41034f9d42e1a0a5c25d (diff)
downloadmongo-5dd1be3ba35121f4ba501c322d48041ae748ac9c.tar.gz
SERVER-19543 SERVER-19992 Move ConfigServerMode enum from ServerGlobalParams to CatalogManager
Diffstat (limited to 'src/mongo/db/server_options.h')
-rw-r--r--src/mongo/db/server_options.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/mongo/db/server_options.h b/src/mongo/db/server_options.h
index b43ed8cd23f..0e6300e115a 100644
--- a/src/mongo/db/server_options.h
+++ b/src/mongo/db/server_options.h
@@ -29,6 +29,7 @@
#include "mongo/db/jsobj.h"
#include "mongo/platform/process_id.h"
+#include "mongo/s/catalog/catalog_manager.h"
#include "mongo/util/net/listen.h" // For DEFAULT_MAX_CONN
namespace mongo {
@@ -43,7 +44,7 @@ struct ServerGlobalParams {
indexBuildRetry(true),
quiet(false),
configsvr(false),
- configsvrMode(ConfigServerMode::NONE),
+ configsvrMode(CatalogManager::ConfigServerMode::NONE),
cpu(false),
objcheck(true),
defaultProfile(0),
@@ -79,13 +80,8 @@ struct ServerGlobalParams {
bool quiet; // --quiet
- bool configsvr; // --configsvr
- enum class ConfigServerMode {
- NONE,
- SCCC,
- CSRS,
- };
- ConfigServerMode configsvrMode; // -- configsvrMode
+ bool configsvr; // --configsvr
+ CatalogManager::ConfigServerMode configsvrMode; // -- configsvrMode
bool cpu; // --cpu show cpu time periodically