--- stlport/wntmsci8.pro/inc/stlport/stl/_hash_map.h	2004-06-30 12:38:28.374500000 -0400
+++ solver/680/wntmsci8.pro/inc/stl/stl/_hash_map.h	2004-07-01 13:54:54.627250000 -0400
@@ -39,10 +39,9 @@
 # define  hash_map      __WORKAROUND_RENAME(hash_map)
 # define  hash_multimap __WORKAROUND_RENAME(hash_multimap)
 
-#  define _STLP_KEY_PAIR pair< const _Key, _Tp >
-#  define _STLP_HASHTABLE hashtable \
-      < pair < const _Key, _Tp >, _Key, _HashFcn, \
-      _STLP_SELECT1ST( _STLP_KEY_PAIR,  _Key ), _EqualKey, _Alloc >
+#  define _STLP_KEY_PAIR _STLP_STD::pair< const _Key, _Tp >
+#  define _STLP_HASHTABLE _STLP_STD::hashtable< _STLP_STD::pair < const _Key, _Tp >, _Key, _HashFcn, \
+												_STLP_STD::_STLP_SELECT1ST( _STLP_KEY_PAIR,  _Key ), _EqualKey, _Alloc >
 
 template <class _Key, class _Tp, __DFL_TMPL_PARAM(_HashFcn,hash<_Key>),
           __DFL_TMPL_PARAM(_EqualKey,equal_to<_Key>),
@@ -50,6 +49,9 @@
 class hash_map
 {
 private:
+#ifndef _STLP_HASHTABLE
+#error _STLP_HASHTABLE
+#endif
   typedef _STLP_HASHTABLE _Ht;
   typedef hash_map<_Key, _Tp, _HashFcn, _EqualKey, _Alloc> _Self;
 public:
@@ -162,7 +164,7 @@
   const_iterator end() const { return _M_ht.end(); }
 
 public:
-  pair<iterator,bool> insert(const value_type& __obj)
+  _STLP_STD::pair<iterator,bool> insert(const value_type& __obj)
     { return _M_ht.insert_unique(__obj); }
 #ifdef _STLP_MEMBER_TEMPLATES
   template <class _InputIterator>
@@ -175,7 +177,7 @@
   void insert(const_iterator __f, const_iterator __l)
     { _M_ht.insert_unique(__f, __l); }
 #endif /*_STLP_MEMBER_TEMPLATES */
-  pair<iterator,bool> insert_noresize(const value_type& __obj)
+  _STLP_STD::pair<iterator,bool> insert_noresize(const value_type& __obj)
     { return _M_ht.insert_unique_noresize(__obj); }    
 
   iterator find(const key_type& __key) { return _M_ht.find(__key); }
@@ -190,9 +192,9 @@
 
   size_type count(const key_type& __key) const { return _M_ht.count(__key); }
   
-  pair<iterator, iterator> equal_range(const key_type& __key)
+  _STLP_STD::pair<iterator, iterator> equal_range(const key_type& __key)
     { return _M_ht.equal_range(__key); }
-  pair<const_iterator, const_iterator>
+  _STLP_STD::pair<const_iterator, const_iterator>
   equal_range(const key_type& __key) const
     { return _M_ht.equal_range(__key); }
 
--- stlport/wntmsci8.pro/inc/stlport/stl/_hash_set.h	2004-06-30 12:38:28.374500000 -0400
+++ solver/680/wntmsci8.pro/inc/stl/stl/_hash_set.h	2004-07-01 14:05:02.924125000 -0400
@@ -45,7 +45,7 @@
 class hash_set
 {
 private:
-  typedef hashtable<_Value, _Value, _HashFcn, _Identity<_Value>, 
+  typedef _STLP_STD::hashtable<_Value, _Value, _HashFcn, _STLP_STD::_Identity<_Value>, 
                     _EqualKey, _Alloc> _Ht;
   typedef hash_set<_Value, _HashFcn, _EqualKey, _Alloc> _Self;
   typedef typename _Ht::iterator _ht_iterator;
@@ -158,10 +158,10 @@
   iterator end() const { return _M_ht.end(); }
 
 public:
-  pair<iterator, bool> insert(const value_type& __obj)
+_STLP_STD::pair<iterator, bool> insert(const value_type& __obj)
     {
-      pair<_ht_iterator, bool> __p = _M_ht.insert_unique(__obj);
-      return pair<iterator,bool>(__REINTERPRET_CAST(const iterator&, __p.first), __p.second);
+	  _STLP_STD::pair<_ht_iterator, bool> __p = _M_ht.insert_unique(__obj);
+      return _STLP_STD::pair<iterator,bool>(__REINTERPRET_CAST(const iterator&, __p.first), __p.second);
     }
 #ifdef _STLP_MEMBER_TEMPLATES
   template <class _InputIterator>
@@ -175,7 +175,7 @@
     {_M_ht.insert_unique(__f, __l); }
 
 #endif /*_STLP_MEMBER_TEMPLATES */
-  pair<iterator, bool> insert_noresize(const value_type& __obj)
+_STLP_STD::pair<iterator, bool> insert_noresize(const value_type& __obj)
   {
     pair<_ht_iterator, bool> __p = 
       _M_ht.insert_unique_noresize(__obj);
@@ -190,7 +190,7 @@
 # endif
   size_type count(const key_type& __key) const { return _M_ht.count(__key); }
   
-  pair<iterator, iterator> equal_range(const key_type& __key) const
+_STLP_STD::pair<iterator, iterator> equal_range(const key_type& __key) const
     { return _M_ht.equal_range(__key); }
 
   size_type erase(const key_type& __key) {return _M_ht.erase(__key); }