diff options
| -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 | ||||
| -rwxr-xr-x | src/progs/ingen/ingen_dev | 3 | ||||
| -rw-r--r-- | src/progs/ingen/main.cpp | 2 |
5 files changed, 4 insertions, 45 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*>; diff --git a/src/progs/ingen/ingen_dev b/src/progs/ingen/ingen_dev deleted file mode 100755 index bd8857f7..00000000 --- a/src/progs/ingen/ingen_dev +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env sh - -INGEN_MODULE_PATH=../../libs/engine/.libs ./ingen diff --git a/src/progs/ingen/main.cpp b/src/progs/ingen/main.cpp index b8d18e14..365230bb 100644 --- a/src/progs/ingen/main.cpp +++ b/src/progs/ingen/main.cpp @@ -61,7 +61,7 @@ main(int argc, char** argv) cout << "No arguments provided. Try something like:" << endl << endl; cout << "Run an engine: ingen -e" << endl; cout << "Run the GUI: ingen -g" << endl; - cout << "Pring full help: ingen -h" << endl << endl; + cout << "Print full help: ingen -h" << endl << endl; cmdline_parser_print_help(); return 0; } |