diff options
| author | Marius Kintel <marius@kintel.net> | 2011-10-04 19:06:40 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-10-04 19:06:40 (GMT) |
| commit | 799ca1d1b3f2e9142460ab3ce895a0641f54dfda (patch) | |
| tree | 6c168de6d55cb92b94b0ddeb54c668bd4946c10d /tests/csgtermtest.cc | |
| parent | 9259d57659f61e9e56942bb36125f605f8f3c338 (diff) | |
| parent | f5e0f3a531b0c8806e4ebc62cd91ca31275ae481 (diff) | |
Merge branch 'master' into visitortests
Conflicts:
src/polyset.h
Diffstat (limited to 'tests/csgtermtest.cc')
| -rw-r--r-- | tests/csgtermtest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/csgtermtest.cc b/tests/csgtermtest.cc index eec5d4b..7688fc7 100644 --- a/tests/csgtermtest.cc +++ b/tests/csgtermtest.cc @@ -26,7 +26,6 @@ #include "myqhash.h" #include "PolySetEvaluator.h" #include "CSGTermEvaluator.h" -#include "CSGTextCache.h" #include "openscad.h" #include "handle_dep.h" #include "node.h" @@ -144,8 +143,8 @@ int main(int argc, char **argv) // cout << tree.getString(*root_node) << "\n"; - vector<CSGTerm*> highlights; - vector<CSGTerm*> background; + std::vector<CSGTerm*> highlights; + std::vector<CSGTerm*> background; PolySetEvaluator psevaluator(tree); CSGTermEvaluator evaluator(tree, &psevaluator); CSGTerm *root_term = evaluator.evaluateCSGTerm(*root_node, highlights, background); |