diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-08-27 04:09:34 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-08-27 04:09:34 +0000 |
| commit | 84ea6e251fc957911fec547d111d89042f5d788a (patch) | |
| tree | 9fe900ce72c8cd490ac0d7677755a7e40c361c67 | |
| parent | 095e012afa11bf9bde12c39a059bb8d3da9c1b19 (diff) | |
| download | ATCD-84ea6e251fc957911fec547d111d89042f5d788a.tar.gz | |
ChangeLogTag:Wed Aug 26 22:52:14 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-98c | 7 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 836e75ba3ee..95f9c3d9a9f 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,10 @@ +Wed Aug 26 22:52:14 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/ORB_Core.cpp: + The ACE_Select_Reactor_Token_T<ACE_Noop_Token> class and the + Select_Reactor_T over this class are used even when threads are + enabled. + Wed Aug 26 22:29:51 1998 Nanbor Wang <nanbor@cs.wustl.edu> * tao/tao.dsp: diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 8f69a1120f3..f81e3b658ed 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1418,10 +1418,10 @@ template class ACE_Node<ACE_SYNCH_CONDITION*>; template class ACE_Unbounded_Set<ACE_SYNCH_CONDITION*>; template class ACE_Unbounded_Set_Iterator<ACE_SYNCH_CONDITION*>; -#if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE == 0) template class ACE_Select_Reactor_Token_T<ACE_Noop_Token>; +template class ACE_Lock_Adapter<ACE_Select_Reactor_Token_T<ACE_Noop_Token> >; template class ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> >; -#endif /* !ACE_MT_SAFE || ACE_MT_SAFE == 0 */ + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Env_Value<int> @@ -1468,10 +1468,10 @@ template class ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> #pragma instantiate ACE_Unbounded_Set<ACE_SYNCH_CONDITION*> #pragma instantiate ACE_Unbounded_Set_Iterator<ACE_SYNCH_CONDITION*> -#if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE == 0) -# pragma instantiate ACE_Select_Reactor_Token_T<ACE_Noop_Token> -# pragma instantiate ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> > -#endif /* !ACE_MT_SAFE || ACE_MT_SAFE == 0 */ +#pragma instantiate ACE_Select_Reactor_Token_T<ACE_Noop_Token> +#pragma instantiate ACE_Lock_Adapter< ACE_Select_Reactor_Token_T<ACE_Noop_Token> > +#pragma instantiate ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> > + #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ ACE_FACTORY_DEFINE (TAO, TAO_Resource_Factory) |