From fd02d4946e37e543a23571629fde4c4e66b4ff1c Mon Sep 17 00:00:00 2001 From: Ossama Othman Date: Fri, 21 Feb 2003 14:25:19 +0000 Subject: ChangeLogTag:Fri Feb 21 06:22:36 2003 Ossama Othman --- TAO/ChangeLog | 10 ++++++++++ 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 + + * 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 * 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; -template class ACE_Array_Base; +template class ACE_Array_Base; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate TAO_Singleton -#pragma instantiate ACE_Array_Base +#pragma instantiate ACE_Array_Base #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -- cgit v1.2.1