]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] use temp vars for SunStudio incapable of type matching with template.
authorJINMEI Tatuya <jinmei@isc.org>
Fri, 1 Feb 2013 23:20:27 +0000 (15:20 -0800)
committerJINMEI Tatuya <jinmei@isc.org>
Fri, 1 Feb 2013 23:20:27 +0000 (15:20 -0800)
committing at my discretion.

src/lib/datasrc/tests/memory/treenode_rrset_unittest.cc

index c331eaa255f10f91659f937377317bd3021ad664..921ca68d45c360c876f62571d1dd9a93b2cfb14e 100644 (file)
@@ -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);
     }
 
     {