BIND 10 master, updated. 54c6617096e184520c918d308ccb31eb422046ec [master] fixed a build error on git.bind10 by using exactly the same type in ?:

BIND 10 source code commits bind10-changes at lists.isc.org
Sat Feb 25 00:59:47 UTC 2012


The branch, master has been updated
       via  54c6617096e184520c918d308ccb31eb422046ec (commit)
      from  82bb5bc1cd3385d1bd0362c10308afb04a0e6914 (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 54c6617096e184520c918d308ccb31eb422046ec
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Feb 24 16:59:20 2012 -0800

    [master] fixed a build error on git.bind10 by using exactly the same type in ?:

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

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

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/tests/memory_datasrc_unittest.cc b/src/lib/datasrc/tests/memory_datasrc_unittest.cc
index e5ccdfa..cd6e968 100644
--- a/src/lib/datasrc/tests/memory_datasrc_unittest.cc
+++ b/src/lib/datasrc/tests/memory_datasrc_unittest.cc
@@ -539,7 +539,8 @@ public:
         if (zone_finder == NULL) {
             zone_finder = &zone_finder_;
         }
-        const ConstRRsetPtr answer_sig = answer ? answer->getRRsig() : answer;
+        const ConstRRsetPtr answer_sig = answer ? answer->getRRsig() :
+            RRsetPtr(); // note we use the same type as of retval of getRRsig()
         // The whole block is inside, because we need to check the result and
         // we can't assign to FindResult
         EXPECT_NO_THROW({



More information about the bind10-changes mailing list