diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-07-19 11:31:44 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-07-19 11:31:44 +0000 |
| commit | 6226729ffc70ab15c6a31b78220c04f23978fdb6 (patch) | |
| tree | 7056a4ae34b8a07dad20a48c34b8e9d1538bc263 | |
| parent | 0ab5a30fed3d212e15cf19be2516b9ca8f7a13cc (diff) | |
| download | ATCD-6226729ffc70ab15c6a31b78220c04f23978fdb6.tar.gz | |
ChangeLogTag: Tue Jul 19 10:28:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/orbsvcs/examples/ORT/Gateway_i.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/NVList.cpp | 29 | ||||
| -rw-r--r-- | TAO/tao/Object_Loader.cpp | 9 |
3 files changed, 1 insertions, 39 deletions
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp index 013737b9de8..c4340886db3 100644 --- a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp +++ b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp @@ -116,7 +116,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request // Use the NVList (with values) to create a DII Request... CORBA::Request_var dii_request; - CORBA::NamedValue *named_value; + CORBA::NamedValue *named_value = 0; this->orb_->create_named_value (named_value ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp index 547d1942f64..d6e2b993635 100644 --- a/TAO/tao/NVList.cpp +++ b/TAO/tao/NVList.cpp @@ -496,32 +496,3 @@ CORBA::NVList::_lazy_has_arguments (void) const } } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Node<CORBA::NamedValue_ptr>; -template class ACE_Unbounded_Queue<CORBA::NamedValue_ptr>; -template class ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr>; -template class TAO_Pseudo_Var_T<CORBA::NamedValue>; -template class TAO_Pseudo_Out_T<CORBA::NamedValue, CORBA::NamedValue_var>; -template class TAO_Pseudo_Var_T<CORBA::NVList>; -template class TAO_Pseudo_Out_T<CORBA::NVList, CORBA::NVList_var>; -# if defined (ACE_LACKS_AUTO_PTR) \ - || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \ - && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)) -template class ACE_Auto_Basic_Ptr<TAO_InputCDR>; -# endif /* ACE_LACKS_AUTO_PTR */ -template class auto_ptr<TAO_InputCDR>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Node<CORBA::NamedValue_ptr> -#pragma instantiate ACE_Unbounded_Queue<CORBA::NamedValue_ptr> -#pragma instantiate ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr> -#pragma instantiate TAO_Pseudo_Var_T<CORBA::NamedValue> -#pragma instantiate TAO_Pseudo_Out_T<CORBA::NamedValue, CORBA::NamedValue_var> -#pragma instantiate TAO_Pseudo_Var_T<CORBA::NVList> -#pragma instantiate TAO_Pseudo_Out_T<CORBA::NVList, CORBA::NVList_var> -# if defined (ACE_LACKS_AUTO_PTR) \ - || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \ - && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)) -# pragma instantiate ACE_Auto_Basic_Ptr<TAO_InputCDR> -# endif /* ACE_LACKS_AUTO_PTR */ -#pragma instantiate auto_ptr<TAO_InputCDR> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Object_Loader.cpp b/TAO/tao/Object_Loader.cpp index 0ae0e4ec4e5..b510b74bcc4 100644 --- a/TAO/tao/Object_Loader.cpp +++ b/TAO/tao/Object_Loader.cpp @@ -11,12 +11,3 @@ TAO_Object_Loader::~TAO_Object_Loader (void) { } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Dynamic_Service<TAO_Object_Loader>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Dynamic_Service<TAO_Object_Loader> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |