BIND 10 trac2095, updated. 33a71da4661953805f877b57d4b55b0479411939 [2095] include <cstring> for memcpy and qualify it with std::

BIND 10 source code commits bind10-changes at lists.isc.org
Sun Jul 29 04:37:43 UTC 2012


The branch, trac2095 has been updated
       via  33a71da4661953805f877b57d4b55b0479411939 (commit)
      from  09592fb9820856f6d254019cb2e30ebdfa5712d3 (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 33a71da4661953805f877b57d4b55b0479411939
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Sat Jul 28 21:36:47 2012 -0700

    [2095] include <cstring> for memcpy and qualify it with std::
    
    will be needed for sunstudio.

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

Summary of changes:
 src/lib/datasrc/memory/rdata_encoder.cc |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory/rdata_encoder.cc b/src/lib/datasrc/memory/rdata_encoder.cc
index 12e4a8c..f256d44 100644
--- a/src/lib/datasrc/memory/rdata_encoder.cc
+++ b/src/lib/datasrc/memory/rdata_encoder.cc
@@ -28,6 +28,7 @@
 #include <boost/static_assert.hpp>
 
 #include <cassert>
+#include <cstring>
 #include <vector>
 
 #include <stdint.h>
@@ -502,8 +503,8 @@ RdataEncoder::encode(void* buf, size_t buf_len) const {
     if (!impl_->field_composer_.data_lengths_.empty()) {
         const size_t varlen_fields_len =
             impl_->field_composer_.data_lengths_.size() * sizeof(uint16_t);
-        memcpy(lenp, &impl_->field_composer_.data_lengths_[0],
-               varlen_fields_len);
+        std::memcpy(lenp, &impl_->field_composer_.data_lengths_[0],
+                    varlen_fields_len);
         lenp += impl_->field_composer_.data_lengths_.size();
         dp += varlen_fields_len;
     }
@@ -511,16 +512,16 @@ RdataEncoder::encode(void* buf, size_t buf_len) const {
     if (!impl_->rrsig_lengths_.empty()) {
         const size_t rrsigs_len =
             impl_->rrsig_lengths_.size() * sizeof(uint16_t);
-        memcpy(lenp, &impl_->rrsig_lengths_[0], rrsigs_len);
+        std::memcpy(lenp, &impl_->rrsig_lengths_[0], rrsigs_len);
         dp += rrsigs_len;
     }
     // Encode main RDATA
-    memcpy(dp, impl_->field_composer_.getData(),
-           impl_->field_composer_.getLength());
+    std::memcpy(dp, impl_->field_composer_.getData(),
+                impl_->field_composer_.getLength());
     dp += impl_->field_composer_.getLength();
     // Encode RRSIGs, if any
-    memcpy(dp, impl_->rrsig_buffer_.getData(),
-           impl_->rrsig_buffer_.getLength());
+    std::memcpy(dp, impl_->rrsig_buffer_.getData(),
+                impl_->rrsig_buffer_.getLength());
     dp += impl_->rrsig_buffer_.getLength();
 
     // The validation at the entrance must ensure this



More information about the bind10-changes mailing list