diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-01-19 02:51:31 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-01-19 02:51:31 +0000 |
| commit | 65aa0f7dc053ea526d858a6b44aee69d101a6853 (patch) | |
| tree | 04349a972fced0f47ca802af4a65b2ad9e213d7d | |
| parent | 99eba3faafff8f02639e76b3c88455df0cf6eb5a (diff) | |
| download | ATCD-65aa0f7dc053ea526d858a6b44aee69d101a6853.tar.gz | |
ChangeLogTag:Fri Jan 18 18:46:39 2002 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/ObjectReferenceTemplate.cpp | 12 |
2 files changed, 7 insertions, 12 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index ff4d7462cfe..2304dc49853 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Fri Jan 18 18:46:39 2002 Ossama Othman <ossama@uci.edu> + + * tao/PortableServer/ObjectReferenceTemplate.cpp: + + Removed duplicate template instantiations. They were already + defined in ObjectReferenceTemplateC.cpp. + Fri Jan 18 18:25:55 2002 Carlos O'Ryan <coryan@uci.edu> * tao/TAO_AMH_Response_Handler.cpp: diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp b/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp index f3c081330df..a431caf86a9 100644 --- a/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp +++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp @@ -82,15 +82,3 @@ TAO_ObjectReferenceTemplate::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { delete this; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class -TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate -TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |