ChangeLogTag:Fri Jan 28 20:30:02 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

15 files changed, 34 insertions, 71 deletions

diff --git a/ace/Configuration.cpp b/ace/Configuration.cpp
index fd8840bc9eb..5f71e30aa24 100644
--- a/ace/Configuration.cpp
+++ b/ace/Configuration.cpp
@@ -1,6 +1,7 @@
 // $Id$
 #include "ace/Configuration.h"
 #include "ace/Auto_Ptr.h"
+#include "ace/SString.h"
 #include "ace/OS_NS_string.h"
 
 // Can remove this when import_config and export_config are removed from
diff --git a/ace/Configuration.h b/ace/Configuration.h
index eac6923eb70..f025731a610 100644
--- a/ace/Configuration.h
+++ b/ace/Configuration.h
@@ -31,11 +31,12 @@
 #define ACE_CONFIGURATION_H
 #include /**/ "ace/pre.h"
 
-#include "ace/SString.h"
+#include "ace/SStringfwd.h"
 #include "ace/Hash_Map_With_Allocator_T.h"
 #include "ace/Malloc.h"
 #include "ace/Synch_Traits.h"
 
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
diff --git a/ace/Filecache.cpp b/ace/Filecache.cpp
index a3aabc700c3..68c3c1d461b 100644
--- a/ace/Filecache.cpp
+++ b/ace/Filecache.cpp
@@ -10,7 +10,9 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_fcntl.h"
 
-ACE_RCSID(ace, Filecache, "$Id$")
+ACE_RCSID (ace,
+           Filecache,
+           "$Id$")
 
 #if defined (ACE_WIN32)
 // Specifies no sharing flags.
@@ -139,26 +141,26 @@ ACE_Filecache_Handle::size (void) const
 // ACE_Filecache_Hash
 // ------------------
 
-#if defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-
 #define ACE_Filecache_Hash \
         ACE_Hash_Map_Manager_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
 #define ACE_Filecache_Hash_Entry \
         ACE_Hash_Map_Entry<const ACE_TCHAR *, ACE_Filecache_Object *>
 
-ACE_TEMPLATE_SPECIALIZATION
-ACE_Filecache_Hash_Entry::ACE_Hash_Map_Entry (const ACE_TCHAR *const &ext_id,
-                                              ACE_Filecache_Object *const &int_id,
-                                              ACE_Filecache_Hash_Entry *next,
-                                              ACE_Filecache_Hash_Entry *prev)
-  : ext_id_ (ext_id ? ACE_OS::strdup (ext_id) : ACE_OS::strdup (ACE_LIB_TEXT (""))),
+
+ACE_Filecache_Hash_Entry::ACE_Hash_Map_Entry (
+  const ACE_TCHAR *const &ext_id,
+  ACE_Filecache_Object *const &int_id,
+  ACE_Filecache_Hash_Entry *next,
+  ACE_Filecache_Hash_Entry *prev)
+  : ext_id_ (ext_id
+             ? ACE_OS::strdup (ext_id)
+             : ACE_OS::strdup (ACE_LIB_TEXT (""))),
     int_id_ (int_id),
     next_ (next),
     prev_ (prev)
 {
 }
 
-ACE_TEMPLATE_SPECIALIZATION
 ACE_Filecache_Hash_Entry::ACE_Hash_Map_Entry (ACE_Filecache_Hash_Entry *next,
                                               ACE_Filecache_Hash_Entry *prev)
   : ext_id_ (0),
