1 files changed, 23 insertions, 23 deletions

diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.h b/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.h
index 723e6729f33..bc0d332b94d 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.h
@@ -1,8 +1,8 @@
 /* -*- c++ -*- */
 // $Id$
 
-#ifndef JAWS_CACHE_MANAGER_H
-#define JAWS_CACHE_MANAGER_H
+#ifndef ACE_CACHE_MANAGER_H
+#define ACE_CACHE_MANAGER_H
 
 #include "ace/OS.h"
 #include "ace/ACE.h"
@@ -10,38 +10,38 @@
 
 #include "JAWS/Cache_Manager_T.h"
 
-class JAWS_String_Hash_Functor
+class ACE_String_Hash_Functor
 {
 public:
-  JAWS_String_Hash_Functor (const char *s);
+  ACE_String_Hash_Functor (const char *s);
   operator unsigned long (void) const;
 
 private:
   unsigned long i_;
 };
 
-class JAWS_String_Equal_Functor
+class ACE_String_Equal_Functor
 {
 public:
-  JAWS_String_Equal_Functor (const char *s1, const char *s2);
+  ACE_String_Equal_Functor (const char *s1, const char *s2);
   operator int (void) const;
 
 private:
   int i_;
 };
 
-class JAWS_Strdup_String
+class ACE_Strdup_String
 {
 public:
 
-  JAWS_Strdup_String (void);
-  JAWS_Strdup_String (const char *s);
-  JAWS_Strdup_String (const JAWS_Strdup_String &s);
-  ~JAWS_Strdup_String (void);
+  ACE_Strdup_String (void);
+  ACE_Strdup_String (const char *s);
+  ACE_Strdup_String (const ACE_Strdup_String &s);
+  ~ACE_Strdup_String (void);
 
   operator const char * (void) const;
   void operator = (const char *s);
-  void operator = (const JAWS_Strdup_String &s);
+  void operator = (const ACE_Strdup_String &s);
 
 private:
 
@@ -50,17 +50,17 @@ private:
 
 };
 
-typedef JAWS_Cache_Manager<JAWS_Strdup_String,
-                          JAWS_Referenced_Cache_Object_Factory,
-                          JAWS_String_Hash_Functor,
-                          JAWS_String_Equal_Functor>
-        JAWS_String_Referenced_Cache_Manager;
+typedef ACE_Cache_Manager<ACE_Strdup_String,
+                          ACE_Referenced_Cache_Object_Factory,
+                          ACE_String_Hash_Functor,
+                          ACE_String_Equal_Functor>
+        ACE_String_Referenced_Cache_Manager;
 
-typedef JAWS_Cache_Manager<JAWS_Strdup_String,
-                          JAWS_Counted_Cache_Object_Factory,
-                          JAWS_String_Hash_Functor,
-                          JAWS_String_Equal_Functor>
-        JAWS_String_Counted_Cache_Manager;
+typedef ACE_Cache_Manager<ACE_Strdup_String,
+                          ACE_Counted_Cache_Object_Factory,
+                          ACE_String_Hash_Functor,
+                          ACE_String_Equal_Functor>
+        ACE_String_Counted_Cache_Manager;
 
 
-#endif /* JAWS_CACHE_MANAGER_H */
+#endif /* ACE_CACHE_MANAGER_H */