diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-03-01 18:02:44 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-03-01 18:02:44 +0000 |
| commit | c75e5903bacb9e4473c38894fed2c1db7ee7dbf3 (patch) | |
| tree | 7c06ca06117d2eff77631a7cd1ac138b3c8868ae /TAO/tao/OctetSeqC.i | |
| parent | 2083458af17abd210d52f5fabb99e879981640ab (diff) | |
| download | ATCD-c75e5903bacb9e4473c38894fed2c1db7ee7dbf3.tar.gz | |
ChangeLogTag:Thu Mar 01 09:38:28 2001 Ossama Othman <ossama@uci.edu>
Diffstat (limited to 'TAO/tao/OctetSeqC.i')
| -rw-r--r-- | TAO/tao/OctetSeqC.i | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/TAO/tao/OctetSeqC.i b/TAO/tao/OctetSeqC.i index 67f4514fe1d..01ffb2d3fba 100644 --- a/TAO/tao/OctetSeqC.i +++ b/TAO/tao/OctetSeqC.i @@ -20,11 +20,11 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html -#if !defined (TAO_OCTETSEQ_CI) -#define TAO_OCTETSEQ_CI +#if !defined (_CORBA_OCTETSEQ_CI_) +#define _CORBA_OCTETSEQ_CI_ // ************************************************************* -// Inline operations for class CORBA_OctetSeq_var +// Inline operations for class CORBA::OctetSeq_var // ************************************************************* ACE_INLINE @@ -67,8 +67,8 @@ CORBA_OctetSeq_var::operator= (CORBA_OctetSeq *p) return *this; } -ACE_INLINE CORBA_OctetSeq_var & -CORBA_OctetSeq_var::operator= (const ::CORBA_OctetSeq_var &p) // deep copy +ACE_INLINE ::CORBA_OctetSeq_var & +CORBA_OctetSeq_var::operator= (const ::CORBA_OctetSeq_var &p) { if (this != &p) { @@ -79,7 +79,8 @@ CORBA_OctetSeq_var::operator= (const ::CORBA_OctetSeq_var &p) // deep copy } else { - CORBA_OctetSeq *deep_copy = new CORBA_OctetSeq (*p.ptr_); + CORBA_OctetSeq *deep_copy = + new CORBA_OctetSeq (*p.ptr_); if (deep_copy != 0) { @@ -249,8 +250,8 @@ CORBA_OctetSeq_out::operator[] (CORBA::ULong index) #endif /* end #if !defined */ -#if !defined TAO_TAO_CDR_OP_CORBA_OctetSeq_I -#define TAO_TAO_CDR_OP_CORBA_OctetSeq_I +#if !defined _TAO_CDR_OP_CORBA_OctetSeq_I_ +#define _TAO_CDR_OP_CORBA_OctetSeq_I_ CORBA::Boolean TAO_Export operator<< ( TAO_OutputCDR &, @@ -261,5 +262,5 @@ CORBA::Boolean TAO_Export operator>> ( CORBA_OctetSeq & ); -#endif /* TAO_TAO_CDR_OP_CORBA_OctetSeq_I */ +#endif /* _TAO_CDR_OP_CORBA_OctetSeq_I_ */ |