BIND 10 master, updated. 69aae7b1a831c5393785759efa3bcdcd238f599c [master] 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  69aae7b1a831c5393785759efa3bcdcd238f599c (commit)
       via  28ec5cffac56ead6c2c79ffd31427c46dde1b061 (commit)
      from  06d963e3098ea6ead0eae1b54f178222b9fff479 (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 69aae7b1a831c5393785759efa3bcdcd238f599c
Merge: 28ec5cf 06d963e
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Mar 13 20:58:44 2012 -0700

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

commit 28ec5cffac56ead6c2c79ffd31427c46dde1b061
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Mar 13 20:57:21 2012 -0700

    [master] fix build failure due to 'no return' error after assert().
    
    okayed by muks on jabber.

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

Summary of changes:
 src/lib/datasrc/memory_datasrc.cc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory_datasrc.cc b/src/lib/datasrc/memory_datasrc.cc
index 477baa5..eb6e2c5 100644
--- a/src/lib/datasrc/memory_datasrc.cc
+++ b/src/lib/datasrc/memory_datasrc.cc
@@ -1315,12 +1315,12 @@ getAdditionalName(RRType rrtype, const rdata::Rdata& rdata) {
     if (rrtype == RRType::NS()) {
         const generic::NS& ns = dynamic_cast<const generic::NS&>(rdata);
         return (ns.getNSName());
-    } else if (rrtype == RRType::MX()) {
+    } else {
+        // In our usage the only other possible case is MX.
+        assert(rrtype == RRType::MX());
         const generic::MX& mx = dynamic_cast<const generic::MX&>(rdata);
         return (mx.getMXName());
     }
-    // In our usage this shouldn't happen.
-    assert(false);
 }
 
 bool