BIND 10 master, updated. c5b7c61747858fb2fb34e62f4f04d4be663f7adb Merge branch 'master' into trac2009

[BIND 10 source code commits]

The branch, master has been updated
       via  c5b7c61747858fb2fb34e62f4f04d4be663f7adb (commit)
       via  afc0fe7345aa86ba3eaebf1bba8f62db64760c1f (commit)
       via  20a21a87777944fea10cf615b0b54d6e96df00ae (commit)
       via  266ddad13b59fe73124e35af6f3a3c62f0f743f5 (commit)
      from  f89b4428468decd82132b0e0a02f2dc171fd690c (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 c5b7c61747858fb2fb34e62f4f04d4be663f7adb
Merge: afc0fe7 f89b442
Author: Mukund Sivaraman <muks at isc.org>
Date:   Thu May 31 10:49:11 2012 +0530

    Merge branch 'master' into trac2009

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

Summary of changes:
 src/bin/sockcreator/Makefile.am |    2 +-
 src/lib/xfr/xfrout_client.cc    |   10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/sockcreator/Makefile.am b/src/bin/sockcreator/Makefile.am
index e954c02..8494114 100644
--- a/src/bin/sockcreator/Makefile.am
+++ b/src/bin/sockcreator/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = tests
+SUBDIRS = . tests
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 
diff --git a/src/lib/xfr/xfrout_client.cc b/src/lib/xfr/xfrout_client.cc
index 227ffc4..af0c1b5 100644
--- a/src/lib/xfr/xfrout_client.cc
+++ b/src/lib/xfr/xfrout_client.cc
@@ -82,8 +82,14 @@ XfroutClient::sendXfroutRequestInfo(const int tcp_sock,
 
     // TODO: this shouldn't be blocking send, even though it's unlikely to
     // block.
-    // converting the 16-bit word to network byte order.
-    const uint8_t lenbuf[2] = { msg_len >> 8, msg_len & 0xff };
+    // Converting the 16-bit word to network byte order.
+
+    // Splitting msg_len below performs something called a 'narrowing
+    // conversion' (conversion of uint16_t to uint8_t). C++0x (and GCC
+    // 4.7) requires explicit casting when a narrowing conversion is
+    // performed. For reference, see 8.5.4/6 of n3225.
+    const uint8_t lenbuf[2] = { static_cast<uint8_t>(msg_len >> 8),
+                                static_cast<uint8_t>(msg_len & 0xff) };
     if (send(impl_->socket_.native(), lenbuf, sizeof(lenbuf), 0) !=
         sizeof(lenbuf)) {
         isc_throw(XfroutError,