BIND 10 master, updated. d72eca9cdec9acb880e136c1b908fb136c7e1957 [master] Qualify "map" with "std::" to overcome Solaris compilation problems

[BIND 10 source code commits]

The branch, master has been updated
       via  d72eca9cdec9acb880e136c1b908fb136c7e1957 (commit)
      from  a3cd0126b46392c4c150d9e865ff82811e24006f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d72eca9cdec9acb880e136c1b908fb136c7e1957
Author: Stephen Morris <stephen at isc.org>
Date:   Tue Jan 22 19:01:25 2013 +0000

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

-----------------------------------------------------------------------

Summary of changes:
 src/lib/dhcpsrv/dbaccess_parser.cc                |    2 +-
 src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dhcpsrv/dbaccess_parser.cc b/src/lib/dhcpsrv/dbaccess_parser.cc
index c32284e..d29cf54 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 05c0743..24cfb1a 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());