BIND 10 trac2440, updated. 0c87e932ff56312f42ad727dc2451035e0e6a744 [2440] added note about how long old encoded data must be kept valid for merge.

[BIND 10 source code commits]

The branch, trac2440 has been updated
       via  0c87e932ff56312f42ad727dc2451035e0e6a744 (commit)
       via  fe9a6b33557a3247ed59538f72e567cb80a1f8e0 (commit)
      from  896dd15f4ac12826fa7e7dea909e310c9d1518b9 (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 0c87e932ff56312f42ad727dc2451035e0e6a744
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Mon Feb 25 09:36:20 2013 -0800

    [2440] added note about how long old encoded data must be kept valid for merge.

commit fe9a6b33557a3247ed59538f72e567cb80a1f8e0
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Mon Feb 25 09:23:41 2013 -0800

    [2440] removed unnecessary boost::bind wrapper

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

Summary of changes:
 src/lib/datasrc/memory/rdata_serialization.cc |    3 +--
 src/lib/datasrc/memory/rdata_serialization.h  |    6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory/rdata_serialization.cc b/src/lib/datasrc/memory/rdata_serialization.cc
index 7cef6d6..01ddd7f 100644
--- a/src/lib/datasrc/memory/rdata_serialization.cc
+++ b/src/lib/datasrc/memory/rdata_serialization.cc
@@ -388,8 +388,7 @@ struct RdataEncoder::RdataEncoderImpl {
                          old_data_len_(0), old_sig_len_(0),
                          old_length_fields_(NULL), old_data_(NULL),
                          old_sig_data_(NULL), olddata_buffer_(0),
-                         rdatas_(boost::bind(RdataLess, _1, _2)),
-                         rrsigs_(boost::bind(RdataLess, _1, _2))
+                         rdatas_(RdataLess), rrsigs_(RdataLess)
     {}
 
     // Common initialization for RdataEncoder::start().
diff --git a/src/lib/datasrc/memory/rdata_serialization.h b/src/lib/datasrc/memory/rdata_serialization.h
index 1582d48..8edf47e 100644
--- a/src/lib/datasrc/memory/rdata_serialization.h
+++ b/src/lib/datasrc/memory/rdata_serialization.h
@@ -169,7 +169,11 @@ public:
     ///
     /// The caller must also ensure that previously encoded data (pointed
     /// to by \c old_data) will be valid and intact throughout the encoding
-    /// session started by this method.
+    /// session started by this method.  The resulting encoded data (by
+    /// \c encode()) won't refer to the previous data, so once encoding the
+    /// merged data is completed (and unless this encoding session continues
+    /// for another attempt of encoding, which is unlikely), the caller can
+    /// modify or destroy the old data.
     ///
     /// \param rrclass The RR class of RDATA to be encoded in the session.
     /// \param rrtype The RR type of RDATA to be encoded in the session.