14 files changed, 38 insertions, 52 deletions
diff --git a/xsd/libxsd/xsd/cxx/tree/parsing/boolean.hxx b/xsd/libxsd/xsd/cxx/tree/parsing/boolean.hxx
index 3dafdaa..8bbd3a8 100644
--- a/xsd/libxsd/xsd/cxx/tree/parsing/boolean.hxx
+++ b/xsd/libxsd/xsd/cxx/tree/parsing/boolean.hxx
@@ -1,6 +1,5 @@
 // file      : xsd/cxx/tree/parsing/boolean.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_CXX_TREE_PARSING_BOOLEAN_HXX
@@ -42,7 +41,7 @@ namespace xsd
       bool traits<bool, C, schema_type::other>::
       create (const xercesc::DOMElement& e, flags f, container* c)
       {
-        return create (text_content<C> (e), 0, f, c);
+        return create (tree::text_content<C> (e), 0, f, c);
       }
 
       template <typename C>
diff --git a/xsd/libxsd/xsd/cxx/tree/parsing/byte.hxx b/xsd/libxsd/xsd/cxx/tree/parsing/byte.hxx
index 0a127c9..d6cf1d3 100644
--- a/xsd/libxsd/xsd/cxx/tree/parsing/byte.hxx
+++ b/xsd/libxsd/xsd/cxx/tree/parsing/byte.hxx
@@ -1,6 +1,5 @@
 // file      : xsd/cxx/tree/parsing/byte.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_CXX_TREE_PARSING_BYTE_HXX
@@ -41,7 +40,7 @@ namespace xsd
       signed char traits<signed char, C, schema_type::other>::
       create (const xercesc::DOMElement& e, flags f, container* c)
       {
-        return create (text_content<C> (e), 0, f, c);
+        return create (tree::text_content<C> (e), 0, f, c);
       }
 
       template <typename C>
diff --git a/xsd/libxsd/xsd/cxx/tree/parsing/date-time.txx b/xsd/libxsd/xsd/cxx/tree/parsing/date-time.txx
index 913786c..29b12b6 100644
--- a/xsd/libxsd/xsd/cxx/tree/parsing/date-time.txx
+++ b/xsd/libxsd/xsd/cxx/tree/parsing/date-time.txx
@@ -1,6 +1,5 @@
 // file      : xsd/cxx/tree/parsing/date-time.txx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #include <xsd/cxx/ro-string.hxx>
@@ -60,7 +59,7 @@ namespace xsd
       gday (const xercesc::DOMElement& e, flags f, container* c)
           : B (e, f, c)
       {
-        parse (text_content<C> (e));
+        parse (tree::text_content<C> (e));
       }
 
       template <typename C, typename B>
@@ -110,7 +109,7 @@ namespace xsd
       gmonth (const xercesc::DOMElement& e, flags f, container* c)
           : B (e, f, c)
       {
-        parse (text_content<C> (e));
+        parse (tree::text_content<C> (e));
       }
 
       template <typename C, typename B>
@@ -160,7 +159,7 @@ namespace xsd
       gyear (const xercesc::DOMElement& e, flags f, container* c)
           : B (e, f, c)
       {
-        parse (text_content<C> (e));
+        parse (tree::text_content<C> (e));
       }
 
       template <typename C, typename B>
@@ -223,7 +222,7 @@ namespace xsd
       gmonth_day (const xercesc::DOMElement& e, flags f, container* c)
           : B (e, f, c)
       {
-        parse (text_content<C> (e));
+        parse (tree::text_content<C> (e));
       }
 
       template <typename C, typename B>
@@ -274,7 +273,7 @@ namespace xsd
       gyear_month (const xercesc::DOMElement& e, flags f, container* c)
           : B (e, f, c)
       {
-        parse (text_content<C> (e));
+        parse (tree::text_content<C> (e));
       }
 
       template <typename C, typename B>
