diff options
| author | JINMEI Tatuya <jinmei@isc.org> | 2010-06-02 07:57:26 +0200 |
|---|---|---|
| committer | JINMEI Tatuya <jinmei@isc.org> | 2010-06-02 07:57:26 +0200 |
| commit | ea57b643cd72cb389a371affdb7cc919c52124f8 (patch) | |
| tree | 611c715020f8dcd5e55fa72f068e42a4acb62748 | |
| parent | cast NULL to deal with some type of compilers (diff) | |
| download | kea-ea57b643cd72cb389a371affdb7cc919c52124f8.tar.xz kea-ea57b643cd72cb389a371affdb7cc919c52124f8.zip | |
same workaround as r2040
git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@2041 e5f2f494-b856-4b98-b285-d166d9295462
| -rw-r--r-- | src/lib/datasrc/tests/static_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/datasrc/tests/static_unittest.cc b/src/lib/datasrc/tests/static_unittest.cc index 86bb99ccbe..280446a8af 100644 --- a/src/lib/datasrc/tests/static_unittest.cc +++ b/src/lib/datasrc/tests/static_unittest.cc @@ -214,8 +214,8 @@ TEST_F(StaticDataSourceTest, findClosestEnclosureForVersionClassAny) { TEST_F(StaticDataSourceTest, findClosestEnclosureForVersionClassMismatch) { NameMatch name_match(version_name); data_source.findClosestEnclosure(name_match, RRClass::IN()); - EXPECT_EQ(NULL, name_match.closestName()); - EXPECT_EQ(NULL, name_match.bestDataSrc()); + EXPECT_EQ(static_cast<void*>(NULL), name_match.closestName()); + EXPECT_EQ(static_cast<void*>(NULL), name_match.bestDataSrc()); } TEST_F(StaticDataSourceTest, findClosestEnclosureForVersionPartial) { @@ -242,8 +242,8 @@ TEST_F(StaticDataSourceTest, findClosestEnclosureForAuthorsPartial) { TEST_F(StaticDataSourceTest, findClosestEnclosureNoMatch) { NameMatch name_match(nomatch_name); data_source.findClosestEnclosure(name_match, rrclass); - EXPECT_EQ(NULL, name_match.closestName()); - EXPECT_EQ(NULL, name_match.bestDataSrc()); + EXPECT_EQ(static_cast<void*>(NULL), name_match.closestName()); + EXPECT_EQ(static_cast<void*>(NULL), name_match.bestDataSrc()); } TEST_F(StaticDataSourceTest, findRRsetVersionTXT) { |