From: JINMEI Tatuya <jinmei@isc.org>
Date: Fri, 1 Feb 2013 23:20:27 +0000 (-0800)
Subject: [master] use temp vars for SunStudio incapable of type matching with template.
X-Git-Tag: bind10-1.0.0-rc-release~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8eb3dbe543fa39f7702a48422777df9752dd8afb;p=thirdparty%2Fkea.git

[master] use temp vars for SunStudio incapable of type matching with template.

committing at my discretion.
---

diff --git a/src/lib/datasrc/tests/memory/treenode_rrset_unittest.cc b/src/lib/datasrc/tests/memory/treenode_rrset_unittest.cc
index c331eaa255..921ca68d45 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);
     }
 
     {