From: Jelte Jansen <jelte@isc.org>
Date: Fri, 11 May 2012 10:50:54 +0000 (+0200)
Subject: [nsec_merge] Merge branch 'trac1807' into nsec_merge
X-Git-Tag: trac2351_base~226^2~157
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8efd8ed25b2bf5ac515b20e6fdd567f854365fb8;p=thirdparty%2Fkea.git

[nsec_merge] Merge branch 'trac1807' into nsec_merge

Conflicts:
	src/lib/datasrc/tests/rbtree_unittest.cc
---

8efd8ed25b2bf5ac515b20e6fdd567f854365fb8
diff --cc src/lib/datasrc/tests/rbtree_unittest.cc
index 84e1745770,c8858f73f8..25eafb4c6a
--- a/src/lib/datasrc/tests/rbtree_unittest.cc
+++ b/src/lib/datasrc/tests/rbtree_unittest.cc
@@@ -443,10 -440,9 +438,9 @@@ TEST_F(RBTreeTest, previousNode) 
          // If we start at the lowest (which is "a"), we get to the beginning
          // right away.
          EXPECT_EQ(RBTree<int>::EXACTMATCH,
-                   rbtree.find<void*>(Name(names[0]), &node, node_path, NULL,
-                                      NULL));
+                   rbtree.find(Name(names[0]), &node, node_path));
          EXPECT_NE(static_cast<void*>(NULL), node);
 -        EXPECT_EQ(NULL, rbtree.previousNode(node_path));
 +        EXPECT_EQ(static_cast<void*>(NULL), rbtree.previousNode(node_path));
          node = NULL;
          node_path.clear();
      }