Imported Upstream version 4.0.0upstream/4.0.0

1 files changed, 11 insertions, 11 deletions

diff --git a/xsd/tests/cxx/tree/built-in/driver.cxx b/xsd/tests/cxx/tree/built-in/driver.cxx
index a41e4f3..f60ac16 100644
--- a/xsd/tests/cxx/tree/built-in/driver.cxx
+++ b/xsd/tests/cxx/tree/built-in/driver.cxx
@@ -1,12 +1,11 @@
 // file      : tests/cxx/tree/built-in/driver.cxx
-// 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
 
 // Test built-in type mapping.
 //
 
-#include <memory>  // std::auto_ptr
+#include <memory>  // std::auto_ptr/unique_ptr
 #include <sstream>
 #include <iostream>
 
@@ -15,7 +14,6 @@
 
 using std::cerr;
 using std::endl;
-using std::auto_ptr;
 
 int
 main (int argc, char* argv[])
@@ -26,12 +24,13 @@ main (int argc, char* argv[])
     return 1;
   }
 
-  auto_ptr<xmlns::test::Elements> elements (xmlns::test::elements (argv[1]));
+  XSD_AUTO_PTR<xmlns::test::Elements> elements (
+    xmlns::test::elements (argv[1]));
 
-  auto_ptr<xmlns::test::Attributes> attributes (
+  XSD_AUTO_PTR<xmlns::test::Attributes> attributes (
     xmlns::test::attributes (argv[2]));
 
-  auto_ptr<xmlns::test::Inherited> inherited (
+  XSD_AUTO_PTR<xmlns::test::Inherited> inherited (
     xmlns::test::inherited (argv[3]));
 
   cerr << "elements: " << *elements << endl
@@ -53,13 +52,14 @@ main (int argc, char* argv[])
     xmlns::test::elements (ostr, *elements, map);
 
     std::istringstream istr (ostr.str ());
-    auto_ptr<xmlns::test::Elements> elements1 (xmlns::test::elements (istr));
+    XSD_AUTO_PTR<xmlns::test::Elements> elements1 (
+      xmlns::test::elements (istr));
 
     std::ostringstream ostr1;
     xmlns::test::elements (ostr1, *elements1, map);
 
     if (ostr.str () != ostr1.str ())
-      return 1;     
+      return 1;
   }
 
   {
@@ -67,7 +67,7 @@ main (int argc, char* argv[])
     xmlns::test::attributes (ostr, *attributes, map);
 
     std::istringstream istr (ostr.str ());
-    auto_ptr<xmlns::test::Attributes> attributes1 (
+    XSD_AUTO_PTR<xmlns::test::Attributes> attributes1 (
       xmlns::test::attributes (istr));
 
     std::ostringstream ostr1;
@@ -82,7 +82,7 @@ main (int argc, char* argv[])
     xmlns::test::inherited (ostr, *inherited, map);
 
     std::istringstream istr (ostr.str ());
-    auto_ptr<xmlns::test::Inherited> inherited1 (
+    XSD_AUTO_PTR<xmlns::test::Inherited> inherited1 (
       xmlns::test::inherited (istr));
 
     std::ostringstream ostr1;