1 files changed, 10 insertions, 27 deletions
diff --git a/xsde/cxx/serializer/elements.cxx b/xsde/cxx/serializer/elements.cxx
index 7802e5d..7cbdbcf 100644
--- a/xsde/cxx/serializer/elements.cxx
+++ b/xsde/cxx/serializer/elements.cxx
@@ -13,42 +13,25 @@ namespace CXX
     Context (std::wostream& o,
              SemanticGraph::Schema& root,
              SemanticGraph::Path const& path,
-             CLI::Options const& ops,
+             options_type const& ops,
              Regex const* he,
              Regex const* ie,
              Regex const* hie)
-        : CXX::Context (o,
-                        root,
-                        path,
-                        "s:name",
-                        "char",
-                        ops.value<CLI::char_encoding> (),
-                        ops.value<CLI::include_with_brackets> (),
-                        ops.value<CLI::include_prefix> (),
-                        "", // export symbol
-                        ops.value<CLI::namespace_map> (),
-                        ops.value<CLI::namespace_regex> (),
-                        ops.value<CLI::namespace_regex_trace> (),
-                        ops.value<CLI::include_regex> (),
-                        ops.value<CLI::include_regex_trace> (),
-                        ops.value<CLI::generate_inline> (),
-                        ops.value<CLI::custom_allocator> (),
-                        !ops.value<CLI::no_long_long> (),
-                        ops.value<CLI::reserved_name> ()),
+        : CXX::Context (o, root, path, ops, "s:name", "char"),
           options (ops),
           xml_serializer (xml_serializer_),
           serializer_base (serializer_base_),
           simple_base (simple_base_),
           complex_base (complex_base_),
           serializer_map (serializer_map_),
-          validation (!ops.value<CLI::suppress_validation> ()),
-          exceptions (!ops.value<CLI::no_exceptions> ()),
-          stl (!ops.value<CLI::no_stl> ()),
-          poly_code (ops.value<CLI::generate_polymorphic> ()),
-          poly_runtime (poly_code || ops.value<CLI::runtime_polymorphic> ()),
-          reset (!ops.value<CLI::suppress_reset> ()),
-          mixin (ops.value<CLI::reuse_style_mixin> ()),
-          tiein (!mixin && !ops.value<CLI::reuse_style_none> ()),
+          validation (!ops.suppress_validation ()),
+          exceptions (!ops.no_exceptions ()),
+          stl (!ops.no_stl ()),
+          poly_code (ops.generate_polymorphic ()),
+          poly_runtime (poly_code || ops.runtime_polymorphic ()),
+          reset (!ops.suppress_reset ()),
+          mixin (ops.reuse_style_mixin ()),
+          tiein (!mixin && !ops.reuse_style_none ()),
           hxx_expr (he),
           ixx_expr (ie),
           hxx_impl_expr (hie),