From c04f7d6ed04d62efafa79a87bcde6c5f62e95327 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 20 Jun 2012 11:54:24 +0200 Subject: Completion of the CLI port --- xsd/cxx/tree/stream-insertion-header.cxx | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'xsd/cxx/tree/stream-insertion-header.cxx') diff --git a/xsd/cxx/tree/stream-insertion-header.cxx b/xsd/cxx/tree/stream-insertion-header.cxx index 8d00eb0..139bf8b 100644 --- a/xsd/cxx/tree/stream-insertion-header.cxx +++ b/xsd/cxx/tree/stream-insertion-header.cxx @@ -14,8 +14,6 @@ namespace CXX { namespace { - typedef Containers::Vector Streams; - struct List: Traversal::List, Context { List (Context& c) @@ -34,8 +32,9 @@ namespace CXX if (renamed_type (l, name) && !name) return; - Streams const& st (options.value ()); - for (Streams::ConstIterator i (st.begin ()); i != st.end (); ++i) + NarrowStrings const& st (options.generate_insertion ()); + for (NarrowStrings::const_iterator i (st.begin ()); i != st.end (); + ++i) { String stream_type (ostream_type + L"< " + String (*i) + L" >"); @@ -67,8 +66,9 @@ namespace CXX if (renamed_type (u, name) && !name) return; - Streams const& st (options.value ()); - for (Streams::ConstIterator i (st.begin ()); i != st.end (); ++i) + NarrowStrings const& st (options.generate_insertion ()); + for (NarrowStrings::const_iterator i (st.begin ()); i != st.end (); + ++i) { String stream_type (ostream_type + L"< " + String (*i) + L" >"); @@ -100,8 +100,9 @@ namespace CXX if (renamed_type (e, name) && !name) return; - Streams const& st (options.value ()); - for (Streams::ConstIterator i (st.begin ()); i != st.end (); ++i) + NarrowStrings const& st (options.generate_insertion ()); + for (NarrowStrings::const_iterator i (st.begin ()); i != st.end (); + ++i) { String stream_type (ostream_type + L"< " + String (*i) + L" >"); @@ -132,8 +133,9 @@ namespace CXX if (renamed_type (c, name) && !name) return; - Streams const& st (options.value ()); - for (Streams::ConstIterator i (st.begin ()); i != st.end (); ++i) + NarrowStrings const& st (options.generate_insertion ()); + for (NarrowStrings::const_iterator i (st.begin ()); i != st.end (); + ++i) { String stream_type (ostream_type + L"< " + String (*i) + L" >"); -- cgit v1.1