Merge branch 'trac688'

src/lib/dns/message.cc

@@ -522,7 +522,7 @@ Message::addRRset(const Section section, RRsetPtr rrset) {
 
 bool
 Message::hasRRset(const Section section, const Name& name,
-                  const RRClass& rrclass, const RRType& rrtype)
+                  const RRClass& rrclass, const RRType& rrtype) const
 {
     if (static_cast<int>(section) >= MessageImpl::NUM_SECTIONS) {
         isc_throw(OutOfRange, "Invalid message section: " << section);
@@ -540,8 +540,9 @@ Message::hasRRset(const Section section, const Name& name,
 }
 
 bool
-Message::hasRRset(const Section section, const RRsetPtr& rrset) {
-    return (hasRRset(section, rrset->getName(), rrset->getClass(), rrset->getType()));
+Message::hasRRset(const Section section, const RRsetPtr& rrset) const {
+    return (hasRRset(section, rrset->getName(),
+                     rrset->getClass(), rrset->getType()));
 }
 
 bool

src/lib/dns/message.h

@@ -481,14 +481,14 @@ public:
     /// This should probably be extended to be a "find" method that returns
     /// a matching RRset if found.
     bool hasRRset(const Section section, const Name& name,
-                  const RRClass& rrclass, const RRType& rrtype);
+                  const RRClass& rrclass, const RRType& rrtype) const;
 
     /// \brief Determine whether the given section already has an RRset
     /// matching the one pointed to by the argumet
     ///
     /// \c section must be a valid constant of the \c Section type;
     /// otherwise, an exception of class \c OutOfRange will be thrown.
-    bool hasRRset(const Section section, const RRsetPtr& rrset);
+    bool hasRRset(const Section section, const RRsetPtr& rrset) const;
 
     /// \brief Remove RRSet from Message
     ///