diff options
| author | Peter Baumann <p.baumann@jacobs-university.de> | 2010-04-01 11:23:06 +0200 |
|---|---|---|
| committer | costea <costea@ubuntu.ubuntu-domain> | 2010-06-08 14:04:38 +0200 |
| commit | 41f78a955e316f91dc0b7a737caa6e36e1232f9a (patch) | |
| tree | f204ce19ec9335b9c5904bf8163c21cdf2aa55d9 /rasmgr | |
| parent | fb117f752543f0c8c267c7794f64a74874472174 (diff) | |
| download | rasdaman-upstream-41f78a955e316f91dc0b7a737caa6e36e1232f9a.tar.gz rasdaman-upstream-41f78a955e316f91dc0b7a737caa6e36e1232f9a.tar.xz rasdaman-upstream-41f78a955e316f91dc0b7a737caa6e36e1232f9a.zip | |
PB: removed #ifdef NO_OFFICIAL_RELEASE
Diffstat (limited to 'rasmgr')
| -rw-r--r-- | rasmgr/rasmgr_config.cc | 8 | ||||
| -rw-r--r-- | rasmgr/rasmgr_config.hh | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/rasmgr/rasmgr_config.cc b/rasmgr/rasmgr_config.cc index 6e317a7..68ed60a 100644 --- a/rasmgr/rasmgr_config.cc +++ b/rasmgr/rasmgr_config.cc @@ -66,13 +66,13 @@ Configuration::Configuration(): cmlMaster (cmlInter.addStringParameter(CommandLineParser::noShortName, "master", "<name> host of rasmgr master (slave only)")), cmlMasterPort (cmlInter.addLongParameter(CommandLineParser::noShortName, "mport", "<port> listen port number of rasmgr master (slave only)", DEFAULT_PORT)), cmlQuiet (cmlInter.addFlagParameter( 'q', CommandLineParser::noLongName, "quiet: don't log requests (default: log requests to stdout)")), -#ifdef NO_OFFICIAL_RELEASE +#ifdef RMANDEBUG // was: NO_OFFICIAL_RELEASE cmlTest (cmlInter.addFlagParameter(CommandLineParser::noShortName, "test", "test mode")), cmlDSup (cmlInter.addFlagParameter(CommandLineParser::noShortName, "dsup", "debug mode")), cmlRandTest (cmlInter.addFlagParameter(CommandLineParser::noShortName, "rgt", "random generator test")), cmlRth (cmlInter.addFlagParameter(CommandLineParser::noShortName, "rth", "disable rthl test")), cmlMultiWT (cmlInter.addFlagParameter(CommandLineParser::noShortName, "amw", "allow multiple write transactions")), -#endif +#endif // RMANDEBUG cmlHelp (cmlInter.addFlagParameter('h', RASMGRCMD_HELP, "print this help")) { ENTER( "Configuration::Configuration: enter." ); @@ -414,7 +414,7 @@ bool Configuration::interpretArguments(int argc, char **argv, char **envp) } } -#ifdef NO_OFFICIAL_RELEASE +#ifdef RMANDEBUG // was: NO_OFFICIAL_RELEASE testModus = cmlTest.isPresent(); debugSupport=cmlDSup.isPresent(); rtHlTest=cmlRth.isPresent(); @@ -427,7 +427,7 @@ bool Configuration::interpretArguments(int argc, char **argv, char **envp) allowMultiWT = cmlMultiWT.isPresent(); -#endif +#endif // RMANDEBUG LEAVE( "Configuration::interpretArguments: leave. result=" << result ); return result; diff --git a/rasmgr/rasmgr_config.hh b/rasmgr/rasmgr_config.hh index 0ed4d32..e2a24aa 100644 --- a/rasmgr/rasmgr_config.hh +++ b/rasmgr/rasmgr_config.hh @@ -110,9 +110,7 @@ class Configuration CommandLineParser &cmlInter; CommandLineParameter &cmlHelp, &cmlHostName, &cmlPort, &cmlPollFrequ; CommandLineParameter &cmlMaster, &cmlMasterPort, &cmlName, &cmlQuiet; -#ifdef RMANDEBUG CommandLineParameter &cmlTest, &cmlDSup, &cmlRandTest, &cmlRth, &cmlMultiWT; -#endif }; extern Configuration config; |