ChangeLogTag:Thu Mar 11 19:07:20 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

1 files changed, 21 insertions, 25 deletions

diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
index 4d7721a6b66..35bb33eb0df 100644
--- a/TAO/tao/CDR.h
+++ b/TAO/tao/CDR.h
@@ -85,7 +85,7 @@ public:
   // Default constructor, allocates <size> bytes in the internal
   // buffer, if <size> == 0 it allocates the default size.
 
-  TAO_OutputCDR (char *data, 
+  TAO_OutputCDR (char *data,
                  size_t size,
                  int byte_order = ACE_CDR_BYTE_ORDER,
                  ACE_Allocator* buffer_allocator = 0,
@@ -105,7 +105,7 @@ public:
 
   CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
       TAO_InputCDR *src,
-      CORBA_Environment &TAO_IN_ENV = 
+      CORBA_Environment &TAO_IN_ENV =
         CORBA::default_environment ());
   // Append the contents of the CDR stream based on information
   // described by <tc>; returning any errors in <TAO_IN_ENV>.
@@ -118,7 +118,7 @@ public:
   CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
       const void *data,
       const void *,
-      CORBA_Environment &TAO_IN_ENV = 
+      CORBA_Environment &TAO_IN_ENV =
         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.
@@ -155,7 +155,7 @@ public:
   friend class TAO_GIOP;
   // This class is able to "read" an InputCDR from a socket.
 
-  TAO_InputCDR (const char* buf, 
+  TAO_InputCDR (const char* buf,
                 size_t bufsiz,
                 int byte_order = ACE_CDR_BYTE_ORDER);
   // Create an input stream from an arbitrary buffer, care must be
@@ -191,7 +191,7 @@ public:
   // This creates an encapsulated stream, the first byte must be (per
   // the spec) the byte order of the encapsulation.
 
-  // The default values for the allocators 
+  // The default values for the allocators
   // in this constructor are not 0, but are generated by the
   // ORB. Refer to the constructor body in CDR.cpp for the
   // code that supplies these values to the base class constructor.
@@ -210,14 +210,14 @@ public:
       CORBA::TypeCode_ptr tc,
       const void *data,
       const void *,
-      CORBA_Environment &TAO_IN_ENV = 
+      CORBA_Environment &TAO_IN_ENV =
         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 &TAO_IN_ENV =
         CORBA::default_environment ());
   // Skip the contents of the CDR stream based on information
   // described by <tc>; returning any errors in <TAO_IN_ENV>.
@@ -227,15 +227,11 @@ public:
 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__)
@@ -244,13 +240,13 @@ extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR& cdr,
 
 // CDR output operators for CORBA types
 
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, 
+extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
                                              CORBA::Short x);
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, 
+extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
                                              CORBA::UShort x);
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, 
+extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
                                              CORBA::Long x);
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, 
+extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
                                              CORBA::ULong x);
 extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
                                              CORBA::LongLong x);
@@ -258,22 +254,22 @@ 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, 
+extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
                                              CORBA::Float x);
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, 
+extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
                                              CORBA::Double x);
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, 
+extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
                                              const CORBA::Char* x);
 
 // CDR input operators for CORBA types
 
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, 
+extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
                                              CORBA::Short &x);
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, 
+extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
                                              CORBA::UShort &x);
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, 
+extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
                                              CORBA::Long &x);
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, 
+extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
                                              CORBA::ULong &x);
 extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
                                              CORBA::LongLong &x);
@@ -281,11 +277,11 @@ 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, 
+extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
                                              CORBA::Float &x);
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, 
+extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
                                              CORBA::Double &x);
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, 
+extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
                                              CORBA::Char* &x);
 
 #endif /* __ACE_INLINE */