diff options
author | David Robillard <d@drobilla.net> | 2007-06-08 04:41:16 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2007-06-08 04:41:16 +0000 |
commit | 70f528c5ca3d95af93557e1e612766852b6192ca (patch) | |
tree | f35f8471ccf3743cbcc9ec9af9ffbf9571daed21 /src/libs | |
parent | c3bed113297638e0274f31248c87092d362cbd3b (diff) | |
download | ingen-70f528c5ca3d95af93557e1e612766852b6192ca.tar.gz ingen-70f528c5ca3d95af93557e1e612766852b6192ca.tar.bz2 ingen-70f528c5ca3d95af93557e1e612766852b6192ca.zip |
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
Diffstat (limited to 'src/libs')
-rw-r--r-- | src/libs/engine/Tree.h | 2 | ||||
-rw-r--r-- | src/libs/engine/TreeImplementation.h | 16 | ||||
-rw-r--r-- | src/libs/engine/instantiations.cpp | 26 |
3 files changed, 3 insertions, 41 deletions
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<T>* root, bool b); - TreeNode<T>* _find_smallest(TreeNode<T>* root); TreeNode<T>* _find_largest(TreeNode<T>* 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<T>::find_treenode(const string& name) const } -/// Private /// -template<typename T> -void -Tree<T>::_set_all_traversed_recursive(TreeNode<T>* 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<typename T> 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<Ingen::Node*>; -template class TreeNode<Ingen::Node*>; - -template Tree<Ingen::GraphObject*>::Tree(); -template Tree<Ingen::GraphObject*>::~Tree(); -template void Tree<Ingen::GraphObject*>::insert(TreeNode<Ingen::GraphObject*>* const n); -template TreeNode<Ingen::GraphObject*>* Tree<Ingen::GraphObject*>::remove(const string& key); -template Ingen::GraphObject* Tree<Ingen::GraphObject*>::find(const string& key) const; -template TreeNode<Ingen::GraphObject*>* Tree<Ingen::GraphObject*>::find_treenode(const string& key) const; - -template Tree<Ingen::GraphObject*>::iterator Tree<Ingen::GraphObject*>::begin() const; -template Tree<Ingen::GraphObject*>::iterator Tree<Ingen::GraphObject*>::end() const; - -template Tree<Ingen::GraphObject*>::iterator::~iterator(); -template Ingen::GraphObject* Tree<Ingen::GraphObject*>::iterator::operator*() const; -template Tree<Ingen::GraphObject*>::iterator& Tree<Ingen::GraphObject*>::iterator::operator++(); -template bool Tree<Ingen::GraphObject*>::iterator::operator!=(const iterator& iter) const; +template class Tree<Ingen::GraphObject*>; |