diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-04-19 19:21:27 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-04-19 19:21:27 +0000 |
| commit | 31ce5c205e191366efe1205c2a12783d5801e054 (patch) | |
| tree | 55d07154f80a490ddf61c0bf179b0b7e20d2e331 | |
| parent | d5e2a4afa001ef14e6761217513f4779c81c3d3b (diff) | |
| download | ATCD-31ce5c205e191366efe1205c2a12783d5801e054.tar.gz | |
ChangeLogTag: Wed Apr 19 19:18:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ace/QoS/QoS_Manager.cpp | 10 | ||||
| -rw-r--r-- | ace/SSL/SSL_Context.cpp | 12 |
3 files changed, 7 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog index f463d346b96..b00f0d0f48c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Apr 19 19:18:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/*: + Removed explicit template support + Wed Apr 19 15:09:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Bug_2368_Regression_Test.cpp: diff --git a/ace/QoS/QoS_Manager.cpp b/ace/QoS/QoS_Manager.cpp index 5d3b33e0260..27fa39ab560 100644 --- a/ace/QoS/QoS_Manager.cpp +++ b/ace/QoS/QoS_Manager.cpp @@ -38,14 +38,4 @@ ACE_QoS_Manager::qos_session_set (void) return this->qos_session_set_; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Node<ACE_QoS_Session *>; -template class ACE_Unbounded_Set<ACE_QoS_Session *>; -template class ACE_Unbounded_Set_Iterator<ACE_QoS_Session *>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Node<ACE_QoS_Session *> -#pragma instantiate ACE_Unbounded_Set<ACE_QoS_Session *> -#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_QoS_Session *> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/SSL/SSL_Context.cpp b/ace/SSL/SSL_Context.cpp index b9abb56eaae..fa120632038 100644 --- a/ace/SSL/SSL_Context.cpp +++ b/ace/SSL/SSL_Context.cpp @@ -564,19 +564,11 @@ ACE_SSL_Context::dh_params (const char *file_name, // **************************************************************** -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX> - -#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) +#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX> * ACE_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX>::singleton_; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ ACE_END_VERSIONED_NAMESPACE_DECL |