diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-10-24 20:58:20 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-10-24 20:58:20 +0000 |
| commit | ac86d16b4cd99912bdcf7feb531fcdf68f53b406 (patch) | |
| tree | 3c3fa8692eb109bffd3ef14ff546063b47d9e762 | |
| parent | b162fb998d183c5bd7dec539b172b7c35b30c326 (diff) | |
| download | ATCD-ac86d16b4cd99912bdcf7feb531fcdf68f53b406.tar.gz | |
ChangeLogTag:Fri Oct 24 15:59:59 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog_ref | 8 | ||||
| -rw-r--r-- | TAO/tao/Valuetype/AbstractBase.cpp | 10 | ||||
| -rw-r--r-- | TAO/tao/Valuetype/AbstractBase.h | 1 | ||||
| -rw-r--r-- | TAO/tao/Valuetype/Seq_Tmplinst.cpp | 21 |
4 files changed, 24 insertions, 16 deletions
diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref index 88738924374..b80f87a892c 100644 --- a/TAO/ChangeLog_ref +++ b/TAO/ChangeLog_ref @@ -1,3 +1,11 @@ +Fri Oct 24 15:59:59 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tao/Valuetype/AbstractBase.h: + * tao/Valuetype/AbstractBase.cpp: + * tao/Valuetype/Seq_Tmplinst.cpp: + Fixed the includes and some compilation errors with explicit + template instantiations. + Fri Oct 24 15:47:21 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * tao/Sequence_T.cpp: diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp index b2739986957..d5750d5d925 100644 --- a/TAO/tao/Valuetype/AbstractBase.cpp +++ b/TAO/tao/Valuetype/AbstractBase.cpp @@ -106,7 +106,7 @@ CORBA::AbstractBase::_duplicate (CORBA::AbstractBase_ptr obj) obj->_add_ref (); } - if (!CORBA::is_nil (obj->equivalent_obj_)) + if (!CORBA::is_nil (obj->equivalent_obj_.in ())) { obj->equivalent_obj_->_add_ref (); } @@ -162,8 +162,8 @@ CORBA::AbstractBase::_tao_any_destructor (void *x) CORBA::Object_ptr CORBA::AbstractBase::_to_object (void) { - if (!CORBA::is_nil (this->equivalent_obj_)) - return CORBA::Object::_duplicate (this->equivalent_obj_); + if (!CORBA::is_nil (this->equivalent_obj_.in ())) + return CORBA::Object::_duplicate (this->equivalent_obj_.in ()); if (this->concrete_stubobj_ == 0) { @@ -420,10 +420,10 @@ CORBA::AbstractBase::equivalent_objref (void) } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - +#if 0 template class TAO::Any_Impl_T<CORBA::AbstractBase>; template class TAO::Any_Impl_T<CORBA::ValueBase>; - +#endif #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate TAO::Any_Impl_T<CORBA::AbstractBase> diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h index ea0929815c7..c26f2682b11 100644 --- a/TAO/tao/Valuetype/AbstractBase.h +++ b/TAO/tao/Valuetype/AbstractBase.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef TAO_ABSTRACTBASE_H #define TAO_ABSTRACTBASE_H diff --git a/TAO/tao/Valuetype/Seq_Tmplinst.cpp b/TAO/tao/Valuetype/Seq_Tmplinst.cpp index d39700a9328..451aaf08907 100644 --- a/TAO/tao/Valuetype/Seq_Tmplinst.cpp +++ b/TAO/tao/Valuetype/Seq_Tmplinst.cpp @@ -18,12 +18,15 @@ // // ============================================================================ +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #include "tao/Sequence_T.h" #include "tao/Any.h" #include "ValueBase.h" #include "AbstractBase.h" #include "Sequence_T.h" #include "ValueFactory.h" +#endif /*if ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA*/ ACE_RCSID (tao, Seq_Tmplinst, @@ -32,19 +35,17 @@ ACE_RCSID (tao, #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Valuetype_Manager<CORBA::ValueBase, - CORBA::ValueBase_var, - CORBA::tao_ValueBase_life>; + CORBA::ValueBase_var>; + template class TAO_Unbounded_Valuetype_Sequence<CORBA::ValueBase, - CORBA::ValueBase_var, - CORBA::tao_ValueBase_life>; -template class TAO_Unbounded_Pseudo_Sequence<CORBA::AbstractBase, - CORBA::AbstractBase_var>; + CORBA::ValueBase_var>; + +template class TAO_Unbounded_Pseudo_Sequence<CORBA::AbstractBase>; + +template class TAO_Value_Var_T <CORBA::ValueFactoryBase>; -template class TAO_Value_Var_T <CORBA::ValueFactoryBase, - CORBA::tao_ValueFactoryBase_life>; -template class TAO_Value_Var_T <CORBA::ValueBase, - CORBA::tao_ValueBase_life>; +template class TAO_Value_Var_T <CORBA::ValueBase>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) |