BIND 10 master, updated. b8cc8c81923195cfd626ad5bb9683cdb7b27332a Merge branch 'master' of /var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  b8cc8c81923195cfd626ad5bb9683cdb7b27332a (commit)
       via  2ee63204725537842cc027a25d31cf6ba071d3e8 (commit)
      from  e867d09129ec735157e7d035eeefa508e05e5416 (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 b8cc8c81923195cfd626ad5bb9683cdb7b27332a
Merge: 2ee6320 e867d09
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Jan 27 01:02:20 2012 +0000

    Merge branch 'master' of /var/bind10/git/bind10

commit 2ee63204725537842cc027a25d31cf6ba071d3e8
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Jan 27 01:00:23 2012 +0000

    [master] an urgent care fix to build failure after #1614 with older boost.
    we should either/both consider revisiting the interface so we avoid the
    issue as a result or require higher version of boost.  but for now this
    should be okay.

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

Summary of changes:
 src/lib/dns/rrset.h |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dns/rrset.h b/src/lib/dns/rrset.h
index 0160fb5..2066aaa 100644
--- a/src/lib/dns/rrset.h
+++ b/src/lib/dns/rrset.h
@@ -701,6 +701,14 @@ public:
         rrsig_->addRdata(rdata);
     }
 
+    // Workaround for older versions of boost: some don't support implicit
+    // conversion from shared_ptr<X> to shared_ptr<const X>.  Note: we should
+    // revisit the interface of managing RRset signatures, at which point this
+    // problem may go away.
+    void addRRsig(const rdata::RdataPtr rdata) {
+        static_cast<rdata::ConstRdataPtr>(rdata);
+    }
+
     /// \brief Adds an RRSIG RRset to this RRset
     void addRRsig(const AbstractRRset& sigs) {
         RdataIteratorPtr it = sigs.getRdataIterator();
@@ -717,6 +725,9 @@ public:
 
     void addRRsig(ConstRRsetPtr sigs) { addRRsig(*sigs); }
 
+    // Another workaround for older boost (see above)
+    void addRRsig(RRsetPtr sigs) { addRRsig(*sigs); }
+
     /// \brief Clear the RRSIGs for this RRset
     void removeRRsig() { rrsig_ = RRsetPtr(); }