diff options
Diffstat (limited to 'xsd/libxsd/xsd/cxx/tree/stream-extraction-map.hxx')
| -rw-r--r-- | xsd/libxsd/xsd/cxx/tree/stream-extraction-map.hxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/xsd/libxsd/xsd/cxx/tree/stream-extraction-map.hxx b/xsd/libxsd/xsd/cxx/tree/stream-extraction-map.hxx index dd4c79a..f57c435 100644 --- a/xsd/libxsd/xsd/cxx/tree/stream-extraction-map.hxx +++ b/xsd/libxsd/xsd/cxx/tree/stream-extraction-map.hxx @@ -1,15 +1,16 @@ // file : xsd/cxx/tree/stream-extraction-map.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_STREAM_EXTRACTION_MAP_HXX #define XSD_CXX_TREE_STREAM_EXTRACTION_MAP_HXX #include <map> -#include <memory> // std::auto_ptr +#include <memory> // std::auto_ptr/unique_ptr #include <cstddef> // std::size_t +#include <xsd/cxx/config.hxx> // XSD_AUTO_PTR + #include <xsd/cxx/tree/elements.hxx> #include <xsd/cxx/tree/istream.hxx> #include <xsd/cxx/xml/qualified-name.hxx> @@ -24,7 +25,7 @@ namespace xsd struct stream_extraction_map { typedef xml::qualified_name<C> qualified_name; - typedef std::auto_ptr<type> (*extractor) ( + typedef XSD_AUTO_PTR<type> (*extractor) ( istream<S>&, flags, container*); public: @@ -33,12 +34,12 @@ namespace xsd void register_type (const qualified_name& name, extractor, - bool override = true); + bool replace = true); void unregister_type (const qualified_name& name); - std::auto_ptr<type> + XSD_AUTO_PTR<type> extract (istream<S>&, flags, container*); public: @@ -82,7 +83,7 @@ namespace xsd // // template<typename S, typename T> - std::auto_ptr<type> + XSD_AUTO_PTR<type> extractor_impl (istream<S>&, flags, container*); |