diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-03-05 11:02:51 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-03-05 11:02:51 +0000 |
commit | dc8cdb30c3c78d28ae09215899b6d169323cd580 (patch) | |
tree | 1e686f04820e68900e50130389ad30f1b816747f | |
parent | fb610df7feb81fed278a885d74ed7d19d1ea7fea (diff) | |
download | ATCD-dc8cdb30c3c78d28ae09215899b6d169323cd580.tar.gz |
-rw-r--r-- | TAO/tao/Bounded_Object_Reference_Sequence_T.h | 4 | ||||
-rw-r--r-- | TAO/tao/Bounded_Sequence_CDR_T.h | 2 | ||||
-rw-r--r-- | TAO/tao/Unbounded_Object_Reference_Sequence_T.h | 4 | ||||
-rw-r--r-- | TAO/tao/Unbounded_Sequence_CDR_T.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/TAO/tao/Bounded_Object_Reference_Sequence_T.h b/TAO/tao/Bounded_Object_Reference_Sequence_T.h index cc7c576e85a..0fed30cc4ab 100644 --- a/TAO/tao/Bounded_Object_Reference_Sequence_T.h +++ b/TAO/tao/Bounded_Object_Reference_Sequence_T.h @@ -64,8 +64,8 @@ public: implementation_type::range::check_length(length, MAX); impl_.length(length); } - inline const_element_type operator[](CORBA::ULong i) const { - return const_element_type(impl_[i], release()); + inline value_type const & operator[](CORBA::ULong i) const { + return impl_[i];; } inline element_type operator[](CORBA::ULong i) { return element_type(impl_[i], release()); diff --git a/TAO/tao/Bounded_Sequence_CDR_T.h b/TAO/tao/Bounded_Sequence_CDR_T.h index 531e9b77177..379410b5a22 100644 --- a/TAO/tao/Bounded_Sequence_CDR_T.h +++ b/TAO/tao/Bounded_Sequence_CDR_T.h @@ -476,7 +476,7 @@ namespace TAO { return false; } for(CORBA::ULong i = 0; i < length; ++i) { - if (!TAO::Objref_Traits<object_type>::marshal (source[i].in (), strm)) { + if (!TAO::Objref_Traits<object_type>::marshal (source[i], strm)) { return false; } } diff --git a/TAO/tao/Unbounded_Object_Reference_Sequence_T.h b/TAO/tao/Unbounded_Object_Reference_Sequence_T.h index 50d1ae9fd9b..5a727e79db4 100644 --- a/TAO/tao/Unbounded_Object_Reference_Sequence_T.h +++ b/TAO/tao/Unbounded_Object_Reference_Sequence_T.h @@ -70,8 +70,8 @@ public: impl_.length(length); } /// @copydoc details::generic_sequence::operator[] - inline const_element_type operator[](CORBA::ULong i) const { - return const_element_type (impl_[i], release()); + inline value_type const & operator[](CORBA::ULong i) const { + return impl_[i]; } /// @copydoc details::generic_sequence::operator[] inline element_type operator[](CORBA::ULong i) { diff --git a/TAO/tao/Unbounded_Sequence_CDR_T.h b/TAO/tao/Unbounded_Sequence_CDR_T.h index b4793d3a43d..ee925f249b9 100644 --- a/TAO/tao/Unbounded_Sequence_CDR_T.h +++ b/TAO/tao/Unbounded_Sequence_CDR_T.h @@ -526,7 +526,7 @@ namespace TAO { return false; } for(CORBA::ULong i = 0; i < length; ++i) { - if (!TAO::Objref_Traits<objec_t>::marshal (source[i].in (), strm)) { + if (!TAO::Objref_Traits<objec_t>::marshal (source[i], strm)) { return false; } } |