BIND 10 master, updated. 95fd27d60daef2d8ca272ce3fde3911787b1d127 [2103] Merge branch 'trac2103'

[BIND 10 source code commits]

The branch, master has been updated
       via  95fd27d60daef2d8ca272ce3fde3911787b1d127 (commit)
       via  633b07c7d425adbeba3cf81bf5dced2df9fbc64a (commit)
       via  5674a5dc2b08f3c594408fc0b933b9824ab453ab (commit)
       via  93e9a85ea91a3ee3b25304a7049921061084c4ea (commit)
      from  714ade4bb1e81b5b0dec1a3ef3de556f5fa6f6e3 (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 95fd27d60daef2d8ca272ce3fde3911787b1d127
Merge: 714ade4 633b07c
Author: Kean Johnston <kean at isc.org>
Date:   Sun Dec 8 11:48:44 2013 +0200

    [2103] Merge branch 'trac2103'

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

Summary of changes:
 .../resolve/tests/recursive_query_unittest_3.cc    |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/resolve/tests/recursive_query_unittest_3.cc b/src/lib/resolve/tests/recursive_query_unittest_3.cc
index df48740..7803b88 100644
--- a/src/lib/resolve/tests/recursive_query_unittest_3.cc
+++ b/src/lib/resolve/tests/recursive_query_unittest_3.cc
@@ -218,7 +218,8 @@ public:
     /// \param ec ASIO error code, completion code of asynchronous I/O issued
     ///        by the "server" to receive data.
     /// \param length Amount of data received.
-    void udpReceiveHandler(error_code ec = error_code(), size_t length = 0) {
+    void udpReceiveHandler(asio::error_code ec = asio::error_code(),
+                           size_t length = 0) {
         // Expected state should be one greater than the last state.
         EXPECT_EQ(static_cast<int>(expected_), static_cast<int>(last_) + 1);
         last_ = expected_;
@@ -281,7 +282,8 @@ public:
     ///
     /// \param ec Completion error code of the send.
     /// \param length Actual number of bytes sent.
-    void udpSendHandler(error_code ec = error_code(), size_t length = 0) {
+    void udpSendHandler(asio::error_code ec = asio::error_code(),
+                        size_t length = 0) {
         // Check send was OK
         EXPECT_EQ(0, ec.value());
         EXPECT_EQ(udp_length_, length);
@@ -301,7 +303,8 @@ public:
     ///
     /// \param socket Socket on which data will be received
     /// \param ec Boost error code, value should be zero.
-    void tcpAcceptHandler(error_code ec = error_code(), size_t length = 0) {
+    void tcpAcceptHandler(asio::error_code ec = asio::error_code(),
+                          size_t length = 0) {
         // Expect that the accept completed without a problem.
         EXPECT_EQ(0, ec.value());
 
@@ -323,7 +326,8 @@ public:
     /// \param ec ASIO error code, completion code of asynchronous I/O issued
     ///        by the "server" to receive data.
     /// \param length Amount of data received.
-    void tcpReceiveHandler(error_code ec = error_code(), size_t length = 0) {
+    void tcpReceiveHandler(asio::error_code ec = asio::error_code(),
+                           size_t length = 0) {
         // Expect that the receive completed without a problem.
         EXPECT_EQ(0, ec.value());
 
@@ -409,7 +413,7 @@ public:
     /// \param ec Boost error code, value should be zero.
     /// \param length Number of bytes sent.
     void tcpSendHandler(size_t expected_length = 0,
-                        error_code ec = error_code(),
+                        asio::error_code ec = asio::error_code(),
                         size_t length = 0)
     {
         EXPECT_EQ(0, ec.value());       // Expect no error