summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2001-03-01 18:13:59 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2001-03-01 18:13:59 +0000
commite91c2d73793a4a208c8266e4dd973a5892cee167 (patch)
tree287d7d4a2c00ceb3f0342888a067e2b1fd9827d9
parent9d8c42c50860e51afef5dadcd409a9988dbfa2f2 (diff)
downloadATCD-e91c2d73793a4a208c8266e4dd973a5892cee167.tar.gz
Fixed typo.
-rw-r--r--TAO/tao/OctetSeqC.cpp33
-rw-r--r--TAO/tao/StringSeqC.cpp35
2 files changed, 33 insertions, 35 deletions
diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp
index 38ceb9b7eac..6775a9448a9 100644
--- a/TAO/tao/OctetSeqC.cpp
+++ b/TAO/tao/OctetSeqC.cpp
@@ -31,7 +31,7 @@
#include "Any.h"
#include "CDR.h"
-#include "TypeCode.h"
+#include "Typecode.h"
#if !defined (_CORBA_OCTETSEQ_CS_)
#define _CORBA_OCTETSEQ_CS_
@@ -43,30 +43,30 @@
CORBA_OctetSeq::CORBA_OctetSeq (void)
{}
CORBA_OctetSeq::CORBA_OctetSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_Sequence<CORBA::Octet>
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
CORBA_OctetSeq::CORBA_OctetSeq (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_Sequence<CORBA::Octet>
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
CORBA_OctetSeq::CORBA_OctetSeq (const CORBA_OctetSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_Sequence<CORBA::Octet>
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
CORBA_OctetSeq::~CORBA_OctetSeq (void) // dtor
@@ -192,20 +192,20 @@ CORBA::Boolean operator<< (
if (strm << _tao_sequence.length ())
{
// encode all elements
-
+
#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
{
- TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+ TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (CORBA_OctetSeq *)&_tao_sequence);
if (oseq->mb ())
return strm.write_octet_array_mb (oseq->mb ());
else
return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
}
-
+
#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+
#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
}
return 0; // error
@@ -222,14 +222,14 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
-
+
#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
{
- TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+ TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
oseq->replace (_tao_seq_len, strm.start ());
oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
@@ -238,12 +238,11 @@ CORBA::Boolean operator>> (
}
else
return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-
+
#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+
#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
}
return 0; // error
}
-
diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp
index 7ccbde43cb7..141e75ec331 100644
--- a/TAO/tao/StringSeqC.cpp
+++ b/TAO/tao/StringSeqC.cpp
@@ -31,7 +31,7 @@
#include "Any.h"
#include "CDR.h"
-#include "TypeCode.h"
+#include "Typecode.h"
#if !defined (_CORBA_STRINGSEQ_CS_)
#define _CORBA_STRINGSEQ_CS_
@@ -43,30 +43,30 @@
CORBA_StringSeq::CORBA_StringSeq (void)
{}
CORBA_StringSeq::CORBA_StringSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_String_Sequence
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
CORBA_StringSeq::CORBA_StringSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_String_Sequence
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
CORBA_StringSeq::CORBA_StringSeq (const CORBA_StringSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_String_Sequence
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
CORBA_StringSeq::~CORBA_StringSeq (void) // dtor
@@ -88,7 +88,7 @@ static const CORBA::Long _oc_CORBA_StringSeq[] =
CORBA::tk_sequence, // typecode kind
16, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
0U,
@@ -107,30 +107,30 @@ CORBA::TypeCode_ptr _tc_CORBA_StringSeq = &_tc_TAO_tc_CORBA_StringSeq;
CORBA_WStringSeq::CORBA_WStringSeq (void)
{}
CORBA_WStringSeq::CORBA_WStringSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_WString_Sequence
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_WString_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
CORBA_WStringSeq::CORBA_WStringSeq (CORBA::ULong max, CORBA::ULong length, CORBA::WChar * *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_WString_Sequence
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_WString_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
CORBA_WStringSeq::CORBA_WStringSeq (const CORBA_WStringSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_WString_Sequence
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_WString_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
CORBA_WStringSeq::~CORBA_WStringSeq (void) // dtor
@@ -152,7 +152,7 @@ static const CORBA::Long _oc_CORBA_WStringSeq[] =
CORBA::tk_sequence, // typecode kind
16, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
- CORBA::tk_wstring,
+ CORBA::tk_wstring,
0U, // string length
0U,
@@ -366,7 +366,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -408,7 +408,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -420,4 +420,3 @@ CORBA::Boolean operator>> (
}
return 0; // error
}
-