From 0fdf19714613a82a184f4f6e75fb9a4f9b62f18a Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sun, 19 Jan 2014 10:05:08 +0200
Subject: Use std::unique_ptr instead of std::auto_ptr in C++11 mode

---
 libxsd/xsd/cxx/parser/xerces/elements.hxx |  6 ++++--
 libxsd/xsd/cxx/parser/xerces/elements.txx | 16 ++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'libxsd/xsd/cxx/parser/xerces')

diff --git a/libxsd/xsd/cxx/parser/xerces/elements.hxx b/libxsd/xsd/cxx/parser/xerces/elements.hxx
index 5fe3688..35920a4 100644
--- a/libxsd/xsd/cxx/parser/xerces/elements.hxx
+++ b/libxsd/xsd/cxx/parser/xerces/elements.hxx
@@ -6,7 +6,7 @@
 #ifndef XSD_CXX_PARSER_XERCES_ELEMENTS_HXX
 #define XSD_CXX_PARSER_XERCES_ELEMENTS_HXX
 
-#include <memory>  // std::auto_ptr
+#include <memory>  // std::auto_ptr/unique_ptr
 #include <string>
 #include <iosfwd>
 #include <vector>
@@ -18,6 +18,8 @@
 
 #include <xercesc/util/XercesVersion.hpp>
 
+#include <xsd/cxx/config.hxx> // XSD_AUTO_PTR
+
 #include <xsd/cxx/xml/elements.hxx>
 #include <xsd/cxx/xml/error-handler.hxx>
 
@@ -377,7 +379,7 @@ namespace xsd
                  const properties<C>&);
 
         private:
-          std::auto_ptr<xercesc::SAX2XMLReader>
+          XSD_AUTO_PTR<xercesc::SAX2XMLReader>
           create_sax_ (flags, const properties<C>&);
 
         private:
diff --git a/libxsd/xsd/cxx/parser/xerces/elements.txx b/libxsd/xsd/cxx/parser/xerces/elements.txx
index 60b6c6d..2324b0c 100644
--- a/libxsd/xsd/cxx/parser/xerces/elements.txx
+++ b/libxsd/xsd/cxx/parser/xerces/elements.txx
@@ -95,7 +95,7 @@ namespace xsd
 
           error_handler<C> eh;
           xml::sax::bits::error_handler_proxy<C> eh_proxy (eh);
-          std::auto_ptr<xercesc::SAX2XMLReader> sax (create_sax_ (f, p));
+          XSD_AUTO_PTR<xercesc::SAX2XMLReader> sax (create_sax_ (f, p));
 
           parse (uri, eh_proxy, *sax, f, p);
 
@@ -124,7 +124,7 @@ namespace xsd
           xml::auto_initializer init ((f & flags::dont_initialize) == 0);
 
           xml::sax::bits::error_handler_proxy<C> eh_proxy (eh);
-          std::auto_ptr<xercesc::SAX2XMLReader> sax (create_sax_ (f, p));
+          XSD_AUTO_PTR<xercesc::SAX2XMLReader> sax (create_sax_ (f, p));
 
           parse (uri, eh_proxy, *sax, f, p);
 
@@ -153,7 +153,7 @@ namespace xsd
                const properties<C>& p)
         {
           xml::sax::bits::error_handler_proxy<C> eh_proxy (eh);
-          std::auto_ptr<xercesc::SAX2XMLReader> sax (create_sax_ (f, p));
+          XSD_AUTO_PTR<xercesc::SAX2XMLReader> sax (create_sax_ (f, p));
 
           parse (uri, eh_proxy, *sax, f, p);
 
@@ -390,7 +390,7 @@ namespace xsd
         {
           error_handler<C> eh;
           xml::sax::bits::error_handler_proxy<C> eh_proxy (eh);
-          std::auto_ptr<xercesc::SAX2XMLReader> sax (create_sax_ (f, p));
+          XSD_AUTO_PTR<xercesc::SAX2XMLReader> sax (create_sax_ (f, p));
 
           parse (is, eh_proxy, *sax, f, p);
 
@@ -405,7 +405,7 @@ namespace xsd
                const properties<C>& p)
         {
           xml::sax::bits::error_handler_proxy<C> eh_proxy (eh);
-          std::auto_ptr<xercesc::SAX2XMLReader> sax (create_sax_ (f, p));
+          XSD_AUTO_PTR<xercesc::SAX2XMLReader> sax (create_sax_ (f, p));
 
           parse (is, eh_proxy, *sax, f, p);
 
@@ -421,7 +421,7 @@ namespace xsd
                const properties<C>& p)
         {
           xml::sax::bits::error_handler_proxy<C> eh_proxy (eh);
-          std::auto_ptr<xercesc::SAX2XMLReader> sax (create_sax_ (f, p));
+          XSD_AUTO_PTR<xercesc::SAX2XMLReader> sax (create_sax_ (f, p));
 
           parse (is, eh_proxy, *sax, f, p);
 
@@ -569,12 +569,12 @@ namespace xsd
 
 
         template <typename C>
-        std::auto_ptr<xercesc::SAX2XMLReader> document<C>::
+        XSD_AUTO_PTR<xercesc::SAX2XMLReader> document<C>::
         create_sax_ (flags f, const properties<C>& p)
         {
           using namespace xercesc;
 
-          std::auto_ptr<SAX2XMLReader> sax (
+          XSD_AUTO_PTR<SAX2XMLReader> sax (
             XMLReaderFactory::createXMLReader ());
 
           sax->setFeature (XMLUni::fgSAX2CoreNameSpaces, true);
-- 
cgit v1.1