diff options
author | bala <balanatarajan@users.noreply.github.com> | 2002-04-27 02:58:43 +0000 |
---|---|---|
committer | bala <balanatarajan@users.noreply.github.com> | 2002-04-27 02:58:43 +0000 |
commit | f3b2b9372980796e7d4e2a826d65eb7ac7f0b07f (patch) | |
tree | d12969ee4dc481d9f505a23ef48379ddb4c9e216 /TAO/tao/PortableServer/Active_Object_Map.cpp | |
parent | af5f51f8e5050b542e514587130ed5e718f53184 (diff) | |
download | ATCD-connection_timeout_1.tar.gz |
ChangeLogTag: Fri Apr 26 21:56:33 2002 Balachandran Natarajan <bala@guajira.cs.wustl.edu>connection_timeout_1
Diffstat (limited to 'TAO/tao/PortableServer/Active_Object_Map.cpp')
-rw-r--r-- | TAO/tao/PortableServer/Active_Object_Map.cpp | 20 |
1 files changed, 14 insertions, 6 deletions
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; |