@@ -338,7 +337,7 @@ namespace xsd
       date (const xercesc::DOMElement& e, flags f, container* c)
           : B (e, f, c)
       {
-        parse (text_content<C> (e));
+        parse (tree::text_content<C> (e));
       }
 
       template <typename C, typename B>
@@ -403,7 +402,7 @@ namespace xsd
       time (const xercesc::DOMElement& e, flags f, container* c)
           : B (e, f, c)
       {
-        parse (text_content<C> (e));
+        parse (tree::text_content<C> (e));
       }
 
       template <typename C, typename B>
@@ -470,7 +469,7 @@ namespace xsd
       date_time (const xercesc::DOMElement& e, flags f, container* c)
           : B (e, f, c)
       {
-        parse (text_content<C> (e));
+        parse (tree::text_content<C> (e));
       }
 
       template <typename C, typename B>
@@ -557,7 +556,7 @@ namespace xsd
       duration (const xercesc::DOMElement& e, flags f, container* c)
           : B (e, f, c)
       {
-        parse (text_content<C> (e));
+        parse (tree::text_content<C> (e));
       }
 
       template <typename C, typename B>
diff --git a/xsd/libxsd/xsd/cxx/tree/parsing/decimal.hxx b/xsd/libxsd/xsd/cxx/tree/parsing/decimal.hxx
index 636c0f5..b615d3c 100644
--- a/xsd/libxsd/xsd/cxx/tree/parsing/decimal.hxx
+++ b/xsd/libxsd/xsd/cxx/tree/parsing/decimal.hxx
@@ -1,6 +1,5 @@
 // file      : xsd/cxx/tree/parsing/decimal.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_CXX_TREE_PARSING_DECIMAL_HXX
@@ -45,7 +44,7 @@ namespace xsd
       double traits<double, C, schema_type::decimal>::
       create (const xercesc::DOMElement& e, flags f, container* c)
       {
-        return create (text_content<C> (e), 0, f, c);
+        return create (tree::text_content<C> (e), 0, f, c);
       }
 
       template <typename C>
diff --git a/xsd/libxsd/xsd/cxx/tree/parsing/double.hxx b/xsd/libxsd/xsd/cxx/tree/parsing/double.hxx
index 1507ccf..4466f7d 100644
--- a/xsd/libxsd/xsd/cxx/tree/parsing/double.hxx
+++ b/xsd/libxsd/xsd/cxx/tree/parsing/double.hxx
@@ -1,6 +1,5 @@
 // file      : xsd/cxx/tree/parsing/double.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_CXX_TREE_PARSING_DOUBLE_HXX
@@ -45,7 +44,7 @@ namespace xsd
       double traits<double, C, schema_type::double_>::
       create (const xercesc::DOMElement& e, flags f, container* c)
       {
-        return create (text_content<C> (e), 0, f, c);
+        return create (tree::text_content<C> (e), 0, f, c);
       }
 
       template <typename C>
diff --git a/xsd/libxsd/xsd/cxx/tree/parsing/element-map.txx b/xsd/libxsd/xsd/cxx/tree/parsing/element-map.txx
index bb9a4c6..6ac9674 100644
--- a/xsd/libxsd/xsd/cxx/tree/parsing/element-map.txx
+++ b/xsd/libxsd/xsd/cxx/tree/parsing/element-map.txx
@@ -1,6 +1,5 @@
 // file      : xsd/cxx/tree/parsing/element-map.txx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_CXX_TREE_PARSING_ELEMENT_MAP_TXX
@@ -17,7 +16,7 @@ namespace xsd
     namespace tree
     {
       template <typename C, typename T>
-      std::auto_ptr<element_type<C, T> > element_map<C, T>::
+      XSD_AUTO_PTR<element_type<C, T> > element_map<C, T>::
       parse (const xercesc::DOMElement& e, flags f)
       {
         const qualified_name n (xml::dom::name<C> (e));
@@ -30,10 +29,10 @@ namespace xsd
       }
 
       template<typename T, typename C, typename B>
-      std::auto_ptr<element_type<C, B> >
+      XSD_AUTO_PTR<element_type<C, B> >
       parser_impl (const xercesc::DOMElement& e, flags f)
       {
-        return std::auto_ptr<element_type<C, B> > (new T (e, f));
+        return XSD_AUTO_PTR<element_type<C, B> > (new T (e, f));
       }
     }
   }
diff --git a/xsd/libxsd/xsd/cxx/tree/parsing/float.hxx b/xsd/libxsd/xsd/cxx/tree/parsing/float.hxx
index 3e34f93..ee582e5 100644
--- a/xsd/libxsd/xsd/cxx/tree/parsing/float.hxx
+++ b/xsd/libxsd/xsd/cxx/tree/parsing/float.hxx
@@ -1,6 +1,5 @@
 // file      : xsd/cxx/tree/parsing/float.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_CXX_TREE_PARSING_FLOAT_HXX
@@ -45,7 +44,7 @@ namespace xsd
       float traits<float, C, schema_type::other>::
       create (const xercesc::DOMElement& e, flags f, container* c)
       {
-        return create (text_content<C> (e), 0, f, c);
+        return create (tree::text_content<C> (e), 0, f, c);
       }
 
       template <typename C>
diff --git a/xsd/libxsd/xsd/cxx/tree/parsing/int.hxx b/xsd/libxsd/xsd/cxx/tree/parsing/int.hxx
index d996d3a..b4eec88 100644
--- a/xsd/libxsd/xsd/cxx/tree/parsing/int.hxx
+++ b/xsd/libxsd/xsd/cxx/tree/parsing/int.hxx
@@ -1,6 +1,5 @@
 // file      : xsd/cxx/tree/parsing/int.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_CXX_TREE_PARSING_INT_HXX
@@ -41,7 +40,7 @@ namespace xsd
       int traits<int, C, schema_type::other>::
       create (const xercesc::DOMElement& e, flags f, container* c)
       {
-        return create (text_content<C> (e), 0, f, c);
+        return create (tree::text_content<C> (e), 0, f, c);
       }
 
       template <typename C>
diff --git a/xsd/libxsd/xsd/cxx/tree/parsing/long.hxx b/xsd/libxsd/xsd/cxx/tree/parsing/long.hxx
index 742ade1..070e66d 100644
--- a/xsd/libxsd/xsd/cxx/tree/parsing/long.hxx
+++ b/xsd/libxsd/xsd/cxx/tree/parsing/long.hxx
@@ -1,6 +1,5 @@
 // file      : xsd/cxx/tree/parsing/long.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_CXX_TREE_PARSING_LONG_HXX
@@ -41,7 +40,7 @@ namespace xsd
       long long traits<long long, C, schema_type::other>::
       create (const xercesc::DOMElement& e, flags f, container* c)
       {
-        return create (text_content<C> (e), 0, f, c);
+        return create (tree::text_content<C> (e), 0, f, c);
       }
 
       template <typename C>
diff --git a/xsd/libxsd/xsd/cxx/tree/parsing/short.hxx b/xsd/libxsd/xsd/cxx/tree/parsing/short.hxx
index 3a7ead8..90d5144 100644
--- a/xsd/libxsd/xsd/cxx/tree/parsing/short.hxx
+++ b/xsd/libxsd/xsd/cxx/tree/parsing/short.hxx
@@ -1,6 +1,5 @@
 // file      : xsd/cxx/tree/parsing/short.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_CXX_TREE_PARSING_SHORT_HXX
@@ -41,7 +40,7 @@ namespace xsd
       short traits<short, C, schema_type::other>::
       create (const xercesc::DOMElement& e, flags f, container* c)
       {
-        return create (text_content<C> (e), 0, f, c);
+        return create (tree::text_content<C> (e), 0, f, c);
       }
 
       template <typename C>
