diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 10 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 10 | ||||
| -rw-r--r-- | tests/Cached_Accept_Conn_Test.cpp | 4 | ||||
| -rw-r--r-- | tests/Cached_Conn_Test.cpp | 4 | ||||
| -rw-r--r-- | tests/Collection_Test.cpp | 6 |
6 files changed, 44 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index f90105f1182..4f7e6cf9618 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Tue Nov 7 11:47:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * tests/Cached_Accept_Conn_Test.cpp: + * tests/Cached_Conn_Test.cpp: + * tests/Collection_Test.cpp: + + Protected some of the explicit template instantiations with #if's + to make sure we don't get duplicate ones with ACE_INT32 == int + (since ACE_HANDLE and DATA are also int in some configurations). + Tue Nov 7 09:04:15 2000 Carlos O'Ryan <coryan@uci.edu> * ace/RMCast/RMCast.h: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index f90105f1182..4f7e6cf9618 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,13 @@ +Tue Nov 7 11:47:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * tests/Cached_Accept_Conn_Test.cpp: + * tests/Cached_Conn_Test.cpp: + * tests/Collection_Test.cpp: + + Protected some of the explicit template instantiations with #if's + to make sure we don't get duplicate ones with ACE_INT32 == int + (since ACE_HANDLE and DATA are also int in some configurations). + Tue Nov 7 09:04:15 2000 Carlos O'Ryan <coryan@uci.edu> * ace/RMCast/RMCast.h: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index f90105f1182..4f7e6cf9618 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,13 @@ +Tue Nov 7 11:47:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * tests/Cached_Accept_Conn_Test.cpp: + * tests/Cached_Conn_Test.cpp: + * tests/Collection_Test.cpp: + + Protected some of the explicit template instantiations with #if's + to make sure we don't get duplicate ones with ACE_INT32 == int + (since ACE_HANDLE and DATA are also int in some configurations). + Tue Nov 7 09:04:15 2000 Carlos O'Ryan <coryan@uci.edu> * ace/RMCast/RMCast.h: diff --git a/tests/Cached_Accept_Conn_Test.cpp b/tests/Cached_Accept_Conn_Test.cpp index eddee72acb6..d2099f65609 100644 --- a/tests/Cached_Accept_Conn_Test.cpp +++ b/tests/Cached_Accept_Conn_Test.cpp @@ -151,9 +151,13 @@ typedef Accept_Strategy<Server_Svc_Handler, ACE_SOCK_ACCEPTOR> // with -frepo, because it misses some of them. // = Handle Gobbler +#if (ACE_SIZEOF_INT != 4) && !defined (ACE_WIN32) +// These might be already instantiated in ace/stats.cpp +// (if ACE_HANDLE == int && ACE_INT32 == int) template class ACE_Node<ACE_HANDLE>; template class ACE_Unbounded_Set<ACE_HANDLE>; template class ACE_Unbounded_Set_Iterator<ACE_HANDLE>; +#endif /* ACE_SIZEOF_INT != 4 && !ACE_WIN32 */ template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>; template class ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>; diff --git a/tests/Cached_Conn_Test.cpp b/tests/Cached_Conn_Test.cpp index a4e682dd4a8..a2c46faf28c 100644 --- a/tests/Cached_Conn_Test.cpp +++ b/tests/Cached_Conn_Test.cpp @@ -125,9 +125,13 @@ typedef ACE_Cached_Connect_Strategy_Ex<Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_ // with -frepo, because it misses some of them. // = Handle Gobbler +#if (ACE_SIZEOF_INT != 4) && !defined (ACE_WIN32) +// These might be already instantiated in ace/stats.cpp +// (if ACE_HANDLE == int && ACE_INT32 == int) template class ACE_Node<ACE_HANDLE>; template class ACE_Unbounded_Set<ACE_HANDLE>; template class ACE_Unbounded_Set_Iterator<ACE_HANDLE>; +#endif /* ACE_SIZEOF_INT != 4 && !ACE_WIN32 */ template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>; template class ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>; diff --git a/tests/Collection_Test.cpp b/tests/Collection_Test.cpp index b225a928dae..23c6958c432 100644 --- a/tests/Collection_Test.cpp +++ b/tests/Collection_Test.cpp @@ -123,7 +123,13 @@ int main (int, ACE_TCHAR *[]) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Unbounded_Set<DATA>; template class ACE_Unbounded_Set_Iterator<DATA>; + +#if (ACE_SIZEOF_INT != 4) +// These might be already instantiated in ace/stats.cpp +// (if ACE_INT32 == int) template class ACE_Node<DATA>; +#endif /* ACE_SIZEOF_INT != 4 */ + template class ACE_Array<DATA>; template class ACE_Array_Base<DATA>; template class ACE_Array_Iterator<DATA>; |