@@ -167,7 +169,6 @@ ACE_Filecache_Hash_Entry::ACE_Hash_Map_Entry (ACE_Filecache_Hash_Entry *next,
 {
 }
 
-ACE_TEMPLATE_SPECIALIZATION
 ACE_Filecache_Hash_Entry::~ACE_Hash_Map_Entry (void)
 {
   ACE_OS::free ((void *) ext_id_);
@@ -176,16 +177,15 @@ ACE_Filecache_Hash_Entry::~ACE_Hash_Map_Entry (void)
 // We need these template specializations since KEY is defined as a
 // ACE_TCHAR*, which doesn't have a hash() or equal() method defined on it.
 
-ACE_TEMPLATE_SPECIALIZATION
 unsigned long
 ACE_Filecache_Hash::hash (const ACE_TCHAR *const &ext_id)
 {
   return ACE::hash_pjw (ext_id);
 }
 
-ACE_TEMPLATE_SPECIALIZATION
 int
-ACE_Filecache_Hash::equal (const ACE_TCHAR *const &id1, const ACE_TCHAR *const &id2)
+ACE_Filecache_Hash::equal (const ACE_TCHAR *const &id1,
+                           const ACE_TCHAR *const &id2)
 {
   return ACE_OS::strcmp (id1, id2) == 0;
 }
@@ -193,8 +193,6 @@ ACE_Filecache_Hash::equal (const ACE_TCHAR *const &id1, const ACE_TCHAR *const &
 #undef ACE_Filecache_Hash
 #undef ACE_Filecache_Hash_Entry
 
-#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */
-
 
 // -------------
 // ACE_Filecache
@@ -745,31 +743,15 @@ ACE_Filecache_Object::update (void) const
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#if defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
 template class ACE_Hash_Map_Entry<const ACE_TCHAR *, ACE_Filecache_Object *>;
 template class ACE_Hash_Map_Manager_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Base_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
-#else
-template class ACE_Hash_Map_Entry<ACE_TString, ACE_Filecache_Object *>;
-template class ACE_Hash_Map_Manager_Ex<ACE_TString, ACE_Filecache_Object *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_TString, ACE_Filecache_Object *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_TString, ACE_Filecache_Object *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TString, ACE_Filecache_Object *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
-#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#if defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
 #pragma instantiate ACE_Hash_Map_Entry<const ACE_TCHAR *, ACE_Filecache_Object *>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
-#else
-#pragma instantiate ACE_Hash_Map_Entry<ACE_TString, ACE_Filecache_Object *>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_TString, ACE_Filecache_Object *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_TString, ACE_Filecache_Object *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_TString, ACE_Filecache_Object *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TString, ACE_Filecache_Object *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>
-#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ace/Filecache.h b/ace/Filecache.h
index 036468b7f14..c6986bd465d 100644
--- a/ace/Filecache.h
+++ b/ace/Filecache.h
@@ -23,7 +23,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Hash_Map_Manager_T.h"
-#include "ace/SString.h"
 #include "ace/Null_Mutex.h"
 #include "ace/Synch_Traits.h"
 #include "ace/RW_Thread_Mutex.h"
@@ -148,23 +147,11 @@ private:
   int mapit_;
 };
 
-#if defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-
 typedef ACE_Hash_Map_Manager_Ex<const ACE_TCHAR *, ACE_Filecache_Object *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
         ACE_Filecache_Hash;
 
 typedef ACE_Hash_Map_Entry<const ACE_TCHAR *, ACE_Filecache_Object *> ACE_Filecache_Hash_Entry;
 
-#else
-
-typedef ACE_Hash_Map_Manager_Ex<ACE_TString, ACE_Filecache_Object *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>
-        ACE_Filecache_Hash;
-
-typedef ACE_Filecache_Hash::ENTRY ACE_Filecache_Hash_Entry;
-
-#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */
-
-
 /**
  * @class ACE_Filecache
  *
diff --git a/ace/Local_Name_Space.cpp b/ace/Local_Name_Space.cpp
index 6cc578a7f8c..d7382c3266c 100644
--- a/ace/Local_Name_Space.cpp
+++ b/ace/Local_Name_Space.cpp
@@ -1,10 +1,7 @@
-#ifndef ACE_LOCAL_NAME_SPACE_CPP
-#define ACE_LOCAL_NAME_SPACE_CPP
-
-#include "ace/ACE.h"
 #include "ace/Local_Name_Space.h"
-#include "ace/OS_NS_string.h"
 #include "ace/RW_Process_Mutex.h"
+#include "ace/SString.h"
+#include "ace/OS_NS_string.h"
 
 ACE_RCSID (ace,
            Local_Name_Space,
@@ -215,4 +212,3 @@ template class ACE_Write_Guard<ACE_RW_Process_Mutex>;
 #pragma instantiate ACE_Write_Guard<ACE_RW_Process_Mutex>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-#endif /* ACE_LOCAL_NAME_SPACE_CPP */
diff --git a/ace/Local_Name_Space.h b/ace/Local_Name_Space.h
index 1651119e55e..e8b8b4b39ca 100644
--- a/ace/Local_Name_Space.h
+++ b/ace/Local_Name_Space.h
@@ -17,13 +17,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/SString.h"
+#include "ace/Malloc_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Malloc_T.h"
+class ACE_NS_WString;
 
 /**
  * @class ACE_NS_String
diff --git a/ace/Name_Proxy.h b/ace/Name_Proxy.h
index d4d0c5cda3a..594df3c3c2a 100644
--- a/ace/Name_Proxy.h
+++ b/ace/Name_Proxy.h
@@ -32,6 +32,7 @@
 #include "ace/Service_Config.h"
 #include "ace/Synch_Options.h"
 #include "ace/Name_Request_Reply.h"
+#include "ace/Event_Handler.h"
 
 /**
  * @class ACE_Name_Proxy
diff --git a/ace/Process.h b/ace/Process.h
index 7f1685f4ef9..8ca56b21aaf 100644
--- a/ace/Process.h
+++ b/ace/Process.h
@@ -21,8 +21,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Handle_Set.h"
-#include "ace/os_include/sys/os_types.h"
 #include "ace/Global_Macros.h"
+#include "ace/os_include/sys/os_types.h"
 
 // Forward declaration
 class ACE_Time_Value;
@@ -597,8 +597,6 @@ private:
   friend class ace_dewarn_gplusplus;
 };
 
-#include "ace/SString.h"
-
 #if defined (__ACE_INLINE__)
 #include "ace/Process.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Remote_Name_Space.cpp b/ace/Remote_Name_Space.cpp
index fea56fd5b26..55c50a275c7 100644
--- a/ace/Remote_Name_Space.cpp
+++ b/ace/Remote_Name_Space.cpp
@@ -1,6 +1,7 @@
 #include "ace/Remote_Name_Space.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
+#include "ace/SString.h"
 #include "ace/OS_NS_string.h"
 
 ACE_RCSID (ace,
diff --git a/ace/Remote_Name_Space.h b/ace/Remote_Name_Space.h
index 95c7b051770..95c0d9c4531 100644
--- a/ace/Remote_Name_Space.h
+++ b/ace/Remote_Name_Space.h
@@ -22,10 +22,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/SString.h"
 #include "ace/Name_Proxy.h"
 #include "ace/Name_Space.h"
 
+
+class ACE_NS_WString;
+
 typedef ACE_Unbounded_Set<ACE_NS_WString> ACE_WSTRING_SET;
 
 /**
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index 8e8f1278ef6..58d164b0de7 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -18,8 +18,9 @@
 #include "ace/Reactor.h"
 #include "ace/Thread_Manager.h"
 #include "ace/DLL.h"
-#include "ace/OS_NS_stdio.h"
 #include "ace/XML_Svc_Conf.h"
+#include "ace/SString.h"
+#include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_stat.h"
diff --git a/ace/Service_Config.h b/ace/Service_Config.h
index 584c457dd3f..4e6c116c2e5 100644
--- a/ace/Service_Config.h
+++ b/ace/Service_Config.h
@@ -24,8 +24,7 @@
 
 #include "ace/Unbounded_Queue.h"
 #include "ace/Unbounded_Set.h"
-#include "ace/SString.h"
-#include "ace/XML_Svc_Conf.h"
+#include "ace/SStringfwd.h"
 #include "ace/OS_NS_signal.h"
 
 // Forward decl.
@@ -41,7 +40,9 @@ class ACE_DLL;
 
 #if (ACE_USES_CLASSIC_SVC_CONF == 1)
 class ACE_Svc_Conf_Param;
-#endif /* ACE_USES_CLASSIC_SVC_CONF ==1 */
+#else
+class ACE_XML_Svc_Conf;
+#endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */
 
 extern "C"
 {
@@ -452,11 +453,6 @@ private:
 #include "ace/Service_Config.inl"
 #endif /* __ACE_INLINE__ */
 
-// These must go here to avoid circular includes...  (only left here
-// for to not break applications which rely on this - no real need any
-// longer)
-#include "ace/Reactor.h"
-#include "ace/Svc_Conf_Tokens.h"
 
 #include /**/ "ace/post.h"
 
diff --git a/ace/Svc_Handler.h b/ace/Svc_Handler.h
index 8a9173a4bb7..2fd4f15320e 100644
--- a/ace/Svc_Handler.h
+++ b/ace/Svc_Handler.h
@@ -26,8 +26,8 @@ class ACE_Connection_Recycling_Strategy;
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Task.h"
-#include "ace/Service_Config.h"
 #include "ace/Recyclable.h"
+#include "ace/Reactor.h"
 
 /**
  * @class ACE_Svc_Handler
diff --git a/ace/Time_Request_Reply.h b/ace/Time_Request_Reply.h
index 583cb94e6cc..551da8dfb82 100644
--- a/ace/Time_Request_Reply.h
+++ b/ace/Time_Request_Reply.h
@@ -23,8 +23,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/SString.h"
-
 /**
  * @class ACE_Time_Request
  *
diff --git a/ace/Token_Collection.h b/ace/Token_Collection.h
index 981095b0538..1f42c8406cf 100644
--- a/ace/Token_Collection.h
+++ b/ace/Token_Collection.h
@@ -33,7 +33,6 @@
 #if defined (ACE_HAS_TOKENS_LIBRARY)
 
 #include "ace/Local_Tokens.h"
-#include "ace/SString.h"
 #include "ace/Null_Mutex.h"
 
 /**