ChangeLogTag:Wed Apr 10 10:40:36 2002 Ossama Othman <ossama@uci.edu>

1 files changed, 11 insertions, 10 deletions

diff --git a/ace/Hashable.h b/ace/Hashable.h
index ff12aed4ec6..8e6fb2d00c1 100644
--- a/ace/Hashable.h
+++ b/ace/Hashable.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -9,21 +9,19 @@
  *  @author Doug Schmidt
  */
 //=============================================================================
+
 #ifndef ACE_HASHABLE_H
 #define ACE_HASHABLE_H
-#include "ace/pre.h"
 
-// @@todo: Hate to do this. Looks like we have less luck here as
-// compilers complain for type u_long unknowns
-#include "ace/OS.h"
+#include "ace/pre.h"
 
+#include "ace/ACE_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
-
 /**
  * @class ACE_Recyclable
  *
@@ -31,7 +29,6 @@
  *
  *
  */
-
 class ACE_Export ACE_Hashable
 {
 public:
@@ -41,7 +38,7 @@ public:
 
   /// Computes and returns hash value.  This "caches" the hash value to
   /// improve performance.
-  virtual u_long hash (void) const;
+  virtual unsigned long hash (void) const;
 
 protected:
   /// Protected constructor.
@@ -49,10 +46,13 @@ protected:
 
   /// This is the method that actually performs the non-cached hash
   /// computation.
-  virtual u_long hash_i (void) const = 0;
+  virtual unsigned long hash_i (void) const = 0;
+
+protected:
 
   /// Pre-computed hash-value.
-  u_long hash_value_;
+  unsigned long hash_value_;
+
 };
 
 
@@ -61,4 +61,5 @@ protected:
 #endif /* __ACE_INLINE __ */
 
 #include "ace/post.h"
+
 #endif /*ACE_HASHABLE_H*/