From: Stephen Morris <stephen@isc.org>
Date: Tue, 22 Jan 2013 19:01:25 +0000 (+0000)
Subject: [master] Qualify "map" with "std::" to overcome Solaris compilation problems
X-Git-Tag: bind10-1.0.0-rc-release~29^2~1^2~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d72eca9cdec9acb880e136c1b908fb136c7e1957;p=thirdparty%2Fkea.git

[master] Qualify "map" with "std::" to overcome Solaris compilation problems
---

diff --git a/src/lib/dhcpsrv/dbaccess_parser.cc b/src/lib/dhcpsrv/dbaccess_parser.cc
index c32284e5a3..d29cf54293 100644
--- a/src/lib/dhcpsrv/dbaccess_parser.cc
+++ b/src/lib/dhcpsrv/dbaccess_parser.cc
@@ -48,7 +48,7 @@ DbAccessParser::build(isc::data::ConstElementPtr config_value) {
     // 4. If all is OK, update the stored keyword/value pairs.
 
     // 1. Take a copy of the stored keyword/value pairs.
-    map<string, string> values_copy = values_;
+    std::map<string, string> values_copy = values_;
 
     // 2. Update the copy with the passed keywords.
     BOOST_FOREACH(ConfigPair param, config_value->mapValue()) {
diff --git a/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc b/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc
index 05c0743d8d..24cfb1a2eb 100644
--- a/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc
+++ b/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc
@@ -120,7 +120,7 @@ public:
         SCOPED_TRACE(trace_string);
 
         // Construct a map of keyword value pairs.
-        map<string, string> expected;
+        std::map<string, string> expected;
         size_t expected_count = 0;
         for (size_t i = 0; keyval[i] != NULL; i += 2) {
             // Get the value.  This should not be NULL
@@ -147,7 +147,7 @@ public:
              actual != parameters.end(); ++actual) {
 
             // Does the keyword exist in the set of expected keywords?
-            map<string, string>::iterator corresponding =
+            std::map<string, string>::iterator corresponding =
                 expected.find(actual->first);
             ASSERT_TRUE(corresponding != expected.end());