BIND 10 master, updated. 8eb3dbe543fa39f7702a48422777df9752dd8afb [master] use temp vars for SunStudio incapable of type matching with template.

[BIND 10 source code commits]

The branch, master has been updated
       via  8eb3dbe543fa39f7702a48422777df9752dd8afb (commit)
      from  fbb78097f3aca9bd8fbf4cce1f1c7169719d04e5 (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 8eb3dbe543fa39f7702a48422777df9752dd8afb
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Feb 1 15:20:27 2013 -0800

    [master] use temp vars for SunStudio incapable of type matching with template.
    
    committing at my discretion.

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

Summary of changes:
 .../tests/memory/treenode_rrset_unittest.cc        |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/tests/memory/treenode_rrset_unittest.cc b/src/lib/datasrc/tests/memory/treenode_rrset_unittest.cc
index c331eaa..921ca68 100644
--- a/src/lib/datasrc/tests/memory/treenode_rrset_unittest.cc
+++ b/src/lib/datasrc/tests/memory/treenode_rrset_unittest.cc
@@ -354,14 +354,18 @@ TEST_F(TreeNodeRRsetTest, toWire) {
         const uint32_t ttl = 0;
         const TreeNodeRRset rrset(rrclass_, www_node_, a_rdataset_, true,
                                   &ttl);
-        checkToWireResult(expected_renderer, actual_renderer, rrset,
-                          www_name_,
-                          textToRRset("www.example.com. 0 IN A 192.0.2.1\n"
-                                      "www.example.com. 0 IN A 192.0.2.2"),
-                          textToRRset("www.example.com. 0 IN RRSIG "
-                                      "A 5 2 3600 20120814220826 "
-                                      "20120715220826 1234 example.com. FAKE"),
-                          true);
+        // We need separate variable for the following two: SunStudio cannot
+        // automatically promote RRsetPtr to ConstRRsetPtr in the templated
+        // function.
+        ConstRRsetPtr expected_rrset =
+            textToRRset("www.example.com. 0 IN A 192.0.2.1\n"
+                        "www.example.com. 0 IN A 192.0.2.2");
+        ConstRRsetPtr expected_rrsig_rrset =
+            textToRRset("www.example.com. 0 IN RRSIG "
+                        "A 5 2 3600 20120814220826 "
+                        "20120715220826 1234 example.com. FAKE");
+        checkToWireResult(expected_renderer, actual_renderer, rrset, www_name_,
+                          expected_rrset, expected_rrsig_rrset, true);
     }
 
     {