diff options
Diffstat (limited to 'TAO/tao/CDR.h')
| -rw-r--r-- | TAO/tao/CDR.h | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index f2ebf583fac..7d44a791f3e 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -44,6 +44,9 @@ #ifndef TAO_CDR_H #define TAO_CDR_H +#include "tao/corbafwd.h" +#include "tao/Marshal.h" + class TAO_Export TAO_OutputCDR : public ACE_OutputCDR { // @@ -103,7 +106,7 @@ public: CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, CORBA_Environment &TAO_IN_ENV = - CORBA_Environment::default_environment ()); + CORBA::default_environment ()); // Append the contents of the CDR stream based on information // described by <tc>; returning any errors in <TAO_IN_ENV>. @@ -116,7 +119,7 @@ public: const void *data, const void *, CORBA_Environment &TAO_IN_ENV = - CORBA_Environment::default_environment ()); + CORBA::default_environment ()); // Marshalls the contents of <data> as described by the TypeCode in // <tc>. Any errors are reported though the <TAO_IN_ENV> parameter. @@ -208,32 +211,32 @@ public: const void *data, const void *, CORBA_Environment &TAO_IN_ENV = - CORBA_Environment::default_environment ()); + CORBA::default_environment ()); // Demarshall the contents of the CDR stream into <data> as // described by <tc>; returning any errors in <TAO_IN_ENV>. CORBA::TypeCode::traverse_status skip ( CORBA::TypeCode_ptr tc, CORBA_Environment &TAO_IN_ENV = - CORBA_Environment::default_environment ()); + CORBA::default_environment ()); // Skip the contents of the CDR stream based on information // described by <tc>; returning any errors in <TAO_IN_ENV>. }; // 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, - const CORBA::Object *x); -extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr, - const CORBA::TypeCode *x); - -extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr, - CORBA::Any &x); -extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr, - CORBA::Object *&x); -extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr, - CORBA::TypeCode *&x); +extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR& cdr, + const CORBA::Any &x); +extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR& cdr, + const CORBA::Object *x); +extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR& cdr, + const CORBA::TypeCode *x); + +extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR& cdr, + CORBA::Any &x); +extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR& cdr, + CORBA::Object *&x); +extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR& cdr, + CORBA::TypeCode *&x); #if defined(__ACE_INLINE__) # include "tao/CDR.i" |