1 files changed, 3 insertions, 12 deletions
diff --git a/src/lib/database/dbaccess_parser.h b/src/lib/database/dbaccess_parser.h
index dc8a2ab948..c2be71ef9e 100644
--- a/src/lib/database/dbaccess_parser.h
+++ b/src/lib/database/dbaccess_parser.h
@@ -24,13 +24,6 @@ namespace db {
 ///
 class DbAccessParser: public isc::data::SimpleParser {
 public:
-
-    /// @brief Keyword and associated value
-    typedef std::pair<std::string, std::string> StringPair;
-
-    /// @brief Keyword/value collection of database access parameters
-    typedef std::map<std::string, std::string> StringPairMap;
-
     /// @brief Constructor
     DbAccessParser();
 
@@ -60,8 +53,6 @@ public:
     void parse(std::string& access_string,
                isc::data::ConstElementPtr database_config);
 
-
-protected:
     /// @brief Get database access parameters
     ///
     /// Used in testing to check that the configuration information has been
@@ -70,10 +61,10 @@ protected:
     /// @return Reference to the internal map of keyword/value pairs
     ///         representing database access information.  This is valid only
     ///         for so long as the the parser remains in existence.
-    const StringPairMap& getDbAccessParameters() const {
+    const DatabaseConnection::ParameterMap& getDbAccessParameters() const {
         return (values_);
     }
-
+protected:
 
     /// @brief Construct database access string
     ///
@@ -84,7 +75,7 @@ protected:
 
 private:
 
-    std::map<std::string, std::string> values_; ///< Stored parameter values
+    DatabaseConnection::ParameterMap values_; ///< Stored parameter values
 };
 
 };  // namespace db