diff options
| author | Sage Weil <sage@newdream.net> | 2012-01-09 09:13:03 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2012-01-09 09:13:03 -0800 |
| commit | 1ae42d65e38e21d7c8399db8f76179a365434e21 (patch) | |
| tree | 458b8a293e5101b7f03ccc249e7154860c2f6bbe /src/mds | |
| parent | b17736a12611a12461df26fb184acc5d85f82fea (diff) | |
| parent | c5affd6c6c9382bf9cacebcecab3cb98275e23f3 (diff) | |
| download | ceph-1ae42d65e38e21d7c8399db8f76179a365434e21.tar.gz | |
Merge remote branch 'gh/master' into wip-backfill
Diffstat (limited to 'src/mds')
| -rw-r--r-- | src/mds/IntervalTree.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mds/IntervalTree.h b/src/mds/IntervalTree.h index 1603dd068b1..23016def084 100644 --- a/src/mds/IntervalTree.h +++ b/src/mds/IntervalTree.h @@ -641,7 +641,7 @@ private: } - IntervalTree::TreeNode* deleteNode(IntervalTree::TreeNode* node, std::list<IntervalNode>& dispList) + TreeNode* deleteNode(TreeNode* node, std::list<IntervalNode>& dispList) { assert(node); @@ -1002,7 +1002,7 @@ private: } - IntervalTree::TreeNode* createTreeNode(value_type in) + TreeNode* createTreeNode(value_type in) { TreeNode* node = new TreeNode(); node->left = NULL; @@ -1017,7 +1017,7 @@ private: } - void printTreeNode(IntervalTree::TreeNode* node, void* data) + void printTreeNode(TreeNode* node, void* data) { if(node == NULL) { return; @@ -1273,7 +1273,7 @@ private: return root; } - IntervalTree::TreeNode* next(IntervalTree::TreeNode* node) + TreeNode* next(TreeNode* node) { assert(node != NULL); @@ -1310,7 +1310,7 @@ private: } - IntervalTree::TreeNode* prev(TreeNode* node) + TreeNode* prev(TreeNode* node) { assert(node != NULL); @@ -1350,7 +1350,7 @@ private: } - std::pair<IntervalTree::TreeNode*, IntervalTree::TreeNode*> getSpan(const TreeNode* node) const + std::pair<TreeNode*, TreeNode*> getSpan(const TreeNode* node) const { assert(node != NULL); |