Imported Upstream version 4.0.0upstream/4.0.0

1 files changed, 9 insertions, 7 deletions

diff --git a/xsd/tests/cxx/tree/wildcard/driver.cxx b/xsd/tests/cxx/tree/wildcard/driver.cxx
index 5bd8229..e2db827 100644
--- a/xsd/tests/cxx/tree/wildcard/driver.cxx
+++ b/xsd/tests/cxx/tree/wildcard/driver.cxx
@@ -1,18 +1,20 @@
 // file      : tests/cxx/tree/wildcard/driver.cxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2006-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 // Test wildcard (any & anyAttribute) mapping.
 //
 
-#include <memory> // std::auto_ptr
+#include <memory> // std::auto_ptr/unique_ptr
 #include <sstream>
 #include <iostream>
 
-#include <xsd/cxx/xml/string.hxx>
+#include <xercesc/dom/DOM.hpp>
+#include <xercesc/util/PlatformUtils.hpp>
+
+#include "test.hxx" // Get XSD_CXX11 defined.
 
-#include "test.hxx"
+#include <xsd/cxx/xml/string.hxx>
 
 using namespace std;
 using namespace test;
@@ -170,7 +172,7 @@ main (int argc, char* argv[])
 
     // Test parsing
     //
-    auto_ptr<type> r (root (argv[1]));
+    XSD_AUTO_PTR<type> r (root (argv[1]));
     print (*r);
 
     // Test serialization.
@@ -187,7 +189,7 @@ main (int argc, char* argv[])
     // cout << iostr.str () << endl
     //      << endl;
 
-    auto_ptr<type> copy (root (iostr, argv[1]));
+    XSD_AUTO_PTR<type> copy (root (iostr, argv[1]));
     assert (*copy == *r);
 
     print (*copy);