BIND 10 master, updated. 6ef9a033a509e20fd993dac75fb21c287c23e864 Explicitly use std:: for map

[BIND 10 source code commits]

The branch, master has been updated
       via  6ef9a033a509e20fd993dac75fb21c287c23e864 (commit)
       via  ea15a1dd5516c65ce65517c4c131c78dd8814af6 (commit)
      from  76ee30d738794d244518b6e11a05d44a7a725f1d (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 6ef9a033a509e20fd993dac75fb21c287c23e864
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed Jul 25 13:52:04 2012 +0200

    Explicitly use std:: for map
    
    It seems some compilers can't find it otherwise. This should make them
    happy.

commit ea15a1dd5516c65ce65517c4c131c78dd8814af6
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed Jul 25 13:46:23 2012 +0200

    Don't require dynamic libs on static link
    
    There were tests that should have been disabled too, as they use the
    static data source, which is loaded dynamically from a .so. Some systems
    break on them.

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

Summary of changes:
 src/bin/auth/auth_srv.cc                |    7 ++++---
 src/bin/auth/tests/auth_srv_unittest.cc |    8 ++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/auth_srv.cc b/src/bin/auth/auth_srv.cc
index 32d36a5..0a17d1b 100644
--- a/src/bin/auth/auth_srv.cc
+++ b/src/bin/auth/auth_srv.cc
@@ -260,12 +260,13 @@ public:
     const boost::shared_ptr<TSIGKeyRing>* keyring_;
 
     /// The client list
-    map<RRClass, boost::shared_ptr<ConfigurableClientList> > client_lists_;
+    std::map<RRClass, boost::shared_ptr<ConfigurableClientList> >
+        client_lists_;
 
     boost::shared_ptr<ConfigurableClientList> getClientList(const RRClass&
                                                             rrclass)
     {
-        const map<RRClass, boost::shared_ptr<ConfigurableClientList> >::
+        const std::map<RRClass, boost::shared_ptr<ConfigurableClientList> >::
             const_iterator it(client_lists_.find(rrclass));
         if (it == client_lists_.end()) {
             return (boost::shared_ptr<ConfigurableClientList>());
@@ -955,7 +956,7 @@ AuthSrv::getClientList(const RRClass& rrclass) {
 vector<RRClass>
 AuthSrv::getClientListClasses() const {
     vector<RRClass> result;
-    for (map<RRClass, boost::shared_ptr<ConfigurableClientList> >::
+    for (std::map<RRClass, boost::shared_ptr<ConfigurableClientList> >::
          const_iterator it(impl_->client_lists_.begin());
          it != impl_->client_lists_.end(); ++it) {
         result.push_back(it->first);
diff --git a/src/bin/auth/tests/auth_srv_unittest.cc b/src/bin/auth/tests/auth_srv_unittest.cc
index 981d291..4dddfaf 100644
--- a/src/bin/auth/tests/auth_srv_unittest.cc
+++ b/src/bin/auth/tests/auth_srv_unittest.cc
@@ -966,7 +966,11 @@ TEST_F(AuthSrvTest, updateWithInMemoryClient) {
                 opcode.getCode(), QR_FLAG, 1, 0, 0, 0);
 }
 
+#ifdef USE_STATIC_LINK
+TEST_F(AuthSrvTest, DISABLED_queryWithInMemoryClientNoDNSSEC) {
+#else
 TEST_F(AuthSrvTest, queryWithInMemoryClientNoDNSSEC) {
+#endif
     // In this example, we do simple check that query is handled from the
     // query handler class, and confirm it returns no error and a non empty
     // answer section.  Detailed examination on the response content
@@ -982,7 +986,11 @@ TEST_F(AuthSrvTest, queryWithInMemoryClientNoDNSSEC) {
                 opcode.getCode(), QR_FLAG | AA_FLAG, 1, 1, 2, 1);
 }
 
+#ifdef USE_STATIC_LINK
+TEST_F(AuthSrvTest, DISABLED_queryWithInMemoryClientDNSSEC) {
+#else
 TEST_F(AuthSrvTest, queryWithInMemoryClientDNSSEC) {
+#endif
     // Similar to the previous test, but the query has the DO bit on.
     // The response should contain RRSIGs, and should have more RRs than
     // the previous case.