From c04f7d6ed04d62efafa79a87bcde6c5f62e95327 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 20 Jun 2012 11:54:24 +0200
Subject: Completion of the CLI port

---
 xsd/cxx/tree/counter.cxx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'xsd/cxx/tree/counter.cxx')

diff --git a/xsd/cxx/tree/counter.cxx b/xsd/cxx/tree/counter.cxx
index 6888b2a..548fc77 100644
--- a/xsd/cxx/tree/counter.cxx
+++ b/xsd/cxx/tree/counter.cxx
@@ -99,7 +99,7 @@ namespace CXX
 
           names >> member;
 
-          if (options.value<CLI::generate_wildcard> ())
+          if (options.generate_wildcard ())
             names >> any;
 
           Complex::names (c, names);
@@ -188,22 +188,22 @@ namespace CXX
 
             if (doc_root_p (*last_))
             {
-              if (options.value<CLI::generate_element_type> ())
+              if (options.generate_element_type ())
               {
                 complexity += 1; // For c-tors and d-tor.
 
-                if (!options.value<CLI::suppress_parsing> ())
+                if (!options.suppress_parsing ())
                   complexity += 1;
 
-                if (options.value<CLI::generate_serialization> ())
+                if (options.generate_serialization ())
                   complexity += 1;
               }
               else
               {
-                if (!options.value<CLI::suppress_parsing> ())
+                if (!options.suppress_parsing ())
                   complexity += 6; // 13 parsing functions.
 
-                if (options.value<CLI::generate_serialization> ())
+                if (options.generate_serialization ())
                   complexity += 4; // 8 serialization functions.
               }
             }
@@ -236,12 +236,12 @@ namespace CXX
     }
 
     Counts Counter::
-    count (CLI::Options const& options,
+    count (options const& ops,
            SemanticGraph::Schema& tu,
            SemanticGraph::Path const& path)
     {
       Counts counts;
-      Context ctx (std::wcerr, tu, path, options, counts, false, 0, 0, 0, 0);
+      Context ctx (std::wcerr, tu, path, ops, counts, false, 0, 0, 0, 0);
 
       Traversal::Schema schema;
       Sources sources;
-- 
cgit v1.1