BIND 10 trac1452, updated. e0c434fbb5e15c98af42b86248b3de1472a4a7b0 [1452] avoid using a reference in std::pair. it doesn't work with all compilers.

[BIND 10 source code commits]

The branch, trac1452 has been updated
       via  e0c434fbb5e15c98af42b86248b3de1472a4a7b0 (commit)
       via  b5e5d9e912722ff8ab9c2cf5e16ca913b64733aa (commit)
      from  09ed7a24bf40675619e01ffdc00068c1560f6f31 (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 e0c434fbb5e15c98af42b86248b3de1472a4a7b0
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Sat Dec 10 17:52:52 2011 -0800

    [1452] avoid using a reference in std::pair.  it doesn't work with all compilers.

commit b5e5d9e912722ff8ab9c2cf5e16ca913b64733aa
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Sat Dec 10 17:51:13 2011 -0800

    [1452] use <errno.h> instead of sys/errno.h.  the former seems to be more portable.

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

Summary of changes:
 src/lib/util/io/socketsession.cc             |    2 +-
 src/lib/util/tests/socketsession_unittest.cc |   20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/util/io/socketsession.cc b/src/lib/util/io/socketsession.cc
index ab79fd0..6837338 100644
--- a/src/lib/util/io/socketsession.cc
+++ b/src/lib/util/io/socketsession.cc
@@ -12,13 +12,13 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#include <sys/errno.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 
 #include <netinet/in.h>
 
+#include <errno.h>
 #include <stdint.h>
 #include <string.h>
 
diff --git a/src/lib/util/tests/socketsession_unittest.cc b/src/lib/util/tests/socketsession_unittest.cc
index 851e274..e7b76e9 100644
--- a/src/lib/util/tests/socketsession_unittest.cc
+++ b/src/lib/util/tests/socketsession_unittest.cc
@@ -14,9 +14,9 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/errno.h>
 #include <sys/un.h>
 
+#include <errno.h>
 #include <fcntl.h>
 #include <string.h>
 #include <netdb.h>
@@ -159,7 +159,7 @@ protected:
         return (s);
     }
 
-    typedef pair<const struct sockaddr&, socklen_t> SockAddrInfo;
+    typedef pair<const struct sockaddr*, socklen_t> SockAddrInfo;
     SockAddrInfo getSockAddr(const string& addr_str, const string& port_str) {
         struct addrinfo hints, *res;
         memset(&hints, 0, sizeof(hints));
@@ -167,7 +167,7 @@ protected:
         EXPECT_EQ(0, getaddrinfo(addr_str.c_str(), port_str.c_str(), NULL,
                                  &res));
         addrinfo_list_.push_back(res);
-        return (SockAddrInfo(*res->ai_addr, res->ai_addrlen));
+        return (SockAddrInfo(res->ai_addr, res->ai_addrlen));
     }
 
     // A helper method that creates a specified type of socket that is
@@ -188,7 +188,7 @@ protected:
             isc_throw(isc::Unexpected, "setsockopt(SO_REUSEADDR) failed: " <<
                       strerror(errno));
         }
-        if (bind(s, &sainfo.first, sainfo.second) < 0) {
+        if (bind(s, sainfo.first, sainfo.second) < 0) {
             close(s);
             isc_throw(isc::Unexpected, "bind(2) failed: " <<
                       strerror(errno));
@@ -305,7 +305,7 @@ ForwarderTest::checkPushAndPop(int family, int type, int protocol,
                                        false));
         setNonBlock(client_sock.fd, true);
         // This connect would "fail" due to EINPROGRESS.  Ignore it for now.
-        connect(client_sock.fd, &local.first, local.second);
+        connect(client_sock.fd, local.first, local.second);
         sockaddr_storage ss;
         socklen_t salen = sizeof(ss);
         server_sock.reset(accept(sock.fd, convertSockAddr(&ss), &salen));
@@ -326,8 +326,8 @@ ForwarderTest::checkPushAndPop(int family, int type, int protocol,
     }
 
     // Then push one socket session via the forwarder.
-    forwarder_.push(fwd_fd, family, type, protocol, local.first, remote.first,
-                    data, data_len);
+    forwarder_.push(fwd_fd, family, type, protocol, *local.first,
+                    *remote.first, data, data_len);
 
     // Pop the socket session we just pushed from a local receptor, and
     // check the content
@@ -340,8 +340,8 @@ ForwarderTest::checkPushAndPop(int family, int type, int protocol,
     EXPECT_EQ(family, sock_session.getFamily());
     EXPECT_EQ(type, sock_session.getType());
     EXPECT_EQ(protocol, sock_session.getProtocol());
-    checkSockAddrs(local.first, sock_session.getLocalEndpoint());
-    checkSockAddrs(remote.first, sock_session.getRemoteEndpoint());
+    checkSockAddrs(*local.first, sock_session.getLocalEndpoint());
+    checkSockAddrs(*remote.first, sock_session.getRemoteEndpoint());
     ASSERT_EQ(data_len, sock_session.getDataLength());
     EXPECT_EQ(0, memcmp(data, sock_session.getData(), data_len));
 
@@ -350,7 +350,7 @@ ForwarderTest::checkPushAndPop(int family, int type, int protocol,
     if (protocol == IPPROTO_UDP) {
         EXPECT_EQ(sizeof(TEST_DATA),
                   sendto(passed_sock.fd, TEST_DATA, sizeof(TEST_DATA), 0,
-                         convertSockAddr(&local.first), local.second));
+                         convertSockAddr(local.first), local.second));
     } else {
         server_sock.reset(-1);
         EXPECT_EQ(sizeof(TEST_DATA),