ChangeLogTag: Thu Jan 15 16:10:27 2004 Jeff Parsons <j.parsons@vanderbilt.edu>

1 files changed, 67 insertions, 65 deletions

diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index b86f29dd6c2..36f87f74124 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -362,76 +362,78 @@ namespace CORBA
   // inside the ORB.  All minor codes should be symbolically catalogued.
 
 #define TAO_SYSTEM_EXCEPTION(name) \
-  class TAO_Export name : public SystemException \
-  { \
-  public: \
-    name (void); \
-    name (CORBA::ULong code, \
-          CORBA::CompletionStatus completed); \
-    static name * _downcast (CORBA::Exception* exception); \
-    virtual void _raise (void) const; \
-    virtual CORBA::TypeCode_ptr _type (void) const; \
-    static void _tao_any_destructor (void*); \
-    virtual CORBA::Exception *_tao_duplicate (void) const; \
-    static CORBA::SystemException *_tao_create (void); \
-  }; \
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::name &); \
-TAO_Export void operator<<= (CORBA::Any &, CORBA::name *); \
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, \
-                                       const CORBA::name *&)
-
-TAO_SYSTEM_EXCEPTION(UNKNOWN);          // the unknown exception
-TAO_SYSTEM_EXCEPTION(BAD_PARAM);        // an invalid parameter was passed
-TAO_SYSTEM_EXCEPTION(NO_MEMORY);        // memory allocation failure
-TAO_SYSTEM_EXCEPTION(IMP_LIMIT);        // violated implementation limit
-TAO_SYSTEM_EXCEPTION(COMM_FAILURE);     // communication failure
-TAO_SYSTEM_EXCEPTION(INV_OBJREF);       // invalid object reference
-TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST); // no such object
-TAO_SYSTEM_EXCEPTION(NO_PERMISSION);    // no permission for operation
-TAO_SYSTEM_EXCEPTION(INTERNAL);         // ORB internal error
-TAO_SYSTEM_EXCEPTION(MARSHAL);          // error marshaling param/result
-TAO_SYSTEM_EXCEPTION(INITIALIZE);       // ORB initialization failure
-TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT);     // implementation unavailable
-TAO_SYSTEM_EXCEPTION(BAD_TYPECODE);     // bad typecode
-TAO_SYSTEM_EXCEPTION(BAD_OPERATION);    // invalid operation
-TAO_SYSTEM_EXCEPTION(NO_RESOURCES);     // out of resources for request
-TAO_SYSTEM_EXCEPTION(NO_RESPONSE);      // response not yet available
-TAO_SYSTEM_EXCEPTION(PERSIST_STORE);    // persistent storage failure
-TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER);    // routine invocations out of order
-TAO_SYSTEM_EXCEPTION(TRANSIENT);        // transient error, try again later
-TAO_SYSTEM_EXCEPTION(FREE_MEM);         // cannot free memory
-TAO_SYSTEM_EXCEPTION(INV_IDENT);        // invalid identifier syntax
-TAO_SYSTEM_EXCEPTION(INV_FLAG);         // invalid flag was specified
-TAO_SYSTEM_EXCEPTION(INTF_REPOS);       // interface repository unavailable
-TAO_SYSTEM_EXCEPTION(BAD_CONTEXT);      // error processing context object
-TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER);      // object adapter failure
-TAO_SYSTEM_EXCEPTION(DATA_CONVERSION);  // data conversion error
-TAO_SYSTEM_EXCEPTION(INV_POLICY);       // invalid policies present
-TAO_SYSTEM_EXCEPTION(REBIND);           // rebind needed
-TAO_SYSTEM_EXCEPTION(TIMEOUT);          // operation timed out
-TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE); // no transaction
-TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE);        // invalid transaction mode
-TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED);    // operation needs transaction
-TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK);  // operation was a no-op
-TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION);     // invalid TP context passed
-TAO_SYSTEM_EXCEPTION(CODESET_INCOMPATIBLE);    // incompatible code set
-TAO_SYSTEM_EXCEPTION(BAD_QOS);          // bad quality of service
-TAO_SYSTEM_EXCEPTION(INVALID_ACTIVITY);
-TAO_SYSTEM_EXCEPTION(ACTIVITY_COMPLETED);
-TAO_SYSTEM_EXCEPTION(ACTIVITY_REQUIRED);
-TAO_SYSTEM_EXCEPTION(THREAD_CANCELLED);
-
-#undef TAO_SYSTEM_EXCEPTION
-
-} // End CORBA namespace
+    class TAO_Export name : public SystemException \
+    { \
+    public: \
+      name (void); \
+      name (CORBA::ULong code, \
+            CORBA::CompletionStatus completed); \
+      static name * _downcast (CORBA::Exception* exception); \
+      virtual void _raise (void) const; \
+      virtual CORBA::TypeCode_ptr _type (void) const; \
+      static void _tao_any_destructor (void*); \
+      virtual CORBA::Exception *_tao_duplicate (void) const; \
+      static CORBA::SystemException *_tao_create (void); \
+    }; \
+  TAO_Export void operator<<= (CORBA::Any &, const CORBA::name &); \
+  TAO_Export void operator<<= (CORBA::Any &, CORBA::name *); \
+  TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, \
+                                         const CORBA::name *&)
+
+  TAO_SYSTEM_EXCEPTION(UNKNOWN);          // the unknown exception
+  TAO_SYSTEM_EXCEPTION(BAD_PARAM);        // an invalid parameter was passed
+  TAO_SYSTEM_EXCEPTION(NO_MEMORY);        // memory allocation failure
+  TAO_SYSTEM_EXCEPTION(IMP_LIMIT);        // violated implementation limit
+  TAO_SYSTEM_EXCEPTION(COMM_FAILURE);     // communication failure
+  TAO_SYSTEM_EXCEPTION(INV_OBJREF);       // invalid object reference
+  TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST); // no such object
+  TAO_SYSTEM_EXCEPTION(NO_PERMISSION);    // no permission for operation
+  TAO_SYSTEM_EXCEPTION(INTERNAL);         // ORB internal error
+  TAO_SYSTEM_EXCEPTION(MARSHAL);          // error marshaling param/result
+  TAO_SYSTEM_EXCEPTION(INITIALIZE);       // ORB initialization failure
+  TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT);     // implementation unavailable
+  TAO_SYSTEM_EXCEPTION(BAD_TYPECODE);     // bad typecode
+  TAO_SYSTEM_EXCEPTION(BAD_OPERATION);    // invalid operation
+  TAO_SYSTEM_EXCEPTION(NO_RESOURCES);     // out of resources for request
+  TAO_SYSTEM_EXCEPTION(NO_RESPONSE);      // response not yet available
+  TAO_SYSTEM_EXCEPTION(PERSIST_STORE);    // persistent storage failure
+  TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER);    // routine invocations out of order
+  TAO_SYSTEM_EXCEPTION(TRANSIENT);        // transient error, try again later
+  TAO_SYSTEM_EXCEPTION(FREE_MEM);         // cannot free memory
+  TAO_SYSTEM_EXCEPTION(INV_IDENT);        // invalid identifier syntax
+  TAO_SYSTEM_EXCEPTION(INV_FLAG);         // invalid flag was specified
+  TAO_SYSTEM_EXCEPTION(INTF_REPOS);       // interface repository unavailable
+  TAO_SYSTEM_EXCEPTION(BAD_CONTEXT);      // error processing context object
+  TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER);      // object adapter failure
+  TAO_SYSTEM_EXCEPTION(DATA_CONVERSION);  // data conversion error
+  TAO_SYSTEM_EXCEPTION(INV_POLICY);       // invalid policies present
+  TAO_SYSTEM_EXCEPTION(REBIND);           // rebind needed
+  TAO_SYSTEM_EXCEPTION(TIMEOUT);          // operation timed out
+  TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE); // no transaction
+  TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE);        // invalid transaction mode
+  TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED);    // operation needs transaction
+  TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK);  // operation was a no-op
+  TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION);     // invalid TP context passed
+  TAO_SYSTEM_EXCEPTION(CODESET_INCOMPATIBLE);    // incompatible code set
+  TAO_SYSTEM_EXCEPTION(BAD_QOS);          // bad quality of service
+  TAO_SYSTEM_EXCEPTION(INVALID_ACTIVITY);
+  TAO_SYSTEM_EXCEPTION(ACTIVITY_COMPLETED);
+  TAO_SYSTEM_EXCEPTION(ACTIVITY_REQUIRED);
+  TAO_SYSTEM_EXCEPTION(THREAD_CANCELLED);
+
+  #undef TAO_SYSTEM_EXCEPTION
 
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
 
-// Convenient ostream operator.
-TAO_Export ostream& operator<< (ostream &os,
-                                const CORBA::Exception &e);
+  // Required by C++ mapping.
+  TAO_Export ostream& operator<< (ostream &os,
+                                  const CORBA::Exception &e);
+
+  TAO_Export ostream& operator<< (ostream &os,
+                                  const CORBA::Exception *e);
 
 #endif /* (ACE_LACKS_IOSTREAM_TOTALLY) */
+} // End CORBA namespace
 
 /**
  * @class TAO_Exceptions