BIND 10 trac2206, updated. 78dfd7dcd6d76cb75d288a3887e8b099c12f3080 [2268] Move both const and non-const checks into a single testcase

[BIND 10 source code commits]

The branch, trac2206 has been updated
       via  78dfd7dcd6d76cb75d288a3887e8b099c12f3080 (commit)
      from  47c013b000db7235e1ab798eadebc3b42984b06e (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 78dfd7dcd6d76cb75d288a3887e8b099c12f3080
Author: Mukund Sivaraman <muks at isc.org>
Date:   Thu Oct 4 13:15:37 2012 +0530

    [2268] Move both const and non-const checks into a single testcase

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

Summary of changes:
 .../tests/memory/zone_table_segment_unittest.cc    |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/tests/memory/zone_table_segment_unittest.cc b/src/lib/datasrc/tests/memory/zone_table_segment_unittest.cc
index efee347..6bdd737 100644
--- a/src/lib/datasrc/tests/memory/zone_table_segment_unittest.cc
+++ b/src/lib/datasrc/tests/memory/zone_table_segment_unittest.cc
@@ -55,24 +55,23 @@ TEST_F(ZoneTableSegmentTest, create) {
 }
 
 // Helper function to check const and non-const methods.
-template <typename TS, typename TH>
+template <typename TS, typename TH, typename TT>
 void
 testGetHeader(ZoneTableSegment* segment) {
     TH& header = static_cast<TS*>(segment)->getHeader();
 
     // The zone table is unset.
-    const ZoneTable* table = header.getTable();
+    TT* table = header.getTable();
     EXPECT_EQ(static_cast<void*>(NULL), table);
 }
 
 TEST_F(ZoneTableSegmentTest, getHeader) {
     // non-const version.
-    testGetHeader<ZoneTableSegment, ZoneTableHeader>(segment_);
-}
+    testGetHeader<ZoneTableSegment, ZoneTableHeader, ZoneTable>(segment_);
 
-TEST_F(ZoneTableSegmentTest, getHeaderConst) {
     // const version.
-    testGetHeader<const ZoneTableSegment, const ZoneTableHeader>(segment_);
+    testGetHeader<const ZoneTableSegment, const ZoneTableHeader,
+                  const ZoneTable>(segment_);
 }
 
 TEST_F(ZoneTableSegmentTest, getMemorySegment) {