diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-08-10 00:10:43 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-08-10 00:10:43 +0000 |
| commit | 4badbffa2f6103dbd7fceb9dc724179abcd4f158 (patch) | |
| tree | dae55e0640871b9225bbb105c7033fd880312d14 | |
| parent | 57be8124f20ca166c38f8510de02e7136be04837 (diff) | |
| download | ATCD-4badbffa2f6103dbd7fceb9dc724179abcd4f158.tar.gz | |
ChangeLogTag:Sun Aug 9 19:08:53 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-98c | 8 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index ab2db317ffd..61a3f9f18a1 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,11 @@ +Sun Aug 9 19:08:53 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/ORB_Core.cpp: + Removed explicit template instantiation for + ACE_Malloc<ACE_LOCAL_MEMPORY_POOL,ACE_Null_Mutex> and the + corresponding ACE_Allocator_Adapter<> because it is already + instantiated in ACE. + Sun Aug 9 18:20:59 1998 Darrell Brunsch <brunsch@cs.wustl.edu> * tests/Simple/client_static.dsp: diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 04411d5cbed..eb32ef2c72d 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1344,9 +1344,6 @@ TAO_ORB_Core_instance (void) template void ACE_Convert (const char *, u_int &); # endif /* __GNUG__ */ -template class ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_Null_Mutex>; -template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_Null_Mutex> >; - template class ACE_Env_Value<int>; template class ACE_Env_Value<u_int>; template class ACE_Strategy_Acceptor<TAO_Server_Connection_Handler, TAO_SOCK_ACCEPTOR>; @@ -1393,9 +1390,6 @@ template class ACE_Unbounded_Set_Iterator<ACE_SYNCH_CONDITION*>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_Null_Mutex> -#pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_Null_Mutex> > - #pragma instantiate ACE_Env_Value<int> #pragma instantiate ACE_Env_Value<u_int> #pragma instantiate ACE_Strategy_Acceptor<TAO_Server_Connection_Handler, TAO_SOCK_ACCEPTOR> |