summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorConstantin <jucovschi@gmail.com>2010-06-14 10:10:30 +0200
committerwww-data <www-data@ubuntu.localdomain>2010-06-14 10:12:23 +0200
commit45325282eaf5e902962bd39d3c8b5aaf14a505d5 (patch)
treebfed657773fb9517443c6af79aeb7e7352a8d3e0 /server
parent3fb7f22ee45c78c349dd8f7c3e78be6d9c3cdee1 (diff)
downloadrasdaman-upstream-45325282eaf5e902962bd39d3c8b5aaf14a505d5.tar.gz
rasdaman-upstream-45325282eaf5e902962bd39d3c8b5aaf14a505d5.tar.xz
rasdaman-upstream-45325282eaf5e902962bd39d3c8b5aaf14a505d5.zip
solving compilation error introduced by patch: 4530d1219de64bf2651f069fbb47f6fe513c20e7
Diffstat (limited to 'server')
-rw-r--r--server/rasserver_config.cc4
-rw-r--r--server/rasserver_config.hh5
2 files changed, 2 insertions, 7 deletions
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;