BIND 10 master, updated. bd56a0715a100c1fc0b643bf14fd0467a5ede80f [master] use a separate object to pass to a function instead of a temporary
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Apr 4 00:01:06 UTC 2013
The branch, master has been updated
via bd56a0715a100c1fc0b643bf14fd0467a5ede80f (commit)
from 1db082c00f5f3760c0959e4f4008ba5e5d0e491e (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 bd56a0715a100c1fc0b643bf14fd0467a5ede80f
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Wed Apr 3 23:59:52 2013 +0000
[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.
-----------------------------------------------------------------------
Summary of changes:
src/lib/datasrc/tests/cache_config_unittest.cc | 28 +++++++++++++-----------
1 file changed, 15 insertions(+), 13 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/tests/cache_config_unittest.cc b/src/lib/datasrc/tests/cache_config_unittest.cc
index 8b3e6af..8c266ec 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(
More information about the bind10-changes
mailing list