Browse Source

yet another set of editorial nits: space position around */&

JINMEI Tatuya 14 years ago
parent
commit
64ebfb19dd
2 changed files with 13 additions and 13 deletions
  1. 8 8
      src/lib/datasrc/rbtree.h
  2. 5 5
      src/lib/datasrc/tests/rbtree_unittest.cc

+ 8 - 8
src/lib/datasrc/rbtree.h

@@ -245,7 +245,7 @@ RBNode<T>::~RBNode() {
 }
 
 template <typename T>
-const RBNode<T> *
+const RBNode<T>*
 RBNode<T>::successor() const {
     const RBNode<T>* current = this;
     // If it has right node, the successor is the left-most node of the right
@@ -470,7 +470,7 @@ public:
     /// with the node path, we can also get the next node of current node
     /// \param node The found node.
     template <typename CBARG>
-    Result findEx(const isc::dns::Name& name, NodeChain &node_path,
+    Result findEx(const isc::dns::Name& name, NodeChain& node_path,
                   RBNode<T>** node,
                   bool (*callback)(const RBNode<T>&, CBARG),
                   CBARG callback_arg) const;
@@ -480,7 +480,7 @@ public:
     /// Acts as described in the \ref findEx section, but returns immutable
     /// node pointer.
     template <typename CBARG>
-    Result findEx(const isc::dns::Name& name, NodeChain &node_path,
+    Result findEx(const isc::dns::Name& name, NodeChain& node_path,
                   const RBNode<T>** node,
                   bool (*callback)(const RBNode<T>&, CBARG),
                   CBARG callback_arg) const;
@@ -491,9 +491,9 @@ public:
     /// the node_path is fetched through findEx function call, next_node_path will
     /// store the node path to next_node, which can be used in turn to find
     /// the next node of next node.
-    const RBNode<T>* nextNode(const RBNode<T> *node,
-                              const NodeChain &node_path,
-                              NodeChain &next_node_path) const;
+    const RBNode<T>* nextNode(const RBNode<T>* node,
+                              const NodeChain& node_path,
+                              NodeChain& next_node_path) const;
 
 
     //@}
@@ -675,7 +675,7 @@ template <typename T>
 template <typename CBARG>
 typename RBTree<T>::Result
 RBTree<T>::findEx(const isc::dns::Name& target_name,
-                  NodeChain &node_path,
+                  NodeChain& node_path,
                   RBNode<T>** target,
                   bool (*callback)(const RBNode<T>&, CBARG),
                   CBARG callback_arg) const
@@ -730,7 +730,7 @@ template <typename T>
 template <typename CBARG>
 typename RBTree<T>::Result
 RBTree<T>::findEx(const isc::dns::Name& target_name,
-                  NodeChain &node_path,
+                  NodeChain& node_path,
                   const RBNode<T>** target,
                   bool (*callback)(const RBNode<T>&, CBARG),
                   CBARG callback_arg) const

+ 5 - 5
src/lib/datasrc/tests/rbtree_unittest.cc

@@ -251,8 +251,8 @@ TEST_F(RBTreeTest, callback) {
  *              o     q
  */
 Name
-nodeAbsoluteName(const RBNode<int> *node,
-                 const RBTree<int>::NodeChain &node_path)
+nodeAbsoluteName(const RBNode<int>* node,
+                 const RBTree<int>::NodeChain& node_path)
 {
     isc::dns::Name absoluteName = node->getName();
     RBTree<int>::NodeChain node_path_copy = node_path;
@@ -264,12 +264,12 @@ nodeAbsoluteName(const RBNode<int> *node,
 }
 
 void
-testNodeAdjacentHelper(const RBTree<int> &tree, const Name &currentDomain,
-                       const Name &nextDomain)
+testNodeAdjacentHelper(const RBTree<int>& tree, const Name& currentDomain,
+                       const Name& nextDomain)
 {
     RBTree<int>::NodeChain node_path;
     RBTree<int>::NodeChain next_node_path;
-    const RBNode<int> *node;
+    const RBNode<int>* node;
     EXPECT_EQ(RBTree<int>::EXACTMATCH,
               tree.findEx<void*>(currentDomain, node_path, &node, NULL, NULL));
     node = tree.nextNode(node, node_path, next_node_path);