From a8386f8c25e78d24db7330b2c89956c31e08b60b Mon Sep 17 00:00:00 2001
From: xhainingx <xhainingx@users.sf.net>
Date: Wed, 17 Apr 2013 15:29:06 +0000
Subject: [PATCH] added appropriate constness to Config::getOption functions

Previously the Config::getOption functions were not marked as const,
This prevented them being called through a const Config * as I was
attempting to do.  I've marked them as const member functions
as well as changed the iteration to use a const_iterator.
---
 trunk/src/drivers/common/configSys.cpp | 16 ++++++++--------
 trunk/src/drivers/common/configSys.h   |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/trunk/src/drivers/common/configSys.cpp b/trunk/src/drivers/common/configSys.cpp
index 199d83f4..44fec78b 100644
--- a/trunk/src/drivers/common/configSys.cpp
+++ b/trunk/src/drivers/common/configSys.cpp
@@ -395,9 +395,9 @@ Config::setOption(const std::string &name,
 
 int
 Config::getOption(const std::string &name,
-                  std::string *value)
+                  std::string *value) const
 {
-    std::map<std::string, std::string>::iterator opt_i;
+    std::map<std::string, std::string>::const_iterator opt_i;
 
     // confirm that the option exists
     opt_i = _strOptMap.find(name);
@@ -412,9 +412,9 @@ Config::getOption(const std::string &name,
 
 int
 Config::getOption(const std::string &name,
-                  const char **value)
+                  const char **value) const
 {
-    std::map<std::string, std::string>::iterator opt_i;
+    std::map<std::string, std::string>::const_iterator opt_i;
 
     // confirm that the option exists
     opt_i = _strOptMap.find(name);
@@ -429,9 +429,9 @@ Config::getOption(const std::string &name,
 
 int
 Config::getOption(const std::string &name,
-                  int *value)
+                  int *value) const
 {
-    std::map<std::string, int>::iterator opt_i;
+    std::map<std::string, int>::const_iterator opt_i;
 
     // confirm that the option exists
     opt_i = _intOptMap.find(name);
@@ -446,9 +446,9 @@ Config::getOption(const std::string &name,
 
 int
 Config::getOption(const std::string &name,
-                  double *value)
+                  double *value) const
 {
-    std::map<std::string, double>::iterator opt_i;
+    std::map<std::string, double>::const_iterator opt_i;
 
     // confirm that the option exists
     opt_i = _dblOptMap.find(name);
diff --git a/trunk/src/drivers/common/configSys.h b/trunk/src/drivers/common/configSys.h
index 56b792bf..d0756eb8 100644
--- a/trunk/src/drivers/common/configSys.h
+++ b/trunk/src/drivers/common/configSys.h
@@ -66,10 +66,10 @@ public:
     int setOption(const std::string &, double);
     int setOption(const std::string &, void (*)(const std::string &));
 
-    int getOption(const std::string &, std::string *);
-    int getOption(const std::string &, const char **);
-    int getOption(const std::string &, int *);
-    int getOption(const std::string &, double *);
+    int getOption(const std::string &, std::string *) const;
+    int getOption(const std::string &, const char **) const;
+    int getOption(const std::string &, int *) const;
+    int getOption(const std::string &, double *) const;
 
     /**
      * Parse the arguments.  Also read in the configuration file and