diff --git a/xsd/libxsd/xsd/cxx/tree/parsing/unsigned-byte.hxx b/xsd/libxsd/xsd/cxx/tree/parsing/unsigned-byte.hxx
index ce336be..c172e93 100644
--- a/xsd/libxsd/xsd/cxx/tree/parsing/unsigned-byte.hxx
+++ b/xsd/libxsd/xsd/cxx/tree/parsing/unsigned-byte.hxx
@@ -1,6 +1,5 @@
 // file      : xsd/cxx/tree/parsing/unsigned-byte.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_CXX_TREE_PARSING_UNSIGNED_BYTE_HXX
@@ -41,7 +40,7 @@ namespace xsd
       unsigned char traits<unsigned char, C, schema_type::other>::
       create (const xercesc::DOMElement& e, flags f, container* c)
       {
-        return create (text_content<C> (e), 0, f, c);
+        return create (tree::text_content<C> (e), 0, f, c);
       }
 
       template <typename C>
diff --git a/xsd/libxsd/xsd/cxx/tree/parsing/unsigned-int.hxx b/xsd/libxsd/xsd/cxx/tree/parsing/unsigned-int.hxx
index e908dd0..07fb7f2 100644
--- a/xsd/libxsd/xsd/cxx/tree/parsing/unsigned-int.hxx
+++ b/xsd/libxsd/xsd/cxx/tree/parsing/unsigned-int.hxx
@@ -1,6 +1,5 @@
 // file      : xsd/cxx/tree/parsing/unsigned-int.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_CXX_TREE_PARSING_UNSIGNED_INT_HXX
@@ -41,7 +40,7 @@ namespace xsd
       unsigned int traits<unsigned int, C, schema_type::other>::
       create (const xercesc::DOMElement& e, flags f, container* c)
       {
-        return create (text_content<C> (e), 0, f, c);
+        return create (tree::text_content<C> (e), 0, f, c);
       }
 
       template <typename C>
diff --git a/xsd/libxsd/xsd/cxx/tree/parsing/unsigned-long.hxx b/xsd/libxsd/xsd/cxx/tree/parsing/unsigned-long.hxx
index 647b8dd..0036e0d 100644
--- a/xsd/libxsd/xsd/cxx/tree/parsing/unsigned-long.hxx
+++ b/xsd/libxsd/xsd/cxx/tree/parsing/unsigned-long.hxx
@@ -1,6 +1,5 @@
 // file      : xsd/cxx/tree/parsing/unsigned-long.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_CXX_TREE_PARSING_UNSIGNED_LONG_HXX
@@ -41,7 +40,7 @@ namespace xsd
       unsigned long long traits<unsigned long long, C, schema_type::other>::
       create (const xercesc::DOMElement& e, flags f, container* c)
       {
-        return create (text_content<C> (e), 0, f, c);
+        return create (tree::text_content<C> (e), 0, f, c);
       }
 
       template <typename C>
diff --git a/xsd/libxsd/xsd/cxx/tree/parsing/unsigned-short.hxx b/xsd/libxsd/xsd/cxx/tree/parsing/unsigned-short.hxx
index f53c724..838a2a8 100644
--- a/xsd/libxsd/xsd/cxx/tree/parsing/unsigned-short.hxx
+++ b/xsd/libxsd/xsd/cxx/tree/parsing/unsigned-short.hxx
@@ -1,6 +1,5 @@
 // file      : xsd/cxx/tree/parsing/unsigned-short.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_CXX_TREE_PARSING_UNSIGNED_SHORT_HXX
@@ -41,7 +40,7 @@ namespace xsd
       unsigned short traits<unsigned short, C, schema_type::other>::
       create (const xercesc::DOMElement& e, flags f, container* c)
       {
-        return create (text_content<C> (e), 0, f, c);
+        return create (tree::text_content<C> (e), 0, f, c);
       }
 
       template <typename C>