From 214e61b8334751a34f7522c609b939f4bc667881 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 22 Feb 2010 15:35:57 +0200
Subject: Reopen wide strings with width specifier (L)

Some compilers, notably VC++, don't like strings like L"foo""bar".
---
 xsd/cxx/elements.cxx                           |  8 +--
 xsd/cxx/parser/attribute-validation-source.cxx | 14 ++--
 xsd/cxx/parser/driver-source.cxx               |  6 +-
 xsd/cxx/parser/element-validation-source.cxx   | 24 +++----
 xsd/cxx/parser/impl-source.cxx                 |  2 +-
 xsd/cxx/parser/parser-source.cxx               | 42 ++++++------
 xsd/cxx/parser/print-impl-common.hxx           | 60 ++++++++---------
 xsd/cxx/tree/default-value.cxx                 | 34 +++++-----
 xsd/cxx/tree/parser-source.cxx                 | 24 +++----
 xsd/cxx/tree/serialization-source.cxx          | 92 +++++++++++++-------------
 xsd/cxx/tree/stream-extraction-source.cxx      | 16 ++---
 xsd/cxx/tree/stream-insertion-source.cxx       | 16 ++---
 xsd/cxx/tree/stream-source.cxx                 | 10 +--
 xsd/cxx/tree/tree-source.cxx                   | 85 +++++++++++-------------
 14 files changed, 213 insertions(+), 220 deletions(-)

(limited to 'xsd/cxx')

diff --git a/xsd/cxx/elements.cxx b/xsd/cxx/elements.cxx
index 29603ae..a5db168 100644
--- a/xsd/cxx/elements.cxx
+++ b/xsd/cxx/elements.cxx
@@ -1034,9 +1034,9 @@ namespace CXX
 
     // In most common cases we will have that many chars.
     //
-    r.reserve (n + 2);
+    r.reserve (n + 3);
 
-    r += '"';
+    r += L"L\"";
 
     Boolean escape (false);
 
@@ -1103,9 +1103,7 @@ namespace CXX
         {
           // Close and open the string so there are no clashes.
           //
-          r += '"';
-          r += '"';
-
+          r += L"\"L\"";
           escape = false;
         }
 
diff --git a/xsd/cxx/parser/attribute-validation-source.cxx b/xsd/cxx/parser/attribute-validation-source.cxx
index 0503d78..2c57f2a 100644
--- a/xsd/cxx/parser/attribute-validation-source.cxx
+++ b/xsd/cxx/parser/attribute-validation-source.cxx
@@ -32,11 +32,11 @@ namespace CXX
           {
             String const& ns (a.namespace_ ().name ());
 
-            os << "n == " << L << strlit (name) << " &&" << endl
-               << "ns == " << L << strlit (ns);
+            os << "n == " << strlit (name) << " &&" << endl
+               << "ns == " << strlit (ns);
           }
           else
-            os << "n == " << L << strlit (name) << " && ns.empty ()";
+            os << "n == " << strlit (name) << " && ns.empty ()";
         }
 
         virtual Void
@@ -60,7 +60,7 @@ namespace CXX
                 // This is not what the spec says but that seems to be
                 // the consensus.
                 //
-                os << "(!ns.empty () && ns != " << L << strlit (ns) << ")";
+                os << "(!ns.empty () && ns != " << strlit (ns) << ")";
               }
               else
                 os << "!ns.empty ()";
@@ -71,11 +71,11 @@ namespace CXX
             }
             else if (*i == L"##targetNamespace")
             {
-              os << "ns == " << L << strlit (ns);
+              os << "ns == " << strlit (ns);
             }
             else
             {
-              os << "ns == " << L << strlit (*i);
+              os << "ns == " << strlit (*i);
             }
 
             if (++i != e)
@@ -204,7 +204,7 @@ namespace CXX
 
             os << "if (!as." << ename (a) << ")" << endl
                << "this->_expected_attribute (" << endl
-               << L << strlit (ns) << ", " << L << strlit (a.name ()) << ");";
+               << strlit (ns) << ", " << strlit (a.name ()) << ");";
           }
         }
       };
diff --git a/xsd/cxx/parser/driver-source.cxx b/xsd/cxx/parser/driver-source.cxx
index c410ccc..b48b0e0 100644
--- a/xsd/cxx/parser/driver-source.cxx
+++ b/xsd/cxx/parser/driver-source.cxx
@@ -718,12 +718,12 @@ namespace CXX
       if (root->namespace_().name ())
         os << ctx.xs_ns_name () << "::document doc_p (" << endl
            << root_p << "," << endl
-           << L << ctx.strlit (root->namespace_().name ()) << "," << endl
-           << L << ctx.strlit (root->name ()) << ");"
+           << ctx.strlit (root->namespace_().name ()) << "," << endl
+           << ctx.strlit (root->name ()) << ");"
            << endl;
       else
         os << ctx.xs_ns_name () << "::document doc_p (" << root_p << ", " <<
-          L << ctx.strlit (root->name ()) << ");"
+          ctx.strlit (root->name ()) << ");"
            << endl;
 
       os << root_p << ".pre ();"
diff --git a/xsd/cxx/parser/element-validation-source.cxx b/xsd/cxx/parser/element-validation-source.cxx
index bc4f3c4..df701e9 100644
--- a/xsd/cxx/parser/element-validation-source.cxx
+++ b/xsd/cxx/parser/element-validation-source.cxx
@@ -43,11 +43,11 @@ namespace CXX
           {
             String const& ns (e.namespace_ ().name ());
 
-            os << "n == " << L << strlit (name) << " &&" << endl
-               << "ns == " << L << strlit (ns);
+            os << "n == " << strlit (name) << " &&" << endl
+               << "ns == " << strlit (ns);
           }
           else
-            os << "n == " << L << strlit (name) << " && ns.empty ()";
+            os << "n == " << strlit (name) << " && ns.empty ()";
 
 
           // Only a globally-defined element can be a subst-group root.
@@ -57,8 +57,8 @@ namespace CXX
             os << ") ||" << endl
                << "::xsd::cxx::parser::substitution_map_instance< " <<
               char_type << " > ().check (" << endl
-               << "ns, n, " << L << strlit (e.namespace_ ().name ()) <<
-              ", " << L << strlit (name) << ", t)";
+               << "ns, n, " << strlit (e.namespace_ ().name ()) <<
+              ", " << strlit (name) << ", t)";
           }
         }
 
@@ -86,7 +86,7 @@ namespace CXX
                 // This is not what the spec says but that seems to be
                 // the consensus.
                 //
-                os << "(!ns.empty () && ns != " << L << strlit (ns) << ")";
+                os << "(!ns.empty () && ns != " << strlit (ns) << ")";
               }
               else
                 os << "!ns.empty ()";
@@ -97,11 +97,11 @@ namespace CXX
             }
             else if (*i == L"##targetNamespace")
             {
-              os << "ns == " << L << strlit (ns);
+              os << "ns == " << strlit (ns);
             }
             else
             {
-              os << "ns == " << L << strlit (*i);
+              os << "ns == " << strlit (*i);
             }
 
             if (++i != e)
