New version of the recursive options parsing strategy.

3 files changed, 3 insertions, 3 deletions

diff --git a/test/unit/expr/expr_public.h b/test/unit/expr/expr_public.h
index 194aec0b1..671be0195 100644
--- a/test/unit/expr/expr_public.h
+++ b/test/unit/expr/expr_public.h
@@ -58,7 +58,7 @@ public:
       char *argv[2];
       argv[0] = strdup("");
       argv[1] = strdup("--output-language=ast");
-      opts.parseOptions(2, argv);
+      Options::parseOptions(&opts, 2, argv);
       free(argv[0]);
       free(argv[1]);
 
diff --git a/test/unit/expr/node_black.h b/test/unit/expr/node_black.h
index 7d6ee523a..0c903e90f 100644
--- a/test/unit/expr/node_black.h
+++ b/test/unit/expr/node_black.h
@@ -45,7 +45,7 @@ public:
     char *argv[2];
     argv[0] = strdup("");
     argv[1] = strdup("--output-language=ast");
-    opts.parseOptions(2, argv);
+    Options::parseOptions(&opts, 2, argv);
     free(argv[0]);
     free(argv[1]);
 
diff --git a/test/unit/util/listener_black.h b/test/unit/util/listener_black.h
index 682a7c67b..df8095756 100644
--- a/test/unit/util/listener_black.h
+++ b/test/unit/util/listener_black.h
@@ -137,7 +137,7 @@ public:
     }
 
     TS_ASSERT(not collection.empty());
-    for(int i=0; i < listeners.size(); ++i){
+    for(unsigned i=0; i < listeners.size(); ++i){
       ListenerCollection::Registration* at_i = listeners[i];
       delete at_i;
     }