diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-21 17:32:18 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-21 17:32:18 +0000 |
| commit | 84b4e1d2887f8b5015a0fbf811b1d6a2abf60f27 (patch) | |
| tree | 6a64f9835b8a9f23e7bb368e75481e692d6d53a1 | |
| parent | 1c5e321357f23f42c4b1cf920faf978df15b35d8 (diff) | |
| download | ATCD-84b4e1d2887f8b5015a0fbf811b1d6a2abf60f27.tar.gz | |
ChangeLogTag:Wed Jul 21 12:31:09 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Repository.cpp | 16 |
2 files changed, 23 insertions, 0 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 74069cc0192..a7508720708 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,10 @@ +Wed Jul 21 12:31:09 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * orbsvcs/ImplRepo_Service/Repository.cpp: + Added template instantiation for SunCC 5.0, the template is + already instantiated in libTAO.so, but the compiler is broken + and doesn't seem to find it. + Wed Jul 21 12:05:15 1999 Jeff Parsons <parsons@cs.wustl.edu> * TAO_IDL/be_include/be_visitor_union_branch.h: diff --git a/TAO/orbsvcs/ImplRepo_Service/Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Repository.cpp index 15e145dfab2..76b6387f676 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Repository.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Repository.cpp @@ -229,6 +229,14 @@ template class ACE_Hash_Map_Iterator_Base_Ex<ACE_TString, Server_Info *,ACE_Hash template class ACE_Hash_Map_Iterator_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>; template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>; +#if defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500) +// This template is already defined in TAO, but Sun/CC 5.0 is broken +template class ACE_Equal_To<ACE_CString>; +#endif /* __SUNPRO_CC */ +// Instantiate for ACE_WString because ACE_TString can be either +// ACE_CString or ACE_WString. +template class ACE_Equal_To<ACE_WString>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Hash_Map_Entry<ACE_TString, Server_Info *> @@ -237,4 +245,12 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TString, Server_Info *,ACE_H #pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex> #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex> +#if defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500) +// This template is already defined in TAO, but Sun/CC 5.0 is broken +#pragma instantiate ACE_Equal_To<ACE_CString> +#endif /* __SUNPRO_CC */ +// Instantiate for ACE_WString because ACE_TString can be either +// ACE_CString or ACE_WString. +#pragma instantiate ACE_Equal_To<ACE_WString> + #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |