diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-02-21 14:25:19 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-02-21 14:25:19 +0000 |
| commit | fd02d4946e37e543a23571629fde4c4e66b4ff1c (patch) | |
| tree | c247966051316593a67da08284072c01df7c65dc | |
| parent | 31b8937cf8a8d8008fdb9433e83011b23896c57d (diff) | |
| download | ATCD-fd02d4946e37e543a23571629fde4c4e66b4ff1c.tar.gz | |
ChangeLogTag:Fri Feb 21 06:22:36 2003 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/tao/ORBInitializer_Registry.cpp | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ca576ebb7db..49d70d37130 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Fri Feb 21 06:22:36 2003 Ossama Othman <ossama@uci.edu> + + * tao/ORBInitializer_Registry.cpp: + + Changed ACE_Array_Base explicit template instantiation argument + from PortableInterceptor::ORBInitializer_ptr to + PortableInterceptor::ORBInitializer_var. Fixes unresolved + symbol link-time errors in explicit template instantiation + builds. + Fri Feb 21 13:32:43 2003 Edward Scott <eas@prismtechnologies.com> * docs/bugzilla-build-setup.html diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp index b50dfb3c427..cb2229d494f 100644 --- a/TAO/tao/ORBInitializer_Registry.cpp +++ b/TAO/tao/ORBInitializer_Registry.cpp @@ -114,11 +114,11 @@ TAO_ORBInitializer_Registry::instance (void) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Singleton<TAO_ORBInitializer_Registry, TAO_SYNCH_MUTEX>; -template class ACE_Array_Base<PortableInterceptor::ORBInitializer_ptr>; +template class ACE_Array_Base<PortableInterceptor::ORBInitializer_var>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate TAO_Singleton<TAO_ORBInitializer_Registry, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Array_Base<PortableInterceptor::ORBInitializer_ptr> +#pragma instantiate ACE_Array_Base<PortableInterceptor::ORBInitializer_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |