diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-19 20:22:59 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-19 20:22:59 +0000 |
| commit | 96d7f7b39c96af536735ee33c82e3096b6284a92 (patch) | |
| tree | f5db676df9d532f19e1b36d04ca13531467e5530 | |
| parent | b5a130b43c375440fe45b53894465386913458da (diff) | |
| download | ATCD-96d7f7b39c96af536735ee33c82e3096b6284a92.tar.gz | |
ChangeLogTag:Wed May 19 15:12:26 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 350698ed152..a7c5d7a0c8a 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -5,6 +5,9 @@ Wed May 19 15:12:26 1999 Carlos O'Ryan <coryan@cs.wustl.edu> Use the TAO_EC_Default_Factory for the Rtec Event Channel and configure it using a svc.conf file. + * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp: + Fixed more template instantiation problems. + Wed May 19 13:07:06 1999 Carlos O'Ryan <coryan@cs.wustl.edu> * orbsvcs/orbsvcs/CosEvent_Utilities.cpp: diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp index 83345046f56..b675526a81c 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp @@ -151,7 +151,7 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id, if (store_in_naming_service && !CORBA::is_nil (this->naming_.in ())) { - CosEC_Utility_Methods<CosEC_Utility_NIL>:: + CosEC_Utility_Methods<CORBA::Object>:: bind (this->naming_.in (), channel_id, obj.in(), @@ -240,7 +240,7 @@ TAO_CosEventChannelFactory_i::destroy if (unbind_from_naming_service && !CORBA::is_nil (this->naming_.in ())) { - CosEC_Utility_Methods<CosEC_Utility_NIL>:: + CosEC_Utility_Methods<CORBA::Object>:: unbind (this->naming_.in (), channel_id, ACE_TRY_ENV); @@ -333,14 +333,10 @@ TAO_CosEventChannelFactory_i::find_channel_id #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Auto_Basic_Ptr<FactoryCosEventChannel_i>; -template class auto_ptr<FactoryCosEventChannel_i>; -template class CosEC_Utility_Methods<CosEC_Utility_NIL>; +template class CosEC_Utility_Methods<CORBA::Object>; #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Auto_Basic_Ptr<FactoryCosEventChannel_i> -#pragma instantiate auto_ptr<FactoryCosEventChannel_i> -#pragma instantiate CosEC_Utility_Methods<CosEC_Utility_NIL> +#pragma instantiate CosEC_Utility_Methods<CORBA::Object> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |