Implement de-registering polymorphic type information

This is required for DLL/shared library unloading.

1 files changed, 16 insertions, 0 deletions

diff --git a/libxsd/xsd/cxx/tree/stream-extraction-map.txx b/libxsd/xsd/cxx/tree/stream-extraction-map.txx
index 5534da6..ca0a44e 100644
--- a/libxsd/xsd/cxx/tree/stream-extraction-map.txx
+++ b/libxsd/xsd/cxx/tree/stream-extraction-map.txx
@@ -226,6 +226,13 @@ namespace xsd
       }
 
       template <typename S, typename C>
+      void stream_extraction_map<S, C>::
+      unregister_type (const qualified_name& name)
+      {
+        type_map_.erase (name);
+      }
+
+      template <typename S, typename C>
       std::auto_ptr<type> stream_extraction_map<S, C>::
       extract (istream<S>& s, flags f, container* c)
       {
@@ -285,10 +292,19 @@ namespace xsd
       template<unsigned long id, typename S, typename C, typename T>
       stream_extraction_initializer<id, S, C, T>::
       stream_extraction_initializer (const C* name, const C* ns)
+          : name_ (name), ns_ (ns)
       {
         stream_extraction_map_instance<id, S, C> ().register_type (
           xml::qualified_name<C> (name, ns), &extractor_impl<S, T>);
       }
+
+      template<unsigned long id, typename S, typename C, typename T>
+      stream_extraction_initializer<id, S, C, T>::
+      ~stream_extraction_initializer ()
+      {
+        stream_extraction_map_instance<id, S, C> ().unregister_type (
+          xml::qualified_name<C> (name_, ns_));
+      }
     }
   }
 }