ChangeLogTag:Fri Aug 1 17:23:32 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

7 files changed, 23 insertions, 25 deletions

diff --git a/ace/Cache_Map_Manager_T.cpp b/ace/Cache_Map_Manager_T.cpp
index f35de6a168d..d1ffb8108f1 100644
--- a/ace/Cache_Map_Manager_T.cpp
+++ b/ace/Cache_Map_Manager_T.cpp
@@ -9,7 +9,7 @@
 #define ACE_LACKS_PRAGMA_ONCE
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Malloc.h"
+#include "ace/Malloc_Base.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Cache_Map_Manager_T.i"
diff --git a/ace/Functor.i b/ace/Functor.i
index 559bc630570..25dedd00d6b 100644
--- a/ace/Functor.i
+++ b/ace/Functor.i
@@ -30,7 +30,7 @@
 // ============================================================================
 
 #include "ace/ACE.h"
-#include "ace/OS.h"
+#include "ace/OS_String.h"
 
 //////////////////////////////////////////////////////////////
 // GOF Command Pattern Classes and Template Specializations //
@@ -137,14 +137,14 @@ ACE_Hash<void *>::operator () (const void *t) const
 ACE_INLINE int
 ACE_Equal_To<const ACE_TCHAR *>::operator () (const ACE_TCHAR *lhs, const ACE_TCHAR *rhs) const
 {
-  return !ACE_OS::strcmp (lhs, rhs);
+  return !ACE_OS_String::strcmp (lhs, rhs);
 }
 
 //ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE int
 ACE_Equal_To<ACE_TCHAR *>::operator () (const ACE_TCHAR *lhs, const ACE_TCHAR *rhs) const
 {
-  return !ACE_OS::strcmp (lhs, rhs);
+  return !ACE_OS_String::strcmp (lhs, rhs);
 }
 
 ACE_INLINE int
