BIND 10 master, updated. 6d4b7f727228d8966a6700b920e0d1ae71c0aa92 [master] ensure constness in ?: expressions. will fix build error for some g++

[BIND 10 source code commits]

The branch, master has been updated
       via  6d4b7f727228d8966a6700b920e0d1ae71c0aa92 (commit)
      from  82cf8a980ba6ec9f7df3fc80703bb5988640cd99 (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 6d4b7f727228d8966a6700b920e0d1ae71c0aa92
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri May 11 18:49:57 2012 +0000

    [master] ensure constness in ?: expressions. will fix build error for some g++
    
    okayed on jabber.

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

Summary of changes:
 src/lib/datasrc/tests/memory_datasrc_unittest.cc |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/tests/memory_datasrc_unittest.cc b/src/lib/datasrc/tests/memory_datasrc_unittest.cc
index 4fc35e1..a881f2d 100644
--- a/src/lib/datasrc/tests/memory_datasrc_unittest.cc
+++ b/src/lib/datasrc/tests/memory_datasrc_unittest.cc
@@ -1370,6 +1370,10 @@ InMemoryZoneFinderTest::wildcardCheck(
         (find_options & ZoneFinder::FIND_DNSSEC) != 0) {
         expected_nsec = rr_nsec_;
     }
+    // Explicitly converting the following to const pointers; some compilers
+    // would complain about mixed use of const and non const in ?: below.
+    const ConstRRsetPtr rr_wild = rr_wild_;
+    const ConstRRsetPtr rr_cnamewild = rr_cnamewild_;
 
     // Search the original name of wildcard
     {
@@ -1393,7 +1397,7 @@ InMemoryZoneFinderTest::wildcardCheck(
         SCOPED_TRACE("Search at created child");
         findTest(Name("a.wild.example.org"), RRType::A(),
                  wild_ok ? ZoneFinder::SUCCESS : ZoneFinder::NXDOMAIN, false,
-                 wild_ok ? rr_wild_ : expected_nsec,
+                 wild_ok ? rr_wild : expected_nsec,
                  wild_expected_flags, NULL, find_options, wild_ok);
     }
 
@@ -1402,7 +1406,7 @@ InMemoryZoneFinderTest::wildcardCheck(
         SCOPED_TRACE("Matching CNAME");
         findTest(Name("a.cnamewild.example.org"), RRType::A(),
                  wild_ok ? ZoneFinder::CNAME : ZoneFinder::NXDOMAIN, false,
-                 wild_ok ? rr_cnamewild_ : expected_nsec,
+                 wild_ok ? rr_cnamewild : expected_nsec,
                  wild_expected_flags, NULL, find_options, wild_ok);
     }
 
@@ -1411,7 +1415,7 @@ InMemoryZoneFinderTest::wildcardCheck(
         SCOPED_TRACE("Search at created grand-child");
         findTest(Name("a.b.wild.example.org"), RRType::A(),
                  wild_ok ? ZoneFinder::SUCCESS : ZoneFinder::NXDOMAIN, false,
-                 wild_ok ? rr_wild_ : expected_nsec,
+                 wild_ok ? rr_wild : expected_nsec,
                  wild_expected_flags, NULL, find_options, wild_ok);
     }