From 70f528c5ca3d95af93557e1e612766852b6192ca Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 8 Jun 2007 04:41:16 +0000 Subject: Remove ingen_dev script (obsoleted by src/setup_dev_environment.sh). Fix typo in help output. Remove invalid code from Tree (was never instantiated). Trim instantiations.cpp. git-svn-id: http://svn.drobilla.net/lad/ingen@534 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/engine/Tree.h | 2 -- src/libs/engine/TreeImplementation.h | 16 ---------------- src/libs/engine/instantiations.cpp | 26 +++----------------------- 3 files changed, 3 insertions(+), 41 deletions(-) (limited to 'src/libs') diff --git a/src/libs/engine/Tree.h b/src/libs/engine/Tree.h index e2ef785b..2c89e55c 100644 --- a/src/libs/engine/Tree.h +++ b/src/libs/engine/Tree.h @@ -130,8 +130,6 @@ public: iterator end() const; private: - void _set_all_traversed_recursive(TreeNode* root, bool b); - TreeNode* _find_smallest(TreeNode* root); TreeNode* _find_largest(TreeNode* root); diff --git a/src/libs/engine/TreeImplementation.h b/src/libs/engine/TreeImplementation.h index 5aef27cf..418264bc 100644 --- a/src/libs/engine/TreeImplementation.h +++ b/src/libs/engine/TreeImplementation.h @@ -237,22 +237,6 @@ Tree::find_treenode(const string& name) const } -/// Private /// -template -void -Tree::_set_all_traversed_recursive(TreeNode* root, bool b) -{ - assert(root != NULL); - - // Preorder traversal - root->node()->traversed(b); - if (root->left_child() != NULL) - _set_all_traversed_recursive(root->left_child(), b); - if (root->right_child() != NULL) - _set_all_traversed_recursive(root->right_child(), b); -} - - /** Finds the smallest (key) node in the subtree rooted at "root" */ template diff --git a/src/libs/engine/instantiations.cpp b/src/libs/engine/instantiations.cpp index d31afa62..f4c81722 100644 --- a/src/libs/engine/instantiations.cpp +++ b/src/libs/engine/instantiations.cpp @@ -18,33 +18,13 @@ /** @file * Explicit template instantiations. * - * Need to do this to avoid undefined references, because GCC doesn't seem to - * know how to recursively instantiate templates. Cleaner to do it all here - * than pollute everything with it. :/ + * Needed to avoid undefined references, because GCC doesn't automatically + * instantiate templates (at least not well/completely). */ #include "Tree.h" #include "TreeImplementation.h" #include "GraphObject.h" -#include "Node.h" - -/* Tree */ -template class Tree; -template class TreeNode; - -template Tree::Tree(); -template Tree::~Tree(); -template void Tree::insert(TreeNode* const n); -template TreeNode* Tree::remove(const string& key); -template Ingen::GraphObject* Tree::find(const string& key) const; -template TreeNode* Tree::find_treenode(const string& key) const; - -template Tree::iterator Tree::begin() const; -template Tree::iterator Tree::end() const; - -template Tree::iterator::~iterator(); -template Ingen::GraphObject* Tree::iterator::operator*() const; -template Tree::iterator& Tree::iterator::operator++(); -template bool Tree::iterator::operator!=(const iterator& iter) const; +template class Tree; -- cgit v1.2.1