1 files changed, 37 insertions, 36 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
index e59fa4a10ab..bd076791149 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
@@ -15,9 +15,6 @@
 
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Null_Mutex.h"
-#include "ace/Functor.h"
-#include "ace/ACE.h"
-#include "ace/OS_NS_string.h"
 
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/CORBA_String.h"
@@ -27,49 +24,53 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-template<>
-class TAO_Trading_Serv_Export ACE_Hash<CORBA::String_var>
-{
-public:
-  unsigned long operator () (const CORBA::String_var& string) const
-  {
-    unsigned long ret = ACE::hash_pjw (string.in ());
-    return ret;
-  }
-};
+// =  Classes to deal with the ACE_Hash_Map_Manager.
 
-template<>
-class TAO_Trading_Serv_Export ACE_Less_Than<CORBA::String_var>
+/**
+ * Key for the Hash Table. The EXT_ID of the
+ * ACE_Hash_Map_Manager.
+ */
+class TAO_Trading_Serv_Export TAO_String_Hash_Key : public CORBA::String_var
 {
 public:
-  int operator () (const CORBA::String_var &lhs,
-                   const CORBA::String_var &rhs) const
-  {
-    return ACE_OS::strcmp (lhs.in (), rhs.in ()) < 0;
-  }
-};
+  // = Initialization and termination methods.
+  TAO_String_Hash_Key (void);
+  // Default constructor.
 
-template<>
-class TAO_Trading_Serv_Export ACE_Equal_To<CORBA::String_var>
-{
-public:
-  int operator () (const CORBA::String_var &lhs,
-                   const CORBA::String_var &rhs) const
-  {
-    return ACE_OS::strcmp (lhs.in (), rhs.in ()) == 0;
-  }
+  TAO_String_Hash_Key (char * name);
+  // Constructor from a const string.
+
+  TAO_String_Hash_Key (const char * name);
+  // Constructor from a const string.
+
+  TAO_String_Hash_Key (const CORBA::String_var &hash_key);
+  // Copy constructor.
+
+  bool operator == (const TAO_String_Hash_Key &hash_key) const;
+  // The operator for hash binding and "find"ing.
+
+  friend bool operator < (const TAO_String_Hash_Key &left,
+                          const TAO_String_Hash_Key &right);
+  // The operator for hash binding and "find"ing.
+
+  u_long hash (void) const;
+  // The function that computes a hash value.
 };
 
-typedef ACE_Hash_Map_Manager_Ex<CORBA::String_var,
+#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
+  template class TAO_Trading_Serv_Export TAO::String_var <char>;
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
+
+typedef ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key,
                                 int,
-                                ACE_Hash<CORBA::String_var>,
-                                ACE_Equal_To<CORBA::String_var>,
+                                ACE_Hash<TAO_String_Hash_Key>,
+                                ACE_Equal_To<TAO_String_Hash_Key>,
                                 ACE_Null_Mutex>
   TAO_Lookup_Table;
-typedef ACE_Hash_Map_Manager_Ex<CORBA::String_var,
+typedef ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key,
                                 CORBA::TypeCode_ptr,
-                                ACE_Hash<CORBA::String_var>,
-                                ACE_Equal_To<CORBA::String_var>,
+                                ACE_Hash<TAO_String_Hash_Key>,
+                                ACE_Equal_To<TAO_String_Hash_Key>,
                                 ACE_Null_Mutex>
   TAO_Typecode_Table;