1 files changed, 24 insertions, 49 deletions

diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h
index 22abd55b4d9..e22d0b7be52 100644
--- a/TAO/tao/PI/ClientRequestInfo.h
+++ b/TAO/tao/PI/ClientRequestInfo.h
@@ -79,51 +79,42 @@ public:
   /// Return an ID unique to the current request.  This request ID may
   /// or may not be the same as the GIOP request ID.
   virtual CORBA::ULong request_id (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 
   /// Return the operation name for the current request.
   virtual char * operation (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 
   /// Return the list of arguments passed to the current operation.
   virtual Dynamic::ParameterList * arguments (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 
   /// Return the list of exceptions the current operation is capable
   /// of throwing.
   virtual Dynamic::ExceptionList * exceptions (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 
   virtual Dynamic::ContextList * contexts (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 
   virtual Dynamic::RequestContext * operation_context (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 
   /// Return the result of the current request.  If there is no return
   /// value then an Any with tk_void TypeCode is returned.  This is
   /// method is not valid for oneway operations.
   virtual CORBA::Any * result (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 
   /// Returns true for a two-way operation, and false otherwise.
   virtual CORBA::Boolean response_expected (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException)) ;
+      void);
 
   /// Return the sync_scope policy value for the current one-way
   /// operation.  If the operation is not a one-way, a
   /// CORBA::BAD_INV_ORDER exception is thrown.
   virtual Messaging::SyncScope sync_scope (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 
   /// Return the reply status for the current request.
   /**
@@ -132,50 +123,41 @@ public:
    * TRANSPORT_RETRY, UNKNOWN.
    */
   virtual PortableInterceptor::ReplyStatus reply_status (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 
   /// If the reply status is PortableInterceptor::LOCATION_FORWARD or
   /// return the object reference to which the request was forwarded.
   virtual CORBA::Object_ptr forward_reference (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException)) ;
+      void);
 
   virtual CORBA::Any * get_slot (
       PortableInterceptor::SlotId id
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::InvalidSlot));
+      );
 
   /// Return the IOP::ServiceContext with the given IOP::ServiceId
   /// from the request service context list.
   virtual IOP::ServiceContext * get_request_service_context (
       IOP::ServiceId id
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
   /// Return the IOP::ServiceContext with the given IOP::ServiceId
   /// from the reply service context list.
   virtual IOP::ServiceContext * get_reply_service_context (
       IOP::ServiceId id
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
   /// Return the (initial, non-forwarded, or permanently forwarded)
   /// object reference of the target.
   virtual CORBA::Object_ptr target (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 
   /// Return the object reference for the current target.  The target
   /// may change in the even of a location forward.
   virtual CORBA::Object_ptr effective_target (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 
   virtual IOP::TaggedProfile * effective_profile (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 
   /// Return an Any containing the received exception, if any.
   /// Otherwise, throw a CORBA::BAD_INV_ORDER exception.
@@ -183,44 +165,38 @@ public:
    * @note There is no trivial way to extract the exception from an Any.
    */
   virtual CORBA::Any * received_exception (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 
   /// Return the repository ID for the received exception.
   virtual char * received_exception_id (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      void);
 
   /// Return the first IOP::TaggedComponent that matches the given
   /// IOP::ComponentId in the object reference for the current
   /// target.
   virtual IOP::TaggedComponent * get_effective_component (
       IOP::ComponentId id
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
   /// Return all IOP::TaggedComponent(s) that match the given
   /// IOP::ComponentId in the object reference for the current
   /// target.
   virtual IOP::TaggedComponentSeq * get_effective_components (
       IOP::ComponentId id
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
   /// Return the policy of the given type in effect for the current
   /// request.
   virtual CORBA::Policy_ptr get_request_policy (
       CORBA::PolicyType type
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
   /// Add the IOP::ServiceContext to the request (outgoing)
   /// IOP::ServiceContextList.
   virtual void add_request_service_context (
       const IOP::ServiceContext & service_context,
       CORBA::Boolean replace
-      )
-     ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
   /*
   * Proprietary accessor methods for the FT retention ID and
@@ -263,8 +239,7 @@ private:
   IOP::ServiceContext *get_service_context_i (
       TAO_Service_Context &service_context_list,
       IOP::ServiceId id
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
 private:
   /// Pointer to the invocation object.