5 files changed, 4 insertions, 56 deletions
diff --git a/libxsd/xsd/cxx/tree/containers.hxx b/libxsd/xsd/cxx/tree/containers.hxx
index b460dd8..e6b9f88 100644
--- a/libxsd/xsd/cxx/tree/containers.hxx
+++ b/libxsd/xsd/cxx/tree/containers.hxx
@@ -252,9 +252,6 @@ namespace xsd
         bool present_;
       };
 
-
-      // Note that I cannot get rid of fund because of HP aCC3.
-      //
       template <typename T, bool fund = fundamental_p<T>::r>
       class optional;
 
@@ -527,14 +524,9 @@ namespace xsd
 
       // Sequence.
       //
-
-      // Note that I cannot get rid of 'fund' because HP aCC3 likes it
-      // this way.
-      //
       template <typename T, bool fund = fundamental_p<T>::r>
       class sequence;
 
-
       // Sun CC's <iterator> does not have iterator_traits. To overcome
       // this, we will wrap std::iterator_traits into our own and also
       // specialize it for pointer types. Since Sun CC uses pointer
diff --git a/libxsd/xsd/cxx/tree/elements.hxx b/libxsd/xsd/cxx/tree/elements.hxx
index 040284f..17ad70c 100644
--- a/libxsd/xsd/cxx/tree/elements.hxx
+++ b/libxsd/xsd/cxx/tree/elements.hxx
@@ -208,12 +208,6 @@ namespace xsd
 
       typedef user_data_keys_template<0> user_data_keys;
 
-      // HP aCC3 complains about unresolved symbols without an explicit
-      // instantiation.
-      //
-#if defined(__HP_aCC) && __HP_aCC <= 39999
-      template struct user_data_keys_template<0>;
-#endif
       //
       //
       struct identity
diff --git a/libxsd/xsd/cxx/tree/list.hxx b/libxsd/xsd/cxx/tree/list.hxx
index 0a455cf..df65de9 100644
--- a/libxsd/xsd/cxx/tree/list.hxx
+++ b/libxsd/xsd/cxx/tree/list.hxx
@@ -22,8 +22,7 @@ namespace xsd
     namespace tree
     {
       // Class template for xsd:list mapping. Based on the sequence
-      // template. Note that I cannot get rid of 'fund' because HP
-      // aCC3 likes it this way.
+      // template.
       //
       template <typename T,
                 typename C,
diff --git a/libxsd/xsd/cxx/tree/types.hxx b/libxsd/xsd/cxx/tree/types.hxx
index 5afa49d..9c5a413 100644
--- a/libxsd/xsd/cxx/tree/types.hxx
+++ b/libxsd/xsd/cxx/tree/types.hxx
@@ -2076,20 +2076,7 @@ namespace xsd
         virtual void
         _container (container*);
 
-        // The above override also hides other _container versions. We
-        // also cannot do using-declarations because of bugs in HP aCC3.
-        //
-        const container*
-        _container () const
-        {
-          return B::_container ();
-        }
-
-        container*
-        _container ()
-        {
-          return B::_container ();
-        }
+        using B::_container;
 
         //@endcond
 
diff --git a/libxsd/xsd/cxx/tree/types.txx b/libxsd/xsd/cxx/tree/types.txx
index be893af..98fcf81 100644
--- a/libxsd/xsd/cxx/tree/types.txx
+++ b/libxsd/xsd/cxx/tree/types.txx
@@ -167,11 +167,6 @@ namespace xsd
         return *this;
       }
 
-      // It would have been cleaner to mention empty and _container
-      // with the using-declaration but HP aCC3 can't handle it in
-      // some non-trivial to track down cases. So we are going to use
-      // the old-n-ugly this-> techniques.
-      //
       template <typename C, typename B>
       void id<C, B>::
       _container (container* c)
@@ -210,11 +205,6 @@ namespace xsd
         return new idref (*this, f, c);
       }
 
-      // It would have been cleaner to mention empty, _root, etc. with
-      // the using-declaration but HP aCC3 can't handle it in some
-      // non-trivial to track down cases. So we are going to use the
-      // old-n-ugly this-> techniques.
-      //
       template <typename C, typename B, typename T>
       const _type* idref<C, B, T>::
       get_ () const
@@ -320,18 +310,11 @@ namespace xsd
         return new base64_binary (*this, f, c);
       }
 
-      // It would have been cleaner to mention size, and data with the
-      // using-declaration but HP aCC3 can't handle it in some non-
-      // trivial to track down cases. So we are going to use the
-      // old-n- ugly this-> techniques.
-      //
       template <typename C, typename B>
       std::basic_string<C> base64_binary<C, B>::
       encode () const
       {
-        // HP aCC3 cannot handle using namespace xercesc;
-        //
-        using xercesc::Base64;
+        using namespace xercesc;
         std::basic_string<C> str;
 
         XMLSize_t n;
@@ -365,9 +348,7 @@ namespace xsd
       void base64_binary<C, B>::
       decode (const XMLCh* src)
       {
-        // HP aCC3 cannot handle using namespace xercesc;
-        //
-        using xercesc::Base64;
+        using namespace xercesc;
 
         xml::std_memory_manager mm;
         XMLSize_t size;
@@ -433,11 +414,6 @@ namespace xsd
         return new hex_binary (*this, f, c);
       }
 
-      // It would have been cleaner to mention size, and data with the
-      // using-declaration but HP aCC3 can't handle it in some non-
-      // trivial to track down cases. So we are going to use the
-      // old-n-ugly this-> techniques.
-      //
       template <typename C, typename B>
       std::basic_string<C> hex_binary<C, B>::
       encode () const