diff options
-rw-r--r-- | rasmgr/rasmgr_config.hh | 3 | ||||
-rw-r--r-- | server/rasserver_config.cc | 4 | ||||
-rw-r--r-- | server/rasserver_config.hh | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/rasmgr/rasmgr_config.hh b/rasmgr/rasmgr_config.hh index fdb453e..5b385a8 100644 --- a/rasmgr/rasmgr_config.hh +++ b/rasmgr/rasmgr_config.hh @@ -113,7 +113,10 @@ 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; diff --git a/server/rasserver_config.cc b/server/rasserver_config.cc index 94c2963..518d878 100644 --- a/server/rasserver_config.cc +++ b/server/rasserver_config.cc @@ -279,7 +279,6 @@ int Configuration::getMaxTransferBufferSize() { return maxTransferBuf int Configuration::getTimeout() { return timeout; } const char* Configuration::getDbConnectionID() { return dbConnection; } -#ifdef RMANDEBUG int Configuration::getDefaultTileSize() { return tileSize; } int Configuration::getDefaultPCTMin() { return pctMin; } int Configuration::getDefaultPCTMax() { return pctMax; } @@ -292,6 +291,5 @@ const char* Configuration::getDefaultTileConfig() { return tileConf; } const char* Configuration::getTilingScheme() { return tilingName; } const char* Configuration::getIndexType() { return indexType; } bool Configuration::useTileContainer() { return useTC; } - -#endif + diff --git a/server/rasserver_config.hh b/server/rasserver_config.hh index 012e00f..dc9a40e 100644 --- a/server/rasserver_config.hh +++ b/server/rasserver_config.hh @@ -50,7 +50,6 @@ class Configuration int getTimeout(); const char* getDbConnectionID(); -#ifdef RMANDEBUG int getDefaultTileSize(); int getDefaultPCTMin(); int getDefaultPCTMax(); @@ -64,7 +63,7 @@ class Configuration const char* getIndexType(); bool useTileContainer(); -#endif + private: void printHelp(); @@ -123,7 +122,6 @@ class Configuration int optLevel; const char* dbConnection; -#ifdef RMANDEBUG int tileSize; int pctMin; int pctMax; @@ -133,7 +131,6 @@ class Configuration const char* indexType; int indexSize; int dbgLevel; -#endif }; extern Configuration configuration; |