ChangeLogTag:Tue Apr 16 11:49:00 2002 Ossama Othman <ossama@uci.edu>

7 files changed, 91 insertions, 20 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 2f7bb386ed3..23ce482fa3b 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,6 +1,25 @@
+Tue Apr 16 11:57:28 2002  Ossama Othman  <ossama@uci.edu>
+
+	* tao/NVList.cpp:
+	* tao/Stub.cpp:
+	* tao/default_resource.cpp:
+	* tao/PortableServer/Active_Object_Map.cpp:
+	* tao/PortableServer/Object_Adapter.cpp:
+	* tao/PortableServer/POA.cpp:
+
+	  Only instantiate ACE_Auto_Basic_Ptr templates if
+	  ACE_LACKS_AUTO_PTR is defined or if ACE_HAS_STANDARD_CPP_LIBRARY
+	  is not defined.  In the above cases, they are only used as
+	  base classes for ACE's implementation of the standard auto_ptr
+	  template.  When using the auto_ptr implementation provided by
+	  the standard C++ library in use, the ACE_Auto_Basic_Ptr template
+	  instances aren't needed.  Reduces footprint in cases where the
+	  standard C++ library implementation is used, and explicit
+	  template instantation is required.
+
 Tue Apr 16 11:12:55 2002  Priyanka Gontla  <pgontla@ece.uci.edu>
 
-	* orbsvcs/tests/Miop/McastHello/Makefile (IDL_SRC): 
+	* orbsvcs/tests/Miop/McastHello/Makefile:
 	  Updated dependencies.
 
 Tue Apr 16 07:26:18 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp
index 83c376dfba2..c13000fcc4c 100644
--- a/TAO/tao/NVList.cpp
+++ b/TAO/tao/NVList.cpp
@@ -454,12 +454,20 @@ CORBA_NVList::_lazy_has_arguments (void) const
 template class ACE_Node<CORBA::NamedValue_ptr>;
 template class ACE_Unbounded_Queue<CORBA::NamedValue_ptr>;
 template class ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr>;
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
 template class ACE_Auto_Basic_Ptr<TAO_InputCDR>;
+#  endif  /* ACE_LACKS_AUTO_PTR */
 template class auto_ptr<TAO_InputCDR>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Node<CORBA::NamedValue_ptr>
 #pragma instantiate ACE_Unbounded_Queue<CORBA::NamedValue_ptr>
 #pragma instantiate ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_InputCDR>
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_InputCDR>
+#  endif  /* ACE_LACKS_AUTO_PTR */
 #pragma instantiate auto_ptr<TAO_InputCDR>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp
index 5d23647a7ae..b36669d417a 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map.cpp
@@ -952,12 +952,16 @@ template class auto_ptr<TAO_Id_Hint_Strategy>;
 template class auto_ptr<TAO_Active_Object_Map::servant_map>;
 template class auto_ptr<TAO_Active_Object_Map::user_id_map>;
 
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
 template class ACE_Auto_Basic_Ptr<TAO_Id_Uniqueness_Strategy>;
 template class ACE_Auto_Basic_Ptr<TAO_Lifespan_Strategy>;
 template class ACE_Auto_Basic_Ptr<TAO_Id_Assignment_Strategy>;
 template class ACE_Auto_Basic_Ptr<TAO_Id_Hint_Strategy>;
 template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::servant_map>;
 template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::user_id_map>;
+#  endif  /* ACE_LACKS_AUTO_PTR */
 
 // Common typedefs.
 typedef PortableServer::ObjectId id;
@@ -1055,12 +1059,16 @@ template class ACE_Map_Entry<servant, value>;
 #pragma instantiate auto_ptr<TAO_Active_Object_Map::servant_map>
 #pragma instantiate auto_ptr<TAO_Active_Object_Map::user_id_map>
 
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Uniqueness_Strategy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Lifespan_Strategy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Assignment_Strategy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Hint_Strategy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::servant_map>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::user_id_map>
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Uniqueness_Strategy>
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Lifespan_Strategy>
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Assignment_Strategy>
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Hint_Strategy>
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::servant_map>
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::user_id_map>
+#  endif  /* ACE_LACKS_AUTO_PTR */
 
 // Common typedefs.
 typedef PortableServer::ObjectId id;
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 30350647903..c31f8486bf0 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -1681,8 +1681,12 @@ typedef ACE_Noop_Key_Generator<key> noop_key_generator;
 template class auto_ptr<TAO_Object_Adapter::Hint_Strategy>;
 template class auto_ptr<TAO_Object_Adapter::transient_poa_map>;
 
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
 template class ACE_Auto_Basic_Ptr<TAO_Object_Adapter::Hint_Strategy>;
 template class ACE_Auto_Basic_Ptr<TAO_Object_Adapter::transient_poa_map>;
+#  endif  /* ACE_LACKS_AUTO_PTR */
 
 template class ACE_Noop_Key_Generator<key>;
 
@@ -1759,8 +1763,12 @@ typedef ACE_Noop_Key_Generator<key> noop_key_generator;
 #pragma instantiate auto_ptr<TAO_Object_Adapter::Hint_Strategy>
 #pragma instantiate auto_ptr<TAO_Object_Adapter::transient_poa_map>
 
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Object_Adapter::Hint_Strategy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Object_Adapter::transient_poa_map>
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Object_Adapter::Hint_Strategy>
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Object_Adapter::transient_poa_map>
+#  endif  /* ACE_LACKS_AUTO_PTR */
 
 #pragma instantiate ACE_Noop_Key_Generator<key>
 
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index d97fc094e14..da25ccd530e 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -1,7 +1,9 @@
-// @(#) $Id$
-
 #include "tao/PortableServer/POA.h"
 
+ACE_RCSID (TAO_PortableServer,
+           POA,
+           "$Id$")
+
 //
 // ImplRepo related.
 //
@@ -40,8 +42,6 @@
 # include "POA.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(tao, POA, "$Id$")
-
 // This is the TAO_Object_key-prefix that is appended to all TAO Object keys.
 // It's an array of octets representing ^t^a^o/0 in octal.
 CORBA::Octet
@@ -4139,8 +4139,6 @@ TAO_POA::disassociate_reference_with_id (CORBA::Object_ptr ref,
 
 template class ACE_Array_Base<TAO_Active_Object_Map::Map_Entry *>;
 
-//template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map_Iterator_Impl>;
-template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>;
 template class ACE_Map_Entry<TAO_Unbounded_Sequence<unsigned char>, TAO_ServantBase *>;
 template class ACE_Hash_Map_Entry<ACE_CString, TAO_POA *>;
 template class ACE_Hash_Map_Manager<ACE_CString, TAO_POA *, ACE_Null_Mutex>;
@@ -4156,14 +4154,20 @@ template class ACE_Array_Base <IOP::ProfileId>;
 
 //template class auto_ptr<TAO_Active_Object_Map_Iterator_Impl>;
 template class auto_ptr<TAO_Active_Object_Map>;
+
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+//template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map_Iterator_Impl>;
+template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>;
+#  endif  /* ACE_LACKS_AUTO_PTR */
+
 template class ACE_Node<TAO_POA *>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate ACE_Array_Base<TAO_Active_Object_Map::Map_Entry *>
 
-//#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map_Iterator_Impl>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>
 #pragma instantiate ACE_Map_Entry<TAO_Unbounded_Sequence<unsigned char>, TAO_ServantBase *>
 #pragma instantiate ACE_Hash_Map_Entry<ACE_CString, TAO_POA *>
 #pragma instantiate ACE_Hash_Map_Manager<ACE_CString, TAO_POA *, ACE_Null_Mutex>
@@ -4178,6 +4182,14 @@ template class ACE_Node<TAO_POA *>;
 
 //#pragma instantiate auto_ptr<TAO_Active_Object_Map_Iterator_Impl>
 #pragma instantiate auto_ptr<TAO_Active_Object_Map>
+
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+//#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map_Iterator_Impl>
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>
+#  endif  /* ACE_LACKS_AUTO_PTR */
+
 #pragma instantiate ACE_Node<TAO_POA *>
 #pragma instantiate ACE_Array_Base <IOP::ProfileId>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index cdf2e8e78d3..708e1f75816 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -767,7 +767,11 @@ TAO_Stub::buffering_constraint (void)
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
 template class auto_ptr<TAO_Policy_Set>;
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
 template class ACE_Auto_Basic_Ptr<TAO_Policy_Set>;
+#  endif  /* ACE_LACKS_AUTO_PTR */
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
@@ -776,7 +780,11 @@ template class ACE_Auto_Basic_Ptr<TAO_Policy_Set>;
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
 #pragma instantiate auto_ptr<TAO_Policy_Set>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Policy_Set>
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Policy_Set>
+#  endif  /* ACE_LACKS_AUTO_PTR */
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index e280ccd5040..857f7eac303 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -880,11 +880,19 @@ ACE_FACTORY_DEFINE (TAO, TAO_Default_Resource_Factory)
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class auto_ptr<TAO_Protocol_Factory>;
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
 template class ACE_Auto_Basic_Ptr<TAO_Protocol_Factory>;
+#  endif  /* ACE_LACKS_AUTO_PTR */
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate auto_ptr<TAO_Protocol_Factory>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Protocol_Factory>
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Protocol_Factory>
+#  endif  /* ACE_LACKS_AUTO_PTR */
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */