diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-19 18:07:46 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-19 18:07:46 +0000 |
| commit | 6615ab6e01996fd61401a97f10264bf9dc86696a (patch) | |
| tree | 87c5dc2c0519eab737ad9ed0a4e97657285faf15 | |
| parent | f3621c5899a262c1794d354e0978a27ddc9d14b4 (diff) | |
| download | ATCD-6615ab6e01996fd61401a97f10264bf9dc86696a.tar.gz | |
ChangeLogTag:Wed May 19 13:07:06 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent_Utilities.cpp | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 379b7a88f5c..a0a17c077e1 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,8 @@ +Wed May 19 13:07:06 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * orbsvcs/orbsvcs/CosEvent_Utilities.cpp: + Fixed several syntax errors, at least it compiles now. + Wed May 19 00:20:08 1999 Pradeep Gore <pradeep@flamenco.cs.wustl.edu> * orbsvcs/orbsvcs/CosEvent_Utilities.{h,cpp}: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.cpp b/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.cpp index 40be5135088..bfa8316dcf1 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.cpp @@ -385,23 +385,20 @@ CosEC_ServantBase::init_ConsumerQOS (RtecScheduler::handle_t cons_handle, } while (tok != 0); } +} #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<RtecScheduler::Scheduler>; template class CosEC_Utility_Methods<RtecEventChannelAdmin::EventChannel>; template class CosEC_Utility_Methods<CosEventChannelAdmin::EventChannel>; -template class CosEC_Utility_Methods<CosEC_Utility_NIL>; +// template class CosEC_Utility_Methods<CosEC_Utility_NIL>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate CosEC_Utility_Methods<RtecScheduler::Scheduler> #pragma instantiate CosEC_Utility_Methods<RtecEventChannelAdmin::EventChannel> #pragma instantiate CosEC_Utility_Methods<CosEventChannelAdmin::EventChannel> -#pragma instantiate CosEC_Utility_Methods<CosEC_Utility_NIL> -#pragma instantiate ACE_Auto_Basic_Ptr<FactoryCosEventChannel_i> -#pragma instantiate auto_ptr<FactoryCosEventChannel_i> +// #pragma instantiate CosEC_Utility_Methods<CosEC_Utility_NIL> #endif /* ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA */ |