diff options
author | Chris Cleeland <chris.cleeland@gmail.com> | 2003-06-27 17:42:32 +0000 |
---|---|---|
committer | Chris Cleeland <chris.cleeland@gmail.com> | 2003-06-27 17:42:32 +0000 |
commit | 47543f3c34880eacce36bd731ea7c218745229f5 (patch) | |
tree | 7a3a7007be053bc2c4fb7affd42f8ebe08780e9f | |
parent | b62cfca655f491acd829be0051ba8401a2ece7fd (diff) | |
download | ATCD-47543f3c34880eacce36bd731ea7c218745229f5.tar.gz |
Fri Jun 27 12:12:09 2003 Chris Cleeland <cleeland_c@ociweb.com>
-rw-r--r-- | TAO/ChangeLog | 14 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp | 4 |
5 files changed, 22 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 2e1bbcf3ba6..64386a6f09c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,17 @@ +Fri Jun 27 12:12:09 2003 Chris Cleeland <cleeland_c@ociweb.com> + + * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp: + * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp: + * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp: + * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp: + + Finally fixed the explicit instantiation for activate<>. As it + turns out, the problem is that the build on which this was + failing had exceptions turned off, which required the + ACE_ENV_ARG_DECL at the end of the arg list. Other explicit + instantiation builds didn't trip the problem because they had + exceptions turned on. + Thu Jun 26 17:35:00 2003 Justin Michel <michel_j@ociweb.com> * TAOACE.mwc: diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp index d91347f04b7..16efa2a1d17 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -283,7 +283,7 @@ TAO_ECG_Mcast_EH::Observer::shutdown (void) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template void activate(TAO_Objref_Var_T<RtecEventChannelAdmin::Observer, RtecEventChannelAdmin::tao_Observer_life>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator&); +template void activate<>(TAO_Objref_Var_T<RtecEventChannelAdmin::Observer, RtecEventChannelAdmin::tao_Observer_life>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator& ACE_ENV_ARG_DECL); template class ACE_Hash_Map_Manager<ACE_INET_Addr,ACE_SOCK_Dgram_Mcast*,ACE_Null_Mutex>; template class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, ACE_SOCK_Dgram_Mcast *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>; template class ACE_Hash_Map_Entry<ACE_INET_Addr, ACE_SOCK_Dgram_Mcast *>; @@ -302,7 +302,7 @@ template class ACE_Array_Base<TAO_ECG_Mcast_EH::Subscription>; #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate void activate(TAO_Objref_Var_T<RtecEventChannelAdmin::Observer, RtecEventChannelAdmin::tao_Observer_life>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator&) +#pragma instantiate void activate<>(TAO_Objref_Var_T<RtecEventChannelAdmin::Observer, RtecEventChannelAdmin::tao_Observer_life>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator& ACE_ENV_ARG_DECL) #pragma instantiate ACE_Hash_Map_Manager<ACE_INET_Addr,ACE_SOCK_Dgram_Mcast*,ACE_Null_Mutex> #pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, ACE_SOCK_Dgram_Mcast *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex> #pragma instantiate ACE_Hash_Map_Entry<ACE_INET_Addr, ACE_SOCK_Dgram_Mcast *> diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp index 0c15856b812..da23f4a93b1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp @@ -695,11 +695,11 @@ ACE_FACTORY_DEFINE (TAO_RTEvent, TAO_ECG_Mcast_Gateway) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Dynamic_Service<TAO_ECG_Mcast_Gateway>; -template void activate(TAO_Objref_Var_T<RtecUDPAdmin::AddrServer, RtecUDPAdmin::tao_AddrServer_life>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator&); +template void activate<>(TAO_Objref_Var_T<RtecUDPAdmin::AddrServer, RtecUDPAdmin::tao_AddrServer_life>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator& ACE_ENV_ARG_DECL); #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Dynamic_Service<TAO_ECG_Mcast_Gateway> -#pragma instantiate activate(TAO_Objref_Var_T<RtecUDPAdmin::AddrServer, RtecUDPAdmin::tao_AddrServer_life>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator&) +#pragma instantiate activate<>(TAO_Objref_Var_T<RtecUDPAdmin::AddrServer, RtecUDPAdmin::tao_AddrServer_life>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator& ACE_ENV_ARG_DECL) #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp index c3c7e516827..603e4927f91 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp @@ -246,7 +246,7 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram) // **************************************************************** #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template void activate(TAO_Objref_Var_T<RtecEventComm::PushSupplier, RtecEventComm::tao_PushSupplier_life>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator&); +template void activate<>(TAO_Objref_Var_T<RtecEventComm::PushSupplier, RtecEventComm::tao_PushSupplier_life>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator& ACE_ENV_ARG_DECL); #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate void activate(TAO_Objref_Var_T<RtecEventComm::PushSupplier, RtecEventComm::tao_PushSupplier_life>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator&) +#pragma instantiate void activate<>(TAO_Objref_Var_T<RtecEventComm::PushSupplier, RtecEventComm::tao_PushSupplier_life>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator& ACE_ENV_ARG_DECL) #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp index 66c96800f8c..166a8ee00fc 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp @@ -230,9 +230,9 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template void activate(TAO_Objref_Var_T<RtecEventComm::PushConsumer, RtecEventComm::tao_PushConsumer_life>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator&); +template void activate<>(TAO_Objref_Var_T<RtecEventComm::PushConsumer, RtecEventComm::tao_PushConsumer_life>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator& ACE_ENV_ARG_DECL); #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate void activate(TAO_Objref_Var_T<RtecEventComm::PushConsumer, RtecEventComm::tao_PushConsumer_life>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator&); +#pragma instantiate void activate<>(TAO_Objref_Var_T<RtecEventComm::PushConsumer, RtecEventComm::tao_PushConsumer_life>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator& ACE_ENV_ARG_DECL); #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |