diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-14 15:48:28 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-14 15:48:28 +0000 |
| commit | 66c83f713a7da19b97d2cbfec3542bb113d8a362 (patch) | |
| tree | 08d4010e6a82c56258964cb97793973d1442acd6 | |
| parent | 68c539972bcbcd3dca0e9e204f45e97baf4ca100 (diff) | |
| download | ATCD-66c83f713a7da19b97d2cbfec3542bb113d8a362.tar.gz | |
ChangeLogTag:Wed Oct 14 10:47:47 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-98c | 5 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index d9e6dc0eb7f..b6f9e5e615b 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,8 @@ +Wed Oct 14 10:47:47 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/ORB_Core.cpp: + Fixed template instantiations. + Wed Oct 14 00:42:25 1998 Douglas C. Schmidt <schmidt@cs.wustl.edu> * TAO version 0.2.24 released. diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 6412289288d..6a20016c12c 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1487,7 +1487,6 @@ TAO_Resource_Factory::create_input_cdr_data_block (size_t size) 0); return nb; } - break; case TAO_TSS: { @@ -1512,7 +1511,6 @@ TAO_Resource_Factory::create_input_cdr_data_block (size_t size) 0); return nb; } - break; } return 0; } @@ -1587,7 +1585,7 @@ TAO_ORB_Core_instance (void) template class ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX>; template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> >; -template class ACE_Locked_Data_Block<ACE_Allocator_Adapter<ACE_SYNCH_MUTEX> >; +template class ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >; template class ACE_Env_Value<int>; template class ACE_Env_Value<u_int>; @@ -1641,7 +1639,7 @@ template class ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> #pragma instantiate ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> #pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> > -#pragma instantiate ACE_Locked_Data_Block<ACE_Allocator_Adapter<ACE_SYNCH_MUTEX> > +#pragma instantiate ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> > #pragma instantiate ACE_Env_Value<int> #pragma instantiate ACE_Env_Value<u_int> |