BIND 10 master, updated. f0246bfbe7e40e2e7897911797f910520209812b Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  f0246bfbe7e40e2e7897911797f910520209812b (commit)
       via  7c6a56c81ba347d181584c47b0fb681510837efb (commit)
      from  7017367c1118709bb9d793814493df4dcab28221 (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 f0246bfbe7e40e2e7897911797f910520209812b
Merge: 7c6a56c 7017367
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Dec 23 03:31:30 2011 +0000

    Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

commit 7c6a56c81ba347d181584c47b0fb681510837efb
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Dec 23 03:30:43 2011 +0000

    [master] reverted the sunstudio "workaround".  more accurately we should have
    specified std:: when we included <cstring>.

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

Summary of changes:
 src/lib/util/io/fd_share.cc |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/util/io/fd_share.cc b/src/lib/util/io/fd_share.cc
index d5f2c5d..9c02a33 100644
--- a/src/lib/util/io/fd_share.cc
+++ b/src/lib/util/io/fd_share.cc
@@ -12,9 +12,7 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-// XXX: SunStudio compiler would complain about memcpy if we used cstring,
-// so we intentionally include the .h version here.
-#include <string.h>
+#include <cstring>
 #include <cstdlib>
 
 #include <sys/types.h>
@@ -105,7 +103,7 @@ recv_fd(const int sock) {
     int fd = FD_OTHER_ERROR;
     if (cmsg != NULL && cmsg->cmsg_len == cmsg_len(sizeof(int)) &&
         cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS) {
-        memcpy(&fd, CMSG_DATA(cmsg), sizeof(int));
+        std::memcpy(&fd, CMSG_DATA(cmsg), sizeof(int));
     }
     free(msghdr.msg_control);
     return (fd);
@@ -134,7 +132,7 @@ send_fd(const int sock, const int fd) {
     cmsg->cmsg_len = cmsg_len(sizeof(int));
     cmsg->cmsg_level = SOL_SOCKET;
     cmsg->cmsg_type = SCM_RIGHTS;
-    memcpy(CMSG_DATA(cmsg), &fd, sizeof(int));
+    std::memcpy(CMSG_DATA(cmsg), &fd, sizeof(int));
 
     const int ret = sendmsg(sock, &msghdr, 0);
     free(msghdr.msg_control);