From cf6fc87c9f997a0383ff9ee2da1b1ac27c35a247 Mon Sep 17 00:00:00 2001
From: Danny Robson <danny@nerdcruft.net>
Date: Tue, 21 Oct 2014 21:48:13 +1100
Subject: [PATCH] options: use range based for in some tests

---
 test/options.cpp | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/test/options.cpp b/test/options.cpp
index c66eb6d6..af38445c 100644
--- a/test/options.cpp
+++ b/test/options.cpp
@@ -70,31 +70,33 @@ test_bool_opt (void) {
     p->add_option (make_unique<valueoption<bool>> ('b', "bool", "testing boolean actions", &value));
 
     // List all legal forms of positive or negative boolean values
-    static const char *argv[] = { "./foo", "-b", NULL };
+    std::array<const char*, 3> argv { "./foo", "-b", NULL };
     static const char *positive[] = { "1", "true", "yes" };
     static const char *negative[] = { "0", "false", "no" };
 
     // For each boolean value, ensure that it returns as expected
-    for (size_t i = 0; i < elems (positive); ++i) {
-        argv[2] = positive[i];
-        p->parse_args (elems (argv), argv);
+    for (auto i: positive) {
+        static size_t count;
+        std::cerr << "iter " << count++ << '\n';
+        argv[2] = i;
+        p->parse_args (argv.size (), argv.data ());
         CHECK (value == true);
     }
 
-    for (size_t i = 0; i < elems (negative); ++i) {
-        argv[2] = negative[i];
-        p->parse_args (elems (argv), argv);
+    for (auto i: negative) {
+        argv[2] = i;
+        p->parse_args (argv.size (), argv.data ());
         CHECK (value == false);
     }
 
     // Check that invalid forms of boolean all throw exceptions
     const char* invalid[] = { "foo", "y", "null" };
 
-    for (size_t i = 0; i < elems (invalid); ++i) {
-        argv[2] = invalid[i];
+    for (auto i: invalid) {
+        argv[2] = i;
         CHECK_THROWS (
             std::domain_error,
-            p->parse_args (elems (argv), argv)
+            p->parse_args (argv.size (), argv.data ())
         );
     }
 }