@@ -154,14 +154,14 @@ namespace CXX
         traverse (SemanticGraph::Element& e)
         {
           String ns (e.qualified () ? e.namespace_ ().name () : String ());
-          os << L << strlit (ns) << ", " << L << strlit (e.name ());
+          os << strlit (ns) << ", " << strlit (e.name ());
         }
 
         virtual Void
         traverse (SemanticGraph::Any& a)
         {
           String const& ns (*a.namespace_begin ());
-          os << L << strlit (ns) << ", " << L << "\"*\"";
+          os << strlit (ns) << ", " << L << "\"*\"";
         }
 
         virtual Void
@@ -882,8 +882,8 @@ namespace CXX
 
             os << "if (count[" << state << "UL] == 0)" << endl
                << "this->_expected_element (" << endl
-               << L << strlit (ns) << ", " <<
-              L << strlit (e.name ()) << ");"
+               << strlit (ns) << ", " <<
+              strlit (e.name ()) << ");"
                << endl;
           }
 
diff --git a/xsd/cxx/parser/impl-source.cxx b/xsd/cxx/parser/impl-source.cxx
index 7548942..b951f6a 100644
--- a/xsd/cxx/parser/impl-source.cxx
+++ b/xsd/cxx/parser/impl-source.cxx
@@ -187,7 +187,7 @@ namespace CXX
              << "{";
 
           if (options.value<CLI::generate_print_impl> ())
-            os << cout_inst << " << " << L << strlit (u.name () + L": ") <<
+            os << cout_inst << " << " << strlit (u.name () + L": ") <<
               " << s << std::endl;";
           else
             os << "// TODO" << endl
diff --git a/xsd/cxx/parser/parser-source.cxx b/xsd/cxx/parser/parser-source.cxx
index 68623be..339bb6f 100644
--- a/xsd/cxx/parser/parser-source.cxx
+++ b/xsd/cxx/parser/parser-source.cxx
@@ -68,7 +68,7 @@ namespace CXX
             os << "const " << char_type << "* " << name << "::" << endl
                << "_static_type ()"
                << "{"
-               << "return " << L << strlit (id) << ";"
+               << "return " << strlit (id) << ";"
                << "}";
 
             os << "const " << char_type << "* " << name << "::" << endl
@@ -201,7 +201,7 @@ namespace CXX
             os << "const " << char_type << "* " << name << "::" << endl
                << "_static_type ()"
                << "{"
-               << "return " << L << strlit (id) << ";"
+               << "return " << strlit (id) << ";"
                << "}";
 
             os << "const " << char_type << "* " << name << "::" << endl
@@ -256,7 +256,7 @@ namespace CXX
             os << "const " << char_type << "* " << name << "::" << endl
                << "_static_type ()"
                << "{"
-               << "return " << L << strlit (id) << ";"
+               << "return " << strlit (id) << ";"
                << "}";
 
             os << "const " << char_type << "* " << name << "::" << endl
@@ -294,12 +294,12 @@ namespace CXX
 
           if (e.qualified () && e.namespace_ ().name ())
           {
-            os << "n == " << L << strlit (e.name ()) << " && " <<
-              "ns == " << L << strlit (e.namespace_ ().name ());
+            os << "n == " << strlit (e.name ()) << " && " <<
+              "ns == " << strlit (e.namespace_ ().name ());
           }
           else
           {
-            os << "n == " << L << strlit (e.name ()) << " && ns.empty ()";
+            os << "n == " << strlit (e.name ()) << " && ns.empty ()";
           }
 
           // Only a globally-defined element can be a subst-group root.
@@ -309,8 +309,8 @@ namespace CXX
             os << ") ||" << endl
                << "::xsd::cxx::parser::substitution_map_instance< " <<
               char_type << " > ().check (" << endl
-               << "ns, n, " << L << strlit (e.namespace_ ().name ()) <<
-              ", " << L << strlit (e.name ()) << ", t)";
+               << "ns, n, " << strlit (e.namespace_ ().name ()) <<
+              ", " << strlit (e.name ()) << ", t)";
           }
 
           os << ")"
@@ -394,12 +394,12 @@ namespace CXX
 
           if (e.qualified () && e.namespace_ ().name ())
           {
-            os << "n == " << L << strlit (e.name ()) << " && " <<
-              "ns == " << L << strlit (e.namespace_ ().name ());
+            os << "n == " << strlit (e.name ()) << " && " <<
+              "ns == " << strlit (e.namespace_ ().name ());
           }
           else
           {
-            os << "n == " << L << strlit (e.name ()) << " && ns.empty ()";
+            os << "n == " << strlit (e.name ()) << " && ns.empty ()";
           }
 
           // Only a globally-defined element can be a subst-group root.
@@ -409,8 +409,8 @@ namespace CXX
             os << ") ||" << endl
                << "::xsd::cxx::parser::substitution_map_instance< " <<
               char_type << " > ().check (" << endl
-               << "ns, n, " << L << strlit (e.namespace_ ().name ()) <<
-              ", " << L << strlit (e.name ()) << ")";
+               << "ns, n, " << strlit (e.namespace_ ().name ()) <<
+              ", " << strlit (e.name ()) << ")";
           }
 
           os << ")"
@@ -457,13 +457,13 @@ namespace CXX
 
           if (a.qualified () && a.namespace_ ().name ())
           {
-            os << "if (n == " << L << strlit (a.name ()) << " && " <<
-              "ns == " << L << strlit (a.namespace_ ().name ()) << ")"
+            os << "if (n == " << strlit (a.name ()) << " && " <<
+              "ns == " << strlit (a.namespace_ ().name ()) << ")"
                << "{";
           }
           else
           {
-            os << "if (n == " << L << strlit (a.name ()) << " && ns.empty ())"
+            os << "if (n == " << strlit (a.name ()) << " && ns.empty ())"
                << "{";
           }
 
@@ -570,7 +570,7 @@ namespace CXX
             os << "const " << char_type << "* " << name << "::" << endl
                << "_static_type ()"
                << "{"
-               << "return " << L << strlit (id) << ";"
+               << "return " << strlit (id) << ";"
                << "}";
 
             os << "const " << char_type << "* " << name << "::" << endl
@@ -798,10 +798,10 @@ namespace CXX
                << "const ::xsd::cxx::parser::substitution_map_entry< " <<
               char_type << " >" << endl
                << "_xsd_" << name << "_substitution_map_entry_ (" << endl
-               << L << strlit (e.namespace_ ().name ()) << "," << endl
-               << L << strlit (e.name ()) << "," << endl
-               << L << strlit (r.namespace_ ().name ()) << "," << endl
-               << L << strlit (r.name ()) << "," << endl
+               << strlit (e.namespace_ ().name ()) << "," << endl
+               << strlit (e.name ()) << "," << endl
+               << strlit (r.namespace_ ().name ()) << "," << endl
+               << strlit (r.name ()) << "," << endl
                << fq_name (type) << "::_static_type ());"
                << endl;
           }
diff --git a/xsd/cxx/parser/print-impl-common.hxx b/xsd/cxx/parser/print-impl-common.hxx
index f7bea51..5a91931 100644
--- a/xsd/cxx/parser/print-impl-common.hxx
+++ b/xsd/cxx/parser/print-impl-common.hxx
@@ -87,7 +87,7 @@ namespace CXX
       {
         if (default_type (t, "bool"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << " << " <<
+          os << cout_inst << " << " << strlit (tag_ + L": ") << " << " <<
             arg_ << " << std::endl;";
         }
         else
@@ -101,7 +101,7 @@ namespace CXX
       {
         if (default_type (t, "signed char"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") <<
+          os << cout_inst << " << " << strlit (tag_ + L": ") <<
             " << static_cast<short> (" << arg_ << ") << std::endl;";
         }
         else
@@ -113,7 +113,7 @@ namespace CXX
       {
         if (default_type (t, "unsigned char"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") <<
+          os << cout_inst << " << " << strlit (tag_ + L": ") <<
             " << static_cast<unsigned short> (" << arg_ << ") << std::endl;";
         }
         else
@@ -125,7 +125,7 @@ namespace CXX
       {
         if (default_type (t, "short"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << " << " <<
+          os << cout_inst << " << " << strlit (tag_ + L": ") << " << " <<
             arg_ << " << std::endl;";
         }
         else
@@ -137,7 +137,7 @@ namespace CXX
       {
         if (default_type (t, "unsigned short"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << " << " <<
+          os << cout_inst << " << " << strlit (tag_ + L": ") << " << " <<
             arg_ << " << std::endl;";
         }
         else
@@ -149,7 +149,7 @@ namespace CXX
       {
         if (default_type (t, "int"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << " << " <<
+          os << cout_inst << " << " << strlit (tag_ + L": ") << " << " <<
             arg_ << " << std::endl;";
         }
         else
@@ -161,7 +161,7 @@ namespace CXX
       {
         if (default_type (t, "unsigned int"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << " << " <<
+          os << cout_inst << " << " << strlit (tag_ + L": ") << " << " <<
             arg_ << " << std::endl;";
         }
         else
@@ -173,7 +173,7 @@ namespace CXX
       {
         if (default_type (t, "long long"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << " << " <<
+          os << cout_inst << " << " << strlit (tag_ + L": ") << " << " <<
             arg_ << " << std::endl;";
         }
         else
@@ -185,7 +185,7 @@ namespace CXX
       {
         if (default_type (t, "unsigned long long"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << " << " <<
+          os << cout_inst << " << " << strlit (tag_ + L": ") << " << " <<
             arg_ << " << std::endl;";
         }
         else
@@ -197,7 +197,7 @@ namespace CXX
       {
         if (default_type (t, "long long"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << " << " <<
+          os << cout_inst << " << " << strlit (tag_ + L": ") << " << " <<
             arg_ << " << std::endl;";
         }
         else
@@ -209,7 +209,7 @@ namespace CXX
       {
         if (default_type (t, "long long"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << " << " <<
+          os << cout_inst << " << " << strlit (tag_ + L": ") << " << " <<
             arg_ << " << std::endl;";
         }
         else
@@ -221,7 +221,7 @@ namespace CXX
       {
         if (default_type (t, "long long"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << " << " <<
+          os << cout_inst << " << " << strlit (tag_ + L": ") << " << " <<
             arg_ << " << std::endl;";
         }
         else
@@ -233,7 +233,7 @@ namespace CXX
       {
         if (default_type (t, "unsigned long long"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << " << " <<
+          os << cout_inst << " << " << strlit (tag_ + L": ") << " << " <<
             arg_ << " << std::endl;";
         }
         else
@@ -245,7 +245,7 @@ namespace CXX
       {
         if (default_type (t, "unsigned long long"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << " << " <<
+          os << cout_inst << " << " << strlit (tag_ + L": ") << " << " <<
             arg_ << " << std::endl;";
         }
         else
@@ -259,7 +259,7 @@ namespace CXX
       {
         if (default_type (t, "float"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << " << " <<
+          os << cout_inst << " << " << strlit (tag_ + L": ") << " << " <<
             arg_ << " << std::endl;";
         }
         else
@@ -271,7 +271,7 @@ namespace CXX
       {
         if (default_type (t, "double"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << " << " <<
+          os << cout_inst << " << " << strlit (tag_ + L": ") << " << " <<
             arg_ << " << std::endl;";
         }
         else
@@ -283,7 +283,7 @@ namespace CXX
       {
         if (default_type (t, "double"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << " << " <<
+          os << cout_inst << " << " << strlit (tag_ + L": ") << " << " <<
             arg_ << " << std::endl;";
         }
         else
@@ -375,7 +375,7 @@ namespace CXX
       {
         if (default_type (t, xs_ns_name () + L"::qname"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << ";"
+          os << cout_inst << " << " << strlit (tag_ + L": ") << ";"
              << endl
              << "if (" << arg_ << ".prefix ().empty ())" << endl
              << cout_inst << " << " << arg_ << ".name ();"
@@ -410,7 +410,7 @@ namespace CXX
       {
         if (default_type (t, xs_ns_name () + L"::date"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << endl
+          os << cout_inst << " << " << strlit (tag_ + L": ") << endl
              << " << " << arg_ << ".year () << '-'" << endl
              << " << " << arg_ << ".month () << '-'" << endl
              << " << " << arg_ << ".day ();";
@@ -426,7 +426,7 @@ namespace CXX
       {
         if (default_type (t, xs_ns_name () + L"::date_time"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << endl
+          os << cout_inst << " << " << strlit (tag_ + L": ") << endl
              << " << " << arg_ << ".year () << '-'" << endl
              << " << " << arg_ << ".month () << '-'" << endl
              << " << " << arg_ << ".day () << 'T'" << endl
@@ -445,7 +445,7 @@ namespace CXX
       {
         if (default_type (t, xs_ns_name () + L"::duration"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << ";"
+          os << cout_inst << " << " << strlit (tag_ + L": ") << ";"
              << endl
              << "if (" << arg_ << ".negative ())" << endl
              << cout_inst << " << '-';"
@@ -468,7 +468,7 @@ namespace CXX
       {
         if (default_type (t, xs_ns_name () + L"::gday"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ---") <<
+          os << cout_inst << " << " << strlit (tag_ + L": ---") <<
             " << " << arg_ << ".day ();";
 
           gen_time_zone ();
@@ -482,7 +482,7 @@ namespace CXX
       {
         if (default_type (t, xs_ns_name () + L"::gmonth"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": --") <<
+          os << cout_inst << " << " << strlit (tag_ + L": --") <<
             " << " << arg_ << ".month ();";
 
           gen_time_zone ();
@@ -496,7 +496,7 @@ namespace CXX
       {
         if (default_type (t, xs_ns_name () + L"::gmonth_day"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": --") << endl
+          os << cout_inst << " << " << strlit (tag_ + L": --") << endl
              << " << " << arg_ << ".month () << '-'" << endl
              << " << " << arg_ << ".day ();";
 
@@ -511,7 +511,7 @@ namespace CXX
       {
         if (default_type (t, xs_ns_name () + L"::gyear"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << " << " <<
+          os << cout_inst << " << " << strlit (tag_ + L": ") << " << " <<
             arg_ << ".year ();";
 
           gen_time_zone ();
@@ -525,7 +525,7 @@ namespace CXX
       {
         if (default_type (t, xs_ns_name () + L"::gyear_month"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << endl
+          os << cout_inst << " << " << strlit (tag_ + L": ") << endl
              << " << " << arg_ << ".year () << '-'" << endl
              << " << " << arg_ << ".month ();";
 
@@ -540,7 +540,7 @@ namespace CXX
       {
         if (default_type (t, xs_ns_name () + L"::time"))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << endl
+          os << cout_inst << " << " << strlit (tag_ + L": ") << endl
              << " << " << arg_ << ".hours () << ':'" << endl
              << " << " << arg_ << ".minutes () << ':'" << endl
              << " << " << arg_ << ".seconds ();";
@@ -571,7 +571,7 @@ namespace CXX
         if ((char_type == L"char" && default_type (t, "::std::string")) ||
             (char_type == L"wchar_t" && default_type (t, "::std::wstring")))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << " << " <<
+          os << cout_inst << " << " << strlit (tag_ + L": ") << " << " <<
             arg_ << " << std::endl;";
         }
         else
@@ -585,7 +585,7 @@ namespace CXX
 
         if (default_type (t, type))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << ";"
+          os << cout_inst << " << " << strlit (tag_ + L": ") << ";"
              << endl;
 
           os << "for (" << type << "::const_iterator i (" << arg_ <<
@@ -609,7 +609,7 @@ namespace CXX
 
         if (default_type (t, type))
         {
-          os << cout_inst << " << " << L << strlit (tag_ + L": ") << " << "
+          os << cout_inst << " << " << strlit (tag_ + L": ") << " << "
              << arg_ << "->size () << " << L << "\" bytes\" << std::endl;";
         }
         else
diff --git a/xsd/cxx/tree/default-value.cxx b/xsd/cxx/tree/default-value.cxx
index ed92ea4..ff964d3 100644
--- a/xsd/cxx/tree/default-value.cxx
+++ b/xsd/cxx/tree/default-value.cxx
@@ -451,7 +451,7 @@ namespace CXX
     Void InitValue::
     traverse (SemanticGraph::Union&)
     {
-      os << L << strlit (value_);
+      os << strlit (value_);
     }
 
     Void InitValue::
@@ -465,7 +465,7 @@ namespace CXX
     Void InitValue::
     traverse (SemanticGraph::AnySimpleType& t)
     {
-      os << fq_name (t) << " (" << L << strlit (value_) << ")";
+      os << fq_name (t) << " (" << strlit (value_) << ")";
     }
 
     // Strings.
@@ -473,28 +473,28 @@ namespace CXX
     Void InitValue::
     traverse (SemanticGraph::Fundamental::String&)
     {
-      os << L << strlit (value_);
+      os << strlit (value_);
     }
 
     Void InitValue::
     traverse (SemanticGraph::Fundamental::NormalizedString&)
     {
       normalize (value_);
-      os << L << strlit (value_);
+      os << strlit (value_);
     }
 
     Void InitValue::
     traverse (SemanticGraph::Fundamental::Token&)
     {
       collapse (value_);
-      os << L << strlit (value_);
+      os << strlit (value_);
     }
 
     Void InitValue::
     traverse (SemanticGraph::Fundamental::NameToken&)
     {
       collapse (value_);
-      os << L << strlit (value_);
+      os << strlit (value_);
     }
 
     Void InitValue::
@@ -509,21 +509,21 @@ namespace CXX
     traverse (SemanticGraph::Fundamental::Name&)
     {
       collapse (value_);
-      os << L << strlit (value_);
+      os << strlit (value_);
     }
 
     Void InitValue::
     traverse (SemanticGraph::Fundamental::NCName&)
     {
       collapse (value_);
-      os << L << strlit (value_);
+      os << strlit (value_);
     }
 
     Void InitValue::
     traverse (SemanticGraph::Fundamental::Language&)
     {
       collapse (value_);
-      os << L << strlit (value_);
+      os << strlit (value_);
     }
 
     // Qualified name.
@@ -549,15 +549,15 @@ namespace CXX
         else
           name = qname;
 
-        os << fq_name (t) << " (" << L << strlit (ns) << ", " <<
-          L << strlit (name) << ")";
+        os << fq_name (t) << " (" << strlit (ns) << ", " <<
+          strlit (name) << ")";
       }
       else
       {
         // Unqualified name.
         //
         collapse (value_);
-        os << fq_name (t) << " (" << L << strlit (value_) << ")";
+        os << fq_name (t) << " (" << strlit (value_) << ")";
       }
     }
 
@@ -567,14 +567,14 @@ namespace CXX
     traverse (SemanticGraph::Fundamental::Id&)
     {
       collapse (value_);
-      os << L << strlit (value_);
+      os << strlit (value_);
     }
 
     Void InitValue::
     traverse (SemanticGraph::Fundamental::IdRef&)
     {
       collapse (value_);
-      os << L << strlit (value_);
+      os << strlit (value_);
     }
 
     Void InitValue::
@@ -591,7 +591,7 @@ namespace CXX
     traverse (SemanticGraph::Fundamental::AnyURI&)
     {
       collapse (value_);
-      os << L << strlit (value_);
+      os << strlit (value_);
     }
 
     // Binary.
@@ -1215,7 +1215,7 @@ namespace CXX
     traverse (SemanticGraph::Fundamental::Entity&)
     {
       collapse (value_);
-      os << L << strlit (value_);
+      os << strlit (value_);
     }
 
     Void InitValue::
@@ -1242,7 +1242,7 @@ namespace CXX
 
         os << "{";
         type_name_.dispatch (t);
-        os << " tmp (" << L << strlit (v) << ");"
+        os << " tmp (" << strlit (v) << ");"
            << "r.push_back (tmp);"
            << "}";
 
diff --git a/xsd/cxx/tree/parser-source.cxx b/xsd/cxx/tree/parser-source.cxx
index 94d0b91..7291cb8 100644
--- a/xsd/cxx/tree/parser-source.cxx
+++ b/xsd/cxx/tree/parser-source.cxx
@@ -342,8 +342,8 @@ namespace CXX
                << endl
                << "::std::auto_ptr< ::xsd::cxx::tree::type > tmp (" << endl
                << "tfm.create (" << endl
-               << L << strlit (e.name ()) << "," << endl
-               << L << strlit (e.namespace_().name ()) << "," << endl
+               << strlit (e.name ()) << "," << endl
+               << strlit (e.namespace_().name ()) << "," << endl
                << "&::xsd::cxx::tree::factory_impl< " << type << " >," << endl
                << "true, true, e, n, f, 0));"
                << endl
@@ -361,8 +361,8 @@ namespace CXX
           }
           else
           {
-            os << "if (n.name () == " << L << strlit (e.name ()) << " &&" << endl
-               << "n.namespace_ () == " << L << strlit (e.namespace_().name ()) << ")"
+            os << "if (n.name () == " << strlit (e.name ()) << " &&" << endl
+               << "n.namespace_ () == " << strlit (e.namespace_().name ()) << ")"
                << "{";
 
             if (fund)
@@ -395,8 +395,8 @@ namespace CXX
             char_type << " > (" << endl
              << "n.name ()," << endl
              << "n.namespace_ ()," << endl
-             << L << strlit (e.name ()) << "," << endl
-             << L << strlit (e.namespace_().name ()) << ");"
+             << strlit (e.name ()) << "," << endl
+             << strlit (e.namespace_().name ()) << ");"
              << "}";
 
 
@@ -440,8 +440,8 @@ namespace CXX
                << endl
                << "::std::auto_ptr< ::xsd::cxx::tree::type > tmp (" << endl
                << "tfm.create (" << endl
-               << L << strlit (e.name ()) << "," << endl
-               << L << strlit (e.namespace_().name ()) << "," << endl
+               << strlit (e.name ()) << "," << endl
+               << strlit (e.namespace_().name ()) << "," << endl
                << "&::xsd::cxx::tree::factory_impl< " << type << " >," << endl
                << "true, true, e, n, f, 0));"
                << endl
@@ -450,8 +450,8 @@ namespace CXX
           }
           else
           {
-            os << "if (n.name () == " << L << strlit (e.name ()) << " &&" << endl
-               << "n.namespace_ () == " << L << strlit (e.namespace_().name ()) << ")"
+            os << "if (n.name () == " << strlit (e.name ()) << " &&" << endl
+               << "n.namespace_ () == " << strlit (e.namespace_().name ()) << ")"
                << "{";
 
             if (fund)
@@ -498,8 +498,8 @@ namespace CXX
             char_type << " > (" << endl
              << "n.name ()," << endl
              << "n.namespace_ ()," << endl
-             << L << strlit (e.name ()) << "," << endl
-             << L << strlit (e.namespace_().name ()) << ");"
+             << strlit (e.name ()) << "," << endl
+             << strlit (e.namespace_().name ()) << ");"
              << "}";
         }
 
diff --git a/xsd/cxx/tree/serialization-source.cxx b/xsd/cxx/tree/serialization-source.cxx
index 5543ae5..bee3271 100644
--- a/xsd/cxx/tree/serialization-source.cxx
+++ b/xsd/cxx/tree/serialization-source.cxx
@@ -103,8 +103,8 @@ namespace CXX
                << "const ::xsd::cxx::tree::type_serializer_initializer< 0, " <<
               char_type << ", " << name << " >" << endl
                << "_xsd_" << name << "_type_serializer_init (" << endl
-               << L << strlit (l.name ()) << "," << endl
-               << L << strlit (xml_ns_name (l)) << ");"
+               << strlit (l.name ()) << "," << endl
+               << strlit (xml_ns_name (l)) << ");"
                << endl
                << endl;
           }
@@ -183,8 +183,8 @@ namespace CXX
                << "const ::xsd::cxx::tree::type_serializer_initializer< 0, " <<
               char_type << ", " << name << " >" << endl
                << "_xsd_" << name << "_type_serializer_init (" << endl
-               << L << strlit (u.name ()) << "," << endl
-               << L << strlit (xml_ns_name (u)) << ");"
+               << strlit (u.name ()) << "," << endl
+               << strlit (xml_ns_name (u)) << ");"
                << endl
                << endl;
           }
@@ -265,8 +265,8 @@ namespace CXX
                << "const ::xsd::cxx::tree::type_serializer_initializer< 0, " <<
               char_type << ", " << name << " >" << endl
                << "_xsd_" << name << "_type_serializer_init (" << endl
-               << L << strlit (e.name ()) << "," << endl
-               << L << strlit (xml_ns_name (e)) << ");"
+               << strlit (e.name ()) << "," << endl
+               << strlit (xml_ns_name (e)) << ");"
                << endl
                << endl;
           }
@@ -334,16 +334,16 @@ namespace CXX
                  << "{"
                  << xerces_ns << "::DOMElement& s (" << endl
                  << "::xsd::cxx::xml::dom::create_element (" << endl
-                 << L << strlit (e.name ()) << "," << endl
-                 << (ns ? L + strlit (ns) + L",\n" : L"")
+                 << strlit (e.name ()) << "," << endl
+                 << (ns ? strlit (ns) + L",\n" : L"")
                  << "e));"
                  << endl
                  << "s << *b;"
                  << "}"
                  << "else" << endl
                  << "tsm.serialize (" << endl
-                 << L << strlit (e.name ()) << "," << endl
-                 << L << strlit (ns) << "," << endl
+                 << strlit (e.name ()) << "," << endl
+                 << strlit (ns) << "," << endl
                  << (e.global () ? "true" : "false") << ", " <<
                 (e.qualified () ? "true" : "false") << ", e, *b);";
             }
@@ -351,8 +351,8 @@ namespace CXX
             {
               os << xerces_ns << "::DOMElement& s (" << endl
                  << "::xsd::cxx::xml::dom::create_element (" << endl
-                 << L << strlit (e.name ()) << "," << endl
-                 << (ns ? L + strlit (ns) + L",\n" : L"")
+                 << strlit (e.name ()) << "," << endl
+                 << (ns ? strlit (ns) + L",\n" : L"")
                  << "e));"
                  << endl;
 
@@ -392,16 +392,16 @@ namespace CXX
                  << "{"
                  << xerces_ns << "::DOMElement& s (" << endl
                  << "::xsd::cxx::xml::dom::create_element (" << endl
-                 << L << strlit (e.name ()) << "," << endl
-                 << (ns ? L + strlit (ns) + L",\n" : L"")
+                 << strlit (e.name ()) << "," << endl
+                 << (ns ? strlit (ns) + L",\n" : L"")
                  << "e));"
                  << endl
                  << "s << x;"
                  << "}"
                  << "else" << endl
                  << "tsm.serialize (" << endl
-                 << L << strlit (e.name ()) << "," << endl
-                 << L << strlit (ns) << "," << endl
+                 << strlit (e.name ()) << "," << endl
+                 << strlit (ns) << "," << endl
                  << (e.global () ? "true" : "false") << ", " <<
                 (e.qualified () ? "true" : "false") << ", e, x);";
             }
@@ -409,8 +409,8 @@ namespace CXX
             {
               os << xerces_ns << "::DOMElement& s (" << endl
                  << "::xsd::cxx::xml::dom::create_element (" << endl
-                 << L << strlit (e.name ()) << "," << endl
-                 << (ns ? L + strlit (ns) + L",\n" : L"")
+                 << strlit (e.name ()) << "," << endl
+                 << (ns ? strlit (ns) + L",\n" : L"")
                  << "e));"
                  << endl;
 
@@ -447,16 +447,16 @@ namespace CXX
                  << "{"
                  << xerces_ns << "::DOMElement& s (" << endl
                  << "::xsd::cxx::xml::dom::create_element (" << endl
-                 << L << strlit (e.name ()) << "," << endl
-                 << (ns ? L + strlit (ns) + L",\n" : L"")
+                 << strlit (e.name ()) << "," << endl
+                 << (ns ? strlit (ns) + L",\n" : L"")
                  << "e));"
                  << endl
                  << "s << x;"
                  << "}"
                  << "else" << endl
                  << "tsm.serialize (" << endl
-                 << L << strlit (e.name ()) << "," << endl
-                 << L << strlit (ns) << "," << endl
+                 << strlit (e.name ()) << "," << endl
+                 << strlit (ns) << "," << endl
                  << (e.global () ? "true" : "false") << ", " <<
                 (e.qualified () ? "true" : "false") << ", e, x);";
             }
@@ -465,8 +465,8 @@ namespace CXX
               os << "{"
                  << xerces_ns << "::DOMElement& s (" << endl
                  << "::xsd::cxx::xml::dom::create_element (" << endl
-                 << L << strlit (e.name ()) << "," << endl
-                 << (ns ? L + strlit (ns) + L",\n" : L"")
+                 << strlit (e.name ()) << "," << endl
+                 << (ns ? strlit (ns) + L",\n" : L"")
                  << "e));"
                  << endl;
 
@@ -581,8 +581,8 @@ namespace CXX
                << "{"
                << xerces_ns << "::DOMAttr& a (" << endl
                << "::xsd::cxx::xml::dom::create_attribute (" << endl
-               << L << strlit (a.name ()) << "," << endl
-               << (ns ? L + strlit (ns) + L",\n" : L"")
+               << strlit (a.name ()) << "," << endl
+               << (ns ? strlit (ns) + L",\n" : L"")
                << "e));"
                << endl;
 
@@ -621,8 +621,8 @@ namespace CXX
             os << "{"
                << xerces_ns << "::DOMAttr& a (" << endl
                << "::xsd::cxx::xml::dom::create_attribute (" << endl
-               << L << strlit (a.name ()) << "," << endl
-               << (ns ? L + strlit (ns) + L",\n" : L"")
+               << strlit (a.name ()) << "," << endl
+               << (ns ? strlit (ns) + L",\n" : L"")
                << "e));"
                << endl;
 
@@ -817,8 +817,8 @@ namespace CXX
                << "const ::xsd::cxx::tree::type_serializer_initializer< 0, " <<
               char_type << ", " << name << " >" << endl
                << "_xsd_" << name << "_type_serializer_init (" << endl
-               << L << strlit (c.name ()) << "," << endl
-               << L << strlit (xml_ns_name (c)) << ");"
+               << strlit (c.name ()) << "," << endl
+               << strlit (xml_ns_name (c)) << ");"
                << endl
                << endl;
           }
@@ -859,10 +859,10 @@ namespace CXX
 
             os << " >" << endl
                << "_xsd_" << name << "_element_serializer_init (" << endl
-               << L << strlit (r.name ()) << "," << endl
-               << L << strlit (r.namespace_ ().name ()) << "," << endl
-               << L << strlit (e.name ()) << "," << endl
-               << L << strlit (e.namespace_ ().name ()) << ");"
+               << strlit (r.name ()) << "," << endl
+               << strlit (r.namespace_ ().name ()) << "," << endl
+               << strlit (e.name ()) << "," << endl
+               << strlit (e.namespace_ ().name ()) << ");"
                << endl
                << endl;
           }
@@ -1101,8 +1101,8 @@ namespace CXX
                << "{";
           }
 
-          os << "if (n.name () == " << L << strlit (e.name ()) << " &&" << endl
-             << "n.namespace_ () == " << L << strlit (ns) << ")"
+          os << "if (n.name () == " << strlit (e.name ()) << " &&" << endl
+             << "n.namespace_ () == " << strlit (ns) << ")"
              << "{";
 
           switch (schema_type (type))
@@ -1131,8 +1131,8 @@ namespace CXX
             char_type << " > (" << endl
              << "n.name ()," << endl
              << "n.namespace_ ()," << endl
-             << L << strlit (e.name ()) << "," << endl
-             << L << strlit (ns) << ");"
+             << strlit (e.name ()) << "," << endl
+             << strlit (ns) << ");"
              << "}";
 
           if (poly)
@@ -1149,8 +1149,8 @@ namespace CXX
               char_type << " > ());"
                << endl
                << "tsm.serialize (" << endl
-               << L << strlit (e.name ()) << "," << endl
-               << L << strlit (e.namespace_().name ()) << "," << endl
+               << strlit (e.name ()) << "," << endl
+               << strlit (e.namespace_().name ()) << "," << endl
                << "e, n, s);"
                << "}";
           }
@@ -1180,8 +1180,8 @@ namespace CXX
               "::DOMDocument > r (" << endl
                << "::xsd::cxx::xml::dom::serialize< " <<
               char_type << " > (" << endl
-               << L << strlit (e.name ()) << "," << endl
-               << L << strlit (ns) << "," << endl
+               << strlit (e.name ()) << "," << endl
+               << strlit (ns) << "," << endl
                << "m, f));"
                << "d = r;"
                << "}"
@@ -1195,8 +1195,8 @@ namespace CXX
                << dom_auto_ptr << "< " << xerces_ns <<
               "::DOMDocument > r (" << endl
                << "tsm.serialize (" << endl
-               << L << strlit (e.name ()) << "," << endl
-               << L << strlit (e.namespace_().name ()) << "," << endl
+               << strlit (e.name ()) << "," << endl
+               << strlit (e.namespace_().name ()) << "," << endl
                << "m, s, f));"
                << "d = r;"
                << "}";
@@ -1207,8 +1207,8 @@ namespace CXX
               "::DOMDocument > d (" << endl
                << "::xsd::cxx::xml::dom::serialize< " <<
               char_type << " > (" << endl
-               << L << strlit (e.name ()) << "," << endl
-               << L << strlit (ns) << "," << endl
+               << strlit (e.name ()) << "," << endl
+               << strlit (ns) << "," << endl
                << "m, f));"
                << endl;
           }
diff --git a/xsd/cxx/tree/stream-extraction-source.cxx b/xsd/cxx/tree/stream-extraction-source.cxx
index 39c5994..53f508e 100644
--- a/xsd/cxx/tree/stream-extraction-source.cxx
+++ b/xsd/cxx/tree/stream-extraction-source.cxx
@@ -73,8 +73,8 @@ namespace CXX
                 char_type << ", " << name << " >" << endl
                  << "_xsd_" << name << "_stream_extraction_init_" <<
                 n++ << " (" << endl
-                 << L << strlit (l.name ()) << "," << endl
-                 << L << strlit (xml_ns_name (l)) << ");"
+                 << strlit (l.name ()) << "," << endl
+                 << strlit (xml_ns_name (l)) << ");"
                  << endl;
             }
           }
@@ -141,8 +141,8 @@ namespace CXX
                 char_type << ", " << name << " >" << endl
                  << "_xsd_" << name << "_stream_extraction_init_" <<
                 n++ << " (" << endl
-                 << L << strlit (u.name ()) << "," << endl
-                 << L << strlit (xml_ns_name (u)) << ");"
+                 << strlit (u.name ()) << "," << endl
+                 << strlit (xml_ns_name (u)) << ");"
                  << endl;
             }
           }
@@ -210,8 +210,8 @@ namespace CXX
                 char_type << ", " << name << " >" << endl
                  << "_xsd_" << name << "_stream_extraction_init_" <<
                 n++ << " (" << endl
-                 << L << strlit (e.name ()) << "," << endl
-                 << L << strlit (xml_ns_name (e)) << ");"
+                 << strlit (e.name ()) << "," << endl
+                 << strlit (xml_ns_name (e)) << ");"
                  << endl;
             }
           }
@@ -643,8 +643,8 @@ namespace CXX
                 char_type << ", " << name << " >" << endl
                  << "_xsd_" << name << "_stream_extraction_init_" <<
                 n++ << " (" << endl
-                 << L << strlit (c.name ()) << "," << endl
-                 << L << strlit (xml_ns_name (c)) << ");"
+                 << strlit (c.name ()) << "," << endl
+                 << strlit (xml_ns_name (c)) << ");"
                  << endl;
             }
           }
diff --git a/xsd/cxx/tree/stream-insertion-source.cxx b/xsd/cxx/tree/stream-insertion-source.cxx
index 1ab21e7..d280e9a 100644
--- a/xsd/cxx/tree/stream-insertion-source.cxx
+++ b/xsd/cxx/tree/stream-insertion-source.cxx
@@ -72,8 +72,8 @@ namespace CXX
                 char_type << ", " << name << " >" << endl
                  << "_xsd_" << name << "_stream_insertion_init_" <<
                 n++ << " (" << endl
-                 << L << strlit (l.name ()) << "," << endl
-                 << L << strlit (xml_ns_name (l)) << ");"
+                 << strlit (l.name ()) << "," << endl
+                 << strlit (xml_ns_name (l)) << ");"
                  << endl;
             }
           }
@@ -140,8 +140,8 @@ namespace CXX
                 char_type << ", " << name << " >" << endl
                  << "_xsd_" << name << "_stream_insertion_init_" <<
                 n++ << " (" << endl
-                 << L << strlit (u.name ()) << "," << endl
-                 << L << strlit (xml_ns_name (u)) << ");"
+                 << strlit (u.name ()) << "," << endl
+                 << strlit (xml_ns_name (u)) << ");"
                  << endl;
             }
           }
@@ -199,8 +199,8 @@ namespace CXX
                 char_type << ", " << name << " >" << endl
                  << "_xsd_" << name << "_stream_insertion_init_" <<
                 n++ << " (" << endl
-                 << L << strlit (e.name ()) << "," << endl
-                 << L << strlit (xml_ns_name (e)) << ");"
+                 << strlit (e.name ()) << "," << endl
+                 << strlit (xml_ns_name (e)) << ");"
                  << endl;
             }
           }
@@ -420,8 +420,8 @@ namespace CXX
                 char_type << ", " << name << " >" << endl
                  << "_xsd_" << name << "_stream_insertion_init_" <<
                 n++ << " (" << endl
-                 << L << strlit (c.name ()) << "," << endl
-                 << L << strlit (xml_ns_name (c)) << ");"
+                 << strlit (c.name ()) << "," << endl
+                 << strlit (xml_ns_name (c)) << ");"
                  << endl;
             }
           }
diff --git a/xsd/cxx/tree/stream-source.cxx b/xsd/cxx/tree/stream-source.cxx
index 7631050..9b17522 100644
--- a/xsd/cxx/tree/stream-source.cxx
+++ b/xsd/cxx/tree/stream-source.cxx
@@ -249,7 +249,7 @@ namespace CXX
               "e (i." << aname << " ().end ());" << endl
                << "b != e; ++b)"
                << "{"
-               << "o << ::std::endl << " << L << strlit (e.name () + L": ");
+               << "o << ::std::endl << " << strlit (e.name () + L": ");
 
             if (!poly)
               os << " << *b;";
@@ -266,7 +266,7 @@ namespace CXX
 
             os << "if (i." << aname << " ())"
                << "{"
-               << "o << ::std::endl << " << L << strlit (e.name () + L": ");
+               << "o << ::std::endl << " << strlit (e.name () + L": ");
 
             if (!poly)
               os << " << *i." << aname << " ();";
@@ -280,7 +280,7 @@ namespace CXX
           {
             // one
             //
-            os << "o << ::std::endl << " << L << strlit (e.name () + L": ");
+            os << "o << ::std::endl << " << strlit (e.name () + L": ");
 
             if (!poly)
               os << " << i." << aname << " ();";
@@ -313,13 +313,13 @@ namespace CXX
           {
             os << "if (i." << aname << " ())"
                << "{"
-               << "o << ::std::endl << " << L << strlit (a.name () + L": ") <<
+               << "o << ::std::endl << " << strlit (a.name () + L": ") <<
               " << *i." << aname << " ();"
                << "}";
           }
           else
           {
-            os << "o << ::std::endl << " << L << strlit (a.name () + L": ") <<
+            os << "o << ::std::endl << " << strlit (a.name () + L": ") <<
               " << i." << aname << " ();";
           }
         }
diff --git a/xsd/cxx/tree/tree-source.cxx b/xsd/cxx/tree/tree-source.cxx
index ef5ad8e..1fd31b2 100644
--- a/xsd/cxx/tree/tree-source.cxx
+++ b/xsd/cxx/tree/tree-source.cxx
@@ -116,8 +116,8 @@ namespace CXX
                  << "const ::xsd::cxx::tree::type_factory_initializer< 0, " <<
                 char_type << ", " << name << " >" << endl
                  << "_xsd_" << name << "_type_factory_init (" << endl
-                 << L << strlit (l.name ()) << "," << endl
-                 << L << strlit (xml_ns_name (l)) << ");"
+                 << strlit (l.name ()) << "," << endl
+                 << strlit (xml_ns_name (l)) << ");"
                  << endl;
 
             if (options.value<CLI::generate_comparison> ())
@@ -223,8 +223,8 @@ namespace CXX
                  << "const ::xsd::cxx::tree::type_factory_initializer< 0, " <<
                 char_type << ", " << name << " >" << endl
                  << "_xsd_" << name << "_type_factory_init (" << endl
-                 << L << strlit (u.name ()) << "," << endl
-                 << L << strlit (xml_ns_name (u)) << ");"
+                 << strlit (u.name ()) << "," << endl
+                 << strlit (xml_ns_name (u)) << ");"
                  << endl;
 
             if (options.value<CLI::generate_comparison> ())
@@ -251,7 +251,7 @@ namespace CXX
         virtual Void
         traverse (Type& e)
         {
-          os << L << strlit (e.name ());
+          os << strlit (e.name ());
         }
       };
 
@@ -515,8 +515,8 @@ namespace CXX
                  << "const ::xsd::cxx::tree::type_factory_initializer< 0, " <<
                 char_type << ", " << name << " >" << endl
                  << "_xsd_" << name << "_type_factory_init (" << endl
-                 << L << strlit (e.name ()) << "," << endl
-                 << L << strlit (xml_ns_name (e)) << ");"
+                 << strlit (e.name ()) << "," << endl
+                 << strlit (xml_ns_name (e)) << ");"
                  << endl;
 
             if (options.value<CLI::generate_comparison> ())
@@ -703,12 +703,10 @@ namespace CXX
                << endl
                << "::std::auto_ptr< ::xsd::cxx::tree::type > tmp (" << endl
                << "tfm.create (" << endl
-               << L << strlit (e.name ()) << "," << endl
-               << L << (
-                 e.qualified ()
-                 ? strlit (e.namespace_ ().name ())
-                 : String ("\"\"")) <<
-              "," << endl
+               << strlit (e.name ()) << "," << endl
+               << (e.qualified ()
+                   ? strlit (e.namespace_ ().name ())
+                   : L + String ("\"\"")) << "," << endl
                << "&::xsd::cxx::tree::factory_impl< " << type << " >," << endl
                << (e.global () ? "true" : "false") << ", " <<
               (e.qualified () ? "true" : "false") << ", " <<
@@ -721,14 +719,13 @@ namespace CXX
           {
             if (e.qualified () && e.namespace_ ().name ())
             {
-              os << "if (n.name () == " << L << strlit (e.name ()) << " && " <<
-                "n.namespace_ () == " << L <<
-                strlit (e.namespace_ ().name ()) << ")"
+              os << "if (n.name () == " << strlit (e.name ()) << " && " <<
+                "n.namespace_ () == " << strlit (e.namespace_ ().name ()) << ")"
                  << "{";
             }
             else
             {
-              os << "if (n.name () == " << L << strlit (e.name ()) << " && " <<
+              os << "if (n.name () == " << strlit (e.name ()) << " && " <<
                 "n.namespace_ ().empty ())"
                  << "{";
             }
@@ -880,10 +877,10 @@ namespace CXX
                << "{"
                << "throw ::xsd::cxx::tree::expected_element< " <<
               char_type << " > (" << endl
-               << L << strlit (e.name ()) << "," << endl
-               << L << (e.qualified ()
-                        ? strlit (e.namespace_ ().name ())
-                        : String ("\"\"")) << ");"
+               << strlit (e.name ()) << "," << endl
+               << (e.qualified ()
+                   ? strlit (e.namespace_ ().name ())
+                   : L + String ("\"\"")) << ");"
                << "}";
           }
         }
@@ -927,7 +924,7 @@ namespace CXX
                 // the consensus.
                 //
                 os << "(!n.namespace_ ().empty () && " <<
-                  "n.namespace_ () != " << L << strlit (ns) << ")";
+                  "n.namespace_ () != " << strlit (ns) << ")";
               }
               else
                 os << "!n.namespace_ ().empty ()";
@@ -938,11 +935,11 @@ namespace CXX
             }
             else if (*i == L"##targetNamespace")
             {
-              os << "n.namespace_ () == " << L << strlit (ns);
+              os << "n.namespace_ () == " << strlit (ns);
             }
             else
             {
-              os << "n.namespace_ () == " << L << strlit (*i);
+              os << "n.namespace_ () == " << strlit (*i);
             }
 
             if (++i != e)
@@ -1045,7 +1042,7 @@ namespace CXX
                << "throw ::xsd::cxx::tree::expected_element< " <<
               char_type << " > (" << endl
                << L << "\"*\"," << endl
-               << L << strlit (*a.namespace_begin ()) << ");"
+               << strlit (*a.namespace_begin ()) << ");"
                << "}";
           }
         }
@@ -1067,14 +1064,13 @@ namespace CXX
 
           if (a.qualified () && a.namespace_ ().name ())
           {
-            os << "if (n.name () == " << L << strlit (a.name ()) << " && " <<
-              "n.namespace_ () == " << L <<
-              strlit (a.namespace_ ().name ()) << ")"
+            os << "if (n.name () == " << strlit (a.name ()) << " && " <<
+              "n.namespace_ () == " << strlit (a.namespace_ ().name ()) << ")"
                << "{";
           }
           else
           {
-            os << "if (n.name () == " << L << strlit (a.name ()) << " && " <<
+            os << "if (n.name () == " << strlit (a.name ()) << " && " <<
               "n.namespace_ ().empty ())"
                << "{";
           }
@@ -1152,7 +1148,7 @@ namespace CXX
                 // the consensus.
                 //
                 os << "(!n.namespace_ ().empty () &&" << endl
-                   << "n.namespace_ () != " << L << strlit (ns) << " &&" <<endl
+                   << "n.namespace_ () != " << strlit (ns) << " &&" <<endl
                    << "n.namespace_ () != " <<
                   "::xsd::cxx::xml::bits::xmlns_namespace< " << char_type <<
                   " > () &&" << endl
@@ -1175,11 +1171,11 @@ namespace CXX
             }
             else if (*i == L"##targetNamespace")
             {
-              os << "n.namespace_ () == " << L << strlit (ns);
+              os << "n.namespace_ () == " << strlit (ns);
             }
             else
             {
-              os << "n.namespace_ () == " << L << strlit (*i);
+              os << "n.namespace_ () == " << strlit (*i);
             }
 
             if (++i != e)
@@ -1224,10 +1220,10 @@ namespace CXX
             else
               os << "throw ::xsd::cxx::tree::expected_attribute< " <<
                 char_type << " > (" << endl
-                 << L << strlit (a.name ()) << "," << endl
-                 << L <<(a.qualified ()
-                         ? strlit (a.namespace_ ().name ())
-                         : String ("\"\"")) << ");";
+                 << strlit (a.name ()) << "," << endl
+                 << (a.qualified ()
+                     ? strlit (a.namespace_ ().name ())
+                     : L + String ("\"\"")) << ");";
 
             os << "}";
           }
@@ -2999,8 +2995,8 @@ namespace CXX
                  << "const ::xsd::cxx::tree::type_factory_initializer< 0, " <<
                 char_type << ", " << name << " >" << endl
                  << "_xsd_" << name << "_type_factory_init (" << endl
-                 << L << strlit (c.name ()) << "," << endl
-                 << L << strlit (xml_ns_name (c)) << ");"
+                 << strlit (c.name ()) << "," << endl
+                 << strlit (xml_ns_name (c)) << ");"
                  << endl;
 
             if (options.value<CLI::generate_comparison> ())
@@ -3276,11 +3272,10 @@ namespace CXX
                << "}";
 
             os << "const " << string_type << " " << name << "::" << endl
-               << name_member << " (" << L << strlit (e.name ()) << ");"
+               << name_member << " (" << strlit (e.name ()) << ");"
                << endl
                << "const " << string_type << " " << name << "::" << endl
-               << ns_member << " (" << L <<
-              strlit (e.namespace_ ().name ()) << ");"
+               << ns_member << " (" << strlit (e.namespace_ ().name ()) << ");"
                << endl;
 
             // d-tor
@@ -3318,10 +3313,10 @@ namespace CXX
 
             os << " >" << endl
                << "_xsd_" << name << "_element_factory_init (" << endl
-               << L << strlit (r.name ()) << "," << endl
-               << L << strlit (r.namespace_ ().name ()) << "," << endl
-               << L << strlit (e.name ()) << "," << endl
-               << L << strlit (e.namespace_ ().name ()) << ");"
+               << strlit (r.name ()) << "," << endl
+               << strlit (r.namespace_ ().name ()) << "," << endl
+               << strlit (e.name ()) << "," << endl
+               << strlit (e.namespace_ ().name ()) << ");"
                << endl
                << endl;
           }
-- 
cgit v1.1