diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-02-07 02:30:40 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-02-07 02:30:40 +0000 |
| commit | 1a00949506a4d2d177eb83f46c533493f26a6ba4 (patch) | |
| tree | 152cbd3f60bb5e872f25c218153af6a529bc364f /TAO/tao/CDR.h | |
| parent | 482084e736e112ffe0275d1a213670d2d3654bee (diff) | |
| download | ATCD-1a00949506a4d2d177eb83f46c533493f26a6ba4.tar.gz | |
ChangeLogTag:Sat Feb 6 19:56:27 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'TAO/tao/CDR.h')
| -rw-r--r-- | TAO/tao/CDR.h | 68 |
1 files changed, 46 insertions, 22 deletions
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index d2a1004e773..bd1032e3da5 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -220,19 +220,7 @@ public: // described by <tc>; returning any errors in <TAO_IN_ENV>. }; -#if defined(__ACE_INLINE__) -# include "tao/CDR.i" -#else - -// CDR output operators for CORBA types - -// This one must be redefined in TAO to ease some compilers' -// overload resolution difficulties in -// TAO_GIOP_Service_Context and TAO_GIOP_Invocation. -// It simply calls the ACE operator inline. -extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr, - CORBA::ULong x); - +// This operators are too complex to be inline.... extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr, const CORBA::Any &x); extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr, @@ -240,15 +228,6 @@ extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr, extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr, const CORBA::TypeCode *x); -// CDR input operators for CORBA types - -// This one must be redefined in TAO to ease some compilers' -// overload resolution difficulties in -// TAO_GIOP_Service_Context and TAO_GIOP_Invocation. -// It simply calls the ACE operator inline. -extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr, - CORBA::ULong x); - extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr, CORBA::Any &x); extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr, @@ -256,6 +235,51 @@ extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr, extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr, CORBA::TypeCode *&x); +#if defined(__ACE_INLINE__) +# include "tao/CDR.i" +#else + +// CDR output operators for CORBA types + +extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, + CORBA::Short x); +extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, + CORBA::UShort x); +extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, + CORBA::Long x); +extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, + CORBA::ULong x); +extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, + CORBA::LongLong x); +extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, + CORBA::ULongLong x); +extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR& os, + CORBA::LongDouble x); +extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, + CORBA::Float x); +extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, + CORBA::Double x); + +// CDR input operators for CORBA types + +extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, + CORBA::Short &x); +extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, + CORBA::UShort &x); +extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, + CORBA::Long &x); +extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, + CORBA::ULong &x); +extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, + CORBA::LongLong &x); +extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, + CORBA::ULongLong &x); +extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, + CORBA::LongDouble &x); +extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, + CORBA::Float &x); +extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, + CORBA::Double &x); #endif /* __ACE_INLINE */ |