diff options
| author | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-04-28 11:54:01 +0000 |
|---|---|---|
| committer | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-04-28 11:54:01 +0000 |
| commit | a68c08bcd882469ab15e33c9a619e8b6a67c6515 (patch) | |
| tree | a2760a851d82e45d901a8e007f88b66b548e5682 | |
| parent | 50d1c56010aa2d60a5e7750bc9c475b03b91a1e0 (diff) | |
| download | ATCD-a68c08bcd882469ab15e33c9a619e8b6a67c6515.tar.gz | |
ChangeLogTag:Mon Apr 28 06:52:40 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tao/Array_VarOut_T.inl | 7 | ||||
| -rw-r--r-- | TAO/tao/IOP_IORC.cpp | 18 |
3 files changed, 13 insertions, 19 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 11545b35315..67d6c98bd59 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Mon Apr 28 06:52:40 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tao/IOP_IORC.cpp: Removed duplicate explicit template + instantiations. + + * tao/Array_VarOut_T.inl: Fixed a compilation error in BCB6. + Mon Apr 28 06:43:50 2003 Chad Elliott <elliott_c@ociweb.com> * orbsvcs/orbsvcs/RTEventLogAdmin.mpc: diff --git a/TAO/tao/Array_VarOut_T.inl b/TAO/tao/Array_VarOut_T.inl index 8822fbe0543..a7ba28c7e68 100644 --- a/TAO/tao/Array_VarOut_T.inl +++ b/TAO/tao/Array_VarOut_T.inl @@ -300,10 +300,15 @@ ACE_INLINE const T_slice & TAO_Array_Forany_T<T_slice,T_life>::operator[] (CORBA::ULong index) const { +#if defined (ACE_HAS_BROKEN_IMPLICIT_CONST_CAST) return ACE_const_cast ( const T_slice &, this->ptr_[index] - ); + ); +#else + const T_slice & tmp = this->ptr_[index]; + return tmp; +#endif /* ACE_HAS_BROKEN_IMPLICIT_CONST_CAST */ } template<typename T_slice, typename T_life> diff --git a/TAO/tao/IOP_IORC.cpp b/TAO/tao/IOP_IORC.cpp index f6c74605bef..6b117081a57 100644 --- a/TAO/tao/IOP_IORC.cpp +++ b/TAO/tao/IOP_IORC.cpp @@ -956,18 +956,9 @@ template class #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class TAO_Unbounded_Sequence< - IOP::TaggedComponent - >; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate TAO_Unbounded_Sequence< - IOP::TaggedComponent - > - - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ #endif /* end #if !defined */ @@ -1188,18 +1179,9 @@ template class #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class TAO_Unbounded_Sequence< - IOP::TaggedComponent - >; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate TAO_Unbounded_Sequence< - IOP::TaggedComponent - > - - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ #endif /* end #if !defined */ |