From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 3 Apr 2013 23:59:52 +0000 (+0000)
Subject: [master] use a separate object to pass to a function instead of a temporary
X-Git-Tag: bind10-1.1.0beta1-release~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd56a0715a100c1fc0b643bf14fd0467a5ede80f;p=thirdparty%2Fkea.git

[master] use a separate object to pass to a function instead of a temporary

some compilers claim it causes a copy whie it's defined non copyable,
triggering an error.  this fixes some build failure reported by the bots.
should mostly trivial, so committing at my discretion.
---

diff --git a/src/lib/datasrc/tests/cache_config_unittest.cc b/src/lib/datasrc/tests/cache_config_unittest.cc
index 8b3e6af4e6..8c266ec3b5 100644
--- a/src/lib/datasrc/tests/cache_config_unittest.cc
+++ b/src/lib/datasrc/tests/cache_config_unittest.cc
@@ -74,14 +74,15 @@ TEST_F(CacheConfigTest, constructMasterFiles) {
                           " \"example.org\": \"file2\","
                           " \"example.info\": \"file3\"}"
                           "}"));
-    EXPECT_EQ(3, countZones(CacheConfig("MasterFiles", 0, *config_elem_multi,
-                                        true)));
+    const CacheConfig cache_conf2("MasterFiles", 0, *config_elem_multi, true);
+    EXPECT_EQ(3, countZones(cache_conf2));
 
     // A bit unusual, but acceptable case: empty parameters, so no zones.
-    EXPECT_EQ(0, countZones(
-                  CacheConfig("MasterFiles", 0,
-                              *Element::fromJSON("{\"cache-enable\": true,"
-                                                 " \"params\": {}}"), true)));
+    const CacheConfig cache_conf3("MasterFiles", 0,
+                                  *Element::fromJSON("{\"cache-enable\": true,"
+                                                     " \"params\": {}}"),
+                                  true);
+    EXPECT_EQ(0, countZones(cache_conf3));
 }
 
 TEST_F(CacheConfigTest, badConstructMasterFiles) {
@@ -153,15 +154,16 @@ TEST_F(CacheConfigTest, constructWithMock) {
                           " \"cache-zones\": "
                           "[\"example.com\", \"example.org\",\"example.info\"]"
                           "}"));
-    EXPECT_EQ(3, countZones(CacheConfig("mock", &mock_client_,
-                                        *config_elem_multi, true)));
+    const CacheConfig cache_conf2("mock", &mock_client_, *config_elem_multi,
+                                  true);
+    EXPECT_EQ(3, countZones(cache_conf2));
 
     // Empty
-    EXPECT_EQ(0, countZones(
-                  CacheConfig("mock", &mock_client_,
-                              *Element::fromJSON("{\"cache-enable\": true,"
-                                                 " \"cache-zones\": []}"),
-                              true)));
+    const CacheConfig cache_conf3(
+        "mock", &mock_client_,
+        *Element::fromJSON("{\"cache-enable\": true,"
+                           " \"cache-zones\": []}"), true);
+    EXPECT_EQ(0, countZones(cache_conf3));
 
     // disabled.  value of cache-zones are ignored.
     const ConstElementPtr config_elem_disabled(