summaryrefslogtreecommitdiff
path: root/TAO/tao/Sequence.i
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/Sequence.i')
-rw-r--r--TAO/tao/Sequence.i162
1 files changed, 98 insertions, 64 deletions
diff --git a/TAO/tao/Sequence.i b/TAO/tao/Sequence.i
index 9ab782198aa..5bb59f9bb63 100644
--- a/TAO/tao/Sequence.i
+++ b/TAO/tao/Sequence.i
@@ -15,7 +15,7 @@ TAO_Base_Sequence::TAO_Base_Sequence (void)
ACE_INLINE
TAO_Base_Sequence::TAO_Base_Sequence (CORBA::ULong maximum,
CORBA::ULong length,
- void *buffer,
+ void * buffer,
CORBA::Boolean release)
: maximum_ (maximum),
length_ (length),
@@ -26,7 +26,7 @@ TAO_Base_Sequence::TAO_Base_Sequence (CORBA::ULong maximum,
ACE_INLINE
TAO_Base_Sequence::TAO_Base_Sequence (CORBA::ULong maximum,
- void *data)
+ void * data)
: maximum_ (maximum),
length_ (0),
buffer_ (data),
@@ -35,7 +35,7 @@ TAO_Base_Sequence::TAO_Base_Sequence (CORBA::ULong maximum,
}
ACE_INLINE
-TAO_Base_Sequence::TAO_Base_Sequence (const TAO_Base_Sequence &rhs)
+TAO_Base_Sequence::TAO_Base_Sequence (const TAO_Base_Sequence & rhs)
: maximum_ (rhs.maximum_),
length_ (rhs.length_),
buffer_ (0),
@@ -43,14 +43,16 @@ TAO_Base_Sequence::TAO_Base_Sequence (const TAO_Base_Sequence &rhs)
{
}
-ACE_INLINE CORBA::Boolean
+ACE_INLINE
+CORBA::Boolean
TAO_Base_Sequence::release (void) const
{
return this->release_;
}
-ACE_INLINE TAO_Base_Sequence &
-TAO_Base_Sequence::operator= (const TAO_Base_Sequence &rhs)
+ACE_INLINE
+TAO_Base_Sequence &
+TAO_Base_Sequence::operator= (const TAO_Base_Sequence & rhs)
{
this->maximum_ = rhs.maximum_;
this->length_ = rhs.length_;
@@ -58,7 +60,8 @@ TAO_Base_Sequence::operator= (const TAO_Base_Sequence &rhs)
return *this;
}
-ACE_INLINE CORBA::ULong
+ACE_INLINE
+CORBA::ULong
TAO_Base_Sequence::maximum (void) const
{
return this->maximum_;
@@ -72,30 +75,34 @@ TAO_Unbounded_Base_Sequence::TAO_Unbounded_Base_Sequence (void)
}
ACE_INLINE
-TAO_Unbounded_Base_Sequence::
-TAO_Unbounded_Base_Sequence (CORBA::ULong maximum,
- CORBA::ULong length,
- void* buffer,
- CORBA::Boolean release)
+TAO_Unbounded_Base_Sequence::TAO_Unbounded_Base_Sequence (
+ CORBA::ULong maximum,
+ CORBA::ULong length,
+ void * buffer,
+ CORBA::Boolean release
+ )
: TAO_Base_Sequence (maximum, length, buffer, release)
{
}
ACE_INLINE
-TAO_Unbounded_Base_Sequence::
-TAO_Unbounded_Base_Sequence (CORBA::ULong maximum,
- void* buffer)
+TAO_Unbounded_Base_Sequence::TAO_Unbounded_Base_Sequence (
+ CORBA::ULong maximum,
+ void * buffer
+ )
: TAO_Base_Sequence (maximum, buffer)
{
}
-ACE_INLINE CORBA::ULong
+ACE_INLINE
+CORBA::ULong
TAO_Unbounded_Base_Sequence::length (void) const
{
return this->length_;
}
-ACE_INLINE void
+ACE_INLINE
+void
TAO_Unbounded_Base_Sequence::length (CORBA::ULong length)
{
if (length > this->maximum_)
@@ -108,6 +115,7 @@ TAO_Unbounded_Base_Sequence::length (CORBA::ULong length)
{
this->_shrink_buffer (length, this->length_);
}
+
this->length_ = length;
}
@@ -119,30 +127,34 @@ TAO_Bounded_Base_Sequence::TAO_Bounded_Base_Sequence (void)
}
ACE_INLINE
-TAO_Bounded_Base_Sequence::
-TAO_Bounded_Base_Sequence (CORBA::ULong maximum,
- CORBA::ULong length,
- void* buffer,
- CORBA::Boolean release)
+TAO_Bounded_Base_Sequence::TAO_Bounded_Base_Sequence (
+ CORBA::ULong maximum,
+ CORBA::ULong length,
+ void * buffer,
+ CORBA::Boolean release
+ )
: TAO_Base_Sequence (maximum, length, buffer, release)
{
}
ACE_INLINE
-TAO_Bounded_Base_Sequence::
-TAO_Bounded_Base_Sequence (CORBA::ULong maximum,
- void* buffer)
+TAO_Bounded_Base_Sequence::TAO_Bounded_Base_Sequence (
+ CORBA::ULong maximum,
+ void * buffer
+ )
: TAO_Base_Sequence (maximum, buffer)
{
}
-ACE_INLINE CORBA::ULong
+ACE_INLINE
+CORBA::ULong
TAO_Bounded_Base_Sequence::length (void) const
{
return this->length_;
}
-ACE_INLINE void
+ACE_INLINE
+void
TAO_Bounded_Base_Sequence::length (CORBA::ULong length)
{
if (this->buffer_ == 0)
@@ -165,18 +177,18 @@ TAO_Bounded_Base_Sequence::length (CORBA::ULong length)
// ****************************************************************
-//default constructors
ACE_INLINE
TAO_Unbounded_String_Sequence::TAO_Unbounded_String_Sequence (void)
{
}
ACE_INLINE
-TAO_Unbounded_String_Sequence::
-TAO_Unbounded_String_Sequence (CORBA::ULong maximum,
- CORBA::ULong length,
- char* *value,
- CORBA::Boolean release)
+TAO_Unbounded_String_Sequence::TAO_Unbounded_String_Sequence (
+ CORBA::ULong maximum,
+ CORBA::ULong length,
+ char ** value,
+ CORBA::Boolean release
+ )
: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
{
}
@@ -187,25 +199,28 @@ TAO_Unbounded_WString_Sequence::TAO_Unbounded_WString_Sequence (void)
}
ACE_INLINE
-TAO_Unbounded_WString_Sequence::
-TAO_Unbounded_WString_Sequence (CORBA::ULong maximum,
- CORBA::ULong length,
- CORBA::WChar* *value,
- CORBA::Boolean release)
+TAO_Unbounded_WString_Sequence::TAO_Unbounded_WString_Sequence (
+ CORBA::ULong maximum,
+ CORBA::ULong length,
+ CORBA::WChar ** value,
+ CORBA::Boolean release
+ )
: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
{
}
// ****************************************************************
-ACE_INLINE CORBA::Octet *
+ACE_INLINE
+CORBA::Octet *
TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (CORBA::ULong size)
{
return new CORBA::Octet[size];
}
-ACE_INLINE void
-TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (CORBA::Octet *buffer)
+ACE_INLINE
+void
+TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (CORBA::Octet * buffer)
{
delete [] buffer;
}
@@ -219,9 +234,13 @@ TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (void)
}
ACE_INLINE
-TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (CORBA::ULong maximum)
- : TAO_Unbounded_Base_Sequence (maximum,
- TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (maximum))
+TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (
+ CORBA::ULong maximum
+ )
+ : TAO_Unbounded_Base_Sequence (
+ maximum,
+ TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (maximum)
+ )
#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
, mb_ (0)
#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
@@ -229,10 +248,12 @@ TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (CORBA::ULong maxim
}
ACE_INLINE
-TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (CORBA::ULong maximum,
- CORBA::ULong length,
- CORBA::Octet *data,
- CORBA::Boolean release)
+TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (
+ CORBA::ULong maximum,
+ CORBA::ULong length,
+ CORBA::Octet * data,
+ CORBA::Boolean release
+ )
: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
, mb_ (0)
@@ -240,18 +261,22 @@ TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (CORBA::ULong maxim
{
}
-ACE_INLINE const CORBA::Octet *
+ACE_INLINE
+const CORBA::Octet *
TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (void) const
{
- return ACE_reinterpret_cast(const CORBA::Octet * ACE_CAST_CONST, this->buffer_);
+ return ACE_reinterpret_cast (const CORBA::Octet * ACE_CAST_CONST,
+ this->buffer_);
}
// This function is a little too big to be inlined, but some compilers
// (Sun/CC 4.1?) die if it isn't :-(
-ACE_INLINE CORBA::Octet *
+ACE_INLINE
+CORBA::Octet *
TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (CORBA::Boolean orphan)
{
- CORBA::Octet *result = 0;
+ CORBA::Octet * result = 0;
+
if (orphan == 0)
{
// We retain ownership.
@@ -259,7 +284,8 @@ TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (CORBA::Boolean orphan)
if (this->buffer_ == 0)
{
// The buffer was not allocated, we must allocate it now.
- result = TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (this->length_);
+ result =
+ TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (this->length_);
this->buffer_ = result;
this->release_ = 1;
}
@@ -287,7 +313,7 @@ TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (CORBA::Boolean orphan)
{
// We set the state back to default and relinquish
// ownership.
- result = ACE_reinterpret_cast(CORBA::Octet*,this->buffer_);
+ result = ACE_reinterpret_cast(CORBA::Octet *, this->buffer_);
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
@@ -297,6 +323,7 @@ TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (CORBA::Boolean orphan)
else
{
result = ACE_reinterpret_cast (CORBA::Octet*,this->buffer_);
+
if (this->release_ != 0)
{
// We set the state back to default and relinquish
@@ -315,24 +342,28 @@ TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (CORBA::Boolean orphan)
return result;
}
-ACE_INLINE CORBA::Octet &
+ACE_INLINE
+CORBA::Octet &
TAO_Unbounded_Sequence<CORBA::Octet>::operator[] (CORBA::ULong i)
{
ACE_ASSERT (i < this->maximum_);
- CORBA::Octet* tmp = ACE_reinterpret_cast(CORBA::Octet*,this->buffer_);
+ CORBA::Octet * tmp = ACE_reinterpret_cast(CORBA::Octet *, this->buffer_);
return tmp[i];
}
-ACE_INLINE const CORBA::Octet &
+ACE_INLINE
+const CORBA::Octet &
TAO_Unbounded_Sequence<CORBA::Octet>::operator[] (CORBA::ULong i) const
{
ACE_ASSERT (i < this->maximum_);
- CORBA::Octet * const tmp = ACE_reinterpret_cast (CORBA::Octet* ACE_CAST_CONST, this->buffer_);
+ CORBA::Octet * const tmp =
+ ACE_reinterpret_cast (CORBA::Octet * ACE_CAST_CONST, this->buffer_);
return tmp[i];
}
#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-ACE_INLINE ACE_Message_Block*
+ACE_INLINE
+ACE_Message_Block *
TAO_Unbounded_Sequence<CORBA::Octet>::mb (void) const
{
return this->mb_;
@@ -340,7 +371,7 @@ TAO_Unbounded_Sequence<CORBA::Octet>::mb (void) const
ACE_INLINE void
TAO_Unbounded_Sequence<CORBA::Octet>::replace (CORBA::ULong length,
- const ACE_Message_Block* mb)
+ const ACE_Message_Block * mb)
{
this->_deallocate_buffer ();
@@ -365,7 +396,7 @@ TAO_Unbounded_Sequence<CORBA::Octet>::replace (CORBA::ULong length,
ACE_CDR::MAX_ALIGNMENT);
// Get the base pointer of the incoming message block
- char *start = ACE_ptr_align_binary (mb->base (),
+ char * start = ACE_ptr_align_binary (mb->base (),
ACE_CDR::MAX_ALIGNMENT);
// Get the read and write displacements in the incoming stream
@@ -386,10 +417,11 @@ TAO_Unbounded_Sequence<CORBA::Octet>::replace (CORBA::ULong length,
#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
-ACE_INLINE void
+ACE_INLINE
+void
TAO_Unbounded_Sequence<CORBA::Octet>::replace (CORBA::ULong max,
CORBA::ULong length,
- CORBA::Octet *data,
+ CORBA::Octet * data,
CORBA::Boolean release)
{
this->maximum_ = max;
@@ -405,9 +437,11 @@ TAO_Unbounded_Sequence<CORBA::Octet>::replace (CORBA::ULong max,
#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
if (this->buffer_ && this->release_ == 1)
{
- CORBA::Octet* tmp = ACE_reinterpret_cast(CORBA::Octet*,this->buffer_);
+ CORBA::Octet * tmp =
+ ACE_reinterpret_cast(CORBA::Octet *, this->buffer_);
TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (tmp);
}
+
this->buffer_ = data;
this->release_ = release;
}
View Lorry Controller Status