@@ -186,14 +186,14 @@ ACE_Equal_To<ACE_UINT64>::operator () (const ACE_UINT64 lhs, const ACE_UINT64 rh
 ACE_INLINE int
 ACE_Less_Than<const ACE_TCHAR *>::operator () (const ACE_TCHAR *lhs, const ACE_TCHAR *rhs) const
 {
-  return (ACE_OS::strcmp (lhs, rhs) < 0) ? 1 : 0;
+  return (ACE_OS_String::strcmp (lhs, rhs) < 0) ? 1 : 0;
 }
 
 //ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE int
 ACE_Less_Than<ACE_TCHAR *>::operator () (const ACE_TCHAR *lhs, const ACE_TCHAR *rhs) const
 {
-  return (ACE_OS::strcmp (lhs, rhs) < 0) ? 1 : 0;
+  return (ACE_OS_String::strcmp (lhs, rhs) < 0) ? 1 : 0;
 }
 
 
@@ -217,28 +217,28 @@ ACE_Hash<ACE_ANTI_TCHAR *>::operator () (const ACE_ANTI_TCHAR *t) const
 ACE_INLINE int
 ACE_Equal_To<const ACE_ANTI_TCHAR *>::operator () (const ACE_ANTI_TCHAR *lhs, const ACE_ANTI_TCHAR *rhs) const
 {
-  return !ACE_OS::strcmp (lhs, rhs);
+  return !ACE_OS_String::strcmp (lhs, rhs);
 }
 
 //ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE int
 ACE_Equal_To<ACE_ANTI_TCHAR *>::operator () (const ACE_ANTI_TCHAR *lhs, const ACE_ANTI_TCHAR *rhs) const
 {
-  return !ACE_OS::strcmp (lhs, rhs);
+  return !ACE_OS_String::strcmp (lhs, rhs);
 }
 
 //ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE int
 ACE_Less_Than<const ACE_ANTI_TCHAR *>::operator () (const ACE_ANTI_TCHAR *lhs, const ACE_ANTI_TCHAR *rhs) const
 {
-  return (ACE_OS::strcmp (lhs, rhs) < 0) ? 1 : 0;
+  return (ACE_OS_String::strcmp (lhs, rhs) < 0) ? 1 : 0;
 }
 
 //ACE_TEMPLATE_METHOD_SPECIALIZATION
 ACE_INLINE int
 ACE_Less_Than<ACE_ANTI_TCHAR *>::operator () (const ACE_ANTI_TCHAR *lhs, const ACE_ANTI_TCHAR *rhs) const
 {
-  return (ACE_OS::strcmp (lhs, rhs) < 0) ? 1 : 0;
+  return (ACE_OS_String::strcmp (lhs, rhs) < 0) ? 1 : 0;
 }
 
 #endif  // ACE_USES_WCHAR
diff --git a/ace/Hash_Map_Manager_T.cpp b/ace/Hash_Map_Manager_T.cpp
index a666c5c4f16..df38488f3e9 100644
--- a/ace/Hash_Map_Manager_T.cpp
+++ b/ace/Hash_Map_Manager_T.cpp
@@ -36,9 +36,7 @@
 # define ACE_INLINE inline
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Synch.h"
-#include "ace/Service_Config.h"
-#include "ace/Malloc.h"
+#include "ace/Malloc_Base.h"
 
 ACE_RCSID(ace, Hash_Map_Manager_T, "$Id$")
 
diff --git a/ace/Map_Manager.cpp b/ace/Map_Manager.cpp
index 8dea3399ede..7a1282de834 100644
--- a/ace/Map_Manager.cpp
+++ b/ace/Map_Manager.cpp
@@ -3,14 +3,13 @@
 #ifndef ACE_MAP_MANAGER_C
 #define ACE_MAP_MANAGER_C
 
-#include "ace/Malloc.h"
+#include "ace/Map_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Service_Config.h"
-#include "ace/Map_Manager.h"
+#include "ace/Malloc_Base.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Map_Manager.i"
diff --git a/ace/POSIX_Asynch_IO.h b/ace/POSIX_Asynch_IO.h
index e54a4a2de57..ec5775b43cc 100644
--- a/ace/POSIX_Asynch_IO.h
+++ b/ace/POSIX_Asynch_IO.h
@@ -33,8 +33,8 @@
 #include "ace/Asynch_IO_Impl.h"
 #include "ace/Unbounded_Queue.h"
 #include "ace/Map_Manager.h"
-#if defined(INTEGRITY)
 #include "ace/Event_Handler.h"
+#if defined(INTEGRITY)
 #include "ace/ACE.h"
 #endif
 
diff --git a/ace/RB_Tree.i b/ace/RB_Tree.i
index 90cd0b35019..31a3222dfbe 100644
--- a/ace/RB_Tree.i
+++ b/ace/RB_Tree.i
@@ -2,7 +2,7 @@
 // $Id$
 
 #include "ace/Synch.h"
-#include "ace/Malloc.h"
+#include "ace/Malloc_Base.h"
 
 /////////////////////////////////////////////////////
 // template class ACE_RB_Tree_Node<EXT_ID, INT_ID> //
diff --git a/ace/String_Base.cpp b/ace/String_Base.cpp
index 22055b4756a..e695b941e45 100644
--- a/ace/String_Base.cpp
+++ b/ace/String_Base.cpp
@@ -2,9 +2,10 @@
 #define ACE_STRING_BASE_CPP
 
 #include "ace/ACE.h"
-#include "ace/Malloc.h"
+#include "ace/Malloc_Base.h"
 #include "ace/String_Base.h"
 #include "ace/Auto_Ptr.h"
+#include "ace/OS_String.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/String_Base.i"
@@ -42,7 +43,7 @@ ACE_String_Base<CHAR>::set (const CHAR *s,
       this->buf_len_ = new_buf_len;
       this->release_ = 1;
       this->len_ = len;
-      ACE_OS::memcpy (this->rep_, s, len * sizeof (CHAR));
+      ACE_OS_String::memcpy (this->rep_, s, len * sizeof (CHAR));
       // NUL terminate.
       this->rep_[len] = '\0';
     }
@@ -76,7 +77,7 @@ ACE_String_Base<CHAR>::set (const CHAR *s,
         }
       else
         {
-          ACE_OS::memcpy (this->rep_, s, len * sizeof (CHAR));
+          ACE_OS_String::memcpy (this->rep_, s, len * sizeof (CHAR));
           // NUL terminate.
           this->rep_[len] = 0;
           this->len_ = len;
@@ -125,7 +126,7 @@ ACE_String_Base<CHAR>::operator+= (const ACE_String_Base<CHAR> &s)
       // case 1. No memory allocation needed.
       if (this->buf_len_ >= new_buf_len)
         // Copy in data from new string.
-        ACE_OS::memcpy (this->rep_ + this->len_,
+        ACE_OS_String::memcpy (this->rep_ + this->len_,
                         s.rep_,
                         s.len_ * sizeof (CHAR));
       // case 2. Memory reallocation is needed
@@ -139,11 +140,11 @@ ACE_String_Base<CHAR>::operator+= (const ACE_String_Base<CHAR> &s)
                                 *this);
 
           // Copy memory from old string into new string.
-          ACE_OS::memcpy (t,
+          ACE_OS_String::memcpy (t,
                           this->rep_,
                           this->len_ * sizeof (CHAR));
 
-          ACE_OS::memcpy (t + this->len_,
+          ACE_OS_String::memcpy (t + this->len_,
                           s.rep_,
                           s.len_ * sizeof (CHAR));
 
@@ -188,7 +189,7 @@ ACE_String_Base<CHAR>::resize (size_t len, CHAR c)
     }
 
   this->len_ = 0;
-  ACE_OS::memset (this->rep_,
+  ACE_OS_String::memset (this->rep_,
                   c,
                   this->buf_len_ * sizeof (CHAR));
 }