1 files changed, 26 insertions, 76 deletions

diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h
index c19c6893f6f..d2be9d8e200 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.h
+++ b/TAO/tao/PI_Server/ServerRequestInfo.h
@@ -83,50 +83,34 @@ namespace TAO
 
     /// 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));
+    virtual CORBA::ULong request_id (void);
 
     /// Return the operation name for the current request.
-    virtual char * operation (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * operation (void);
 
     /// Return the list of arguments passed to the current operation.
-    virtual Dynamic::ParameterList * arguments (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual Dynamic::ParameterList * arguments (void);
 
     /// Return the list of exceptions the current operation is capable
     /// of throwing.
-    virtual Dynamic::ExceptionList * exceptions (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual Dynamic::ExceptionList * exceptions (void);
 
-    virtual Dynamic::ContextList * contexts (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual Dynamic::ContextList * contexts (void);
 
-    virtual Dynamic::RequestContext * operation_context (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual Dynamic::RequestContext * operation_context (void);
 
     /// Return the result of the current request.  If there is no
     /// return value then an @c Any with @c tk_void @c TypeCode is
     /// returned.  This method is not valid for oneway operations.
-    virtual CORBA::Any * result (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Any * result (void);
 
     /// Returns @c true for a two-way operation, and @c false otherwise.
-    virtual CORBA::Boolean response_expected (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Boolean response_expected (void);
 
     /// Return the @c sync_scope policy value for the current one-way
     /// operation.  If the operation is not a one-way, a
     /// @c CORBA::BAD_INV_ORDER exception is thrown.
-    virtual Messaging::SyncScope sync_scope (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual Messaging::SyncScope sync_scope (void);
 
     /// Return the reply status for the current request.
     /**
@@ -134,37 +118,25 @@ namespace TAO
      * @c SYSTEM_EXCEPTION, @c USER_EXCEPTION, @c LOCATION_FORWARD,
      * @c TRANSPORT_RETRY, @c UNKNOWN..
      */
-    virtual PortableInterceptor::ReplyStatus reply_status (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual PortableInterceptor::ReplyStatus reply_status (void);
 
     /// If the reply status is
     /// @c PortableInterceptor::LOCATION_FORWARD return the
     /// object reference to which the request was forwarded.
-    virtual CORBA::Object_ptr forward_reference (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException)) ;
+    virtual CORBA::Object_ptr forward_reference (void);
 
     /// Retrieve data from the "request scope" @c PICurrent object.
-    virtual CORBA::Any * get_slot (
-                                   PortableInterceptor::SlotId id
-                                   )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::InvalidSlot));
+    virtual CORBA::Any * get_slot (PortableInterceptor::SlotId id);
 
     /// Return the @c IOP::ServiceContext with the given
     /// @c IOP::ServiceId from the request service context list.
     virtual IOP::ServiceContext * get_request_service_context (
-        IOP::ServiceId id
-        )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        IOP::ServiceId id);
 
     /// Return the @c IOP::ServiceContext with the given
     /// @c IOP::ServiceId from the reply service context list.
     virtual IOP::ServiceContext * get_reply_service_context (
-        IOP::ServiceId id
-        )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        IOP::ServiceId id);
 
     /// Return an @c Any containing the exception being sent, if any.
     /// Otherwise, throw a @c CORBA::BAD_INV_ORDER exception.
@@ -172,69 +144,48 @@ namespace TAO
      * @note There is no trivial way to extract the exception from an
      *       @c Any.
      */
-    virtual CORBA::Any * sending_exception (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Any * sending_exception (void);
 
     /// Return the @c ObjectId for the target object.
-    virtual PortableInterceptor::ObjectId * object_id (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual PortableInterceptor::ObjectId * object_id (void);
 
     /// Return the @c AdapterId for the POA handling the current
     /// request.
-    virtual CORBA::OctetSeq * adapter_id (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::OctetSeq * adapter_id (void);
 
     /// Return the server_id of the server. The value is passed to
     /// the ORB via @c -ORBServerId parameter.
-    virtual char * server_id (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * server_id (void);
 
     /// Return the ORBId value that is passed to the @c ORB_init
     /// call.
-    virtual char * orb_id (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * orb_id (void);
 
     /// Return the name of the object adapter that services requests
     /// for the invoked object.
-    virtual PortableInterceptor::AdapterName * adapter_name (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual PortableInterceptor::AdapterName * adapter_name (void);
 
     /// Return the most derived interface of the target object.
-    virtual char * target_most_derived_interface (
-        void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * target_most_derived_interface (void);
 
     /// Return the policy of the given type in effect for the current
     /// request.
-    virtual CORBA::Policy_ptr get_server_policy (
-        CORBA::PolicyType type
-        )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Policy_ptr get_server_policy (CORBA::PolicyType type);
 
     /// Insert data into the "request scope" @c PICurrent object.
     virtual void set_slot (PortableInterceptor::SlotId id,
-                           const CORBA::Any & data
-                           )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::InvalidSlot));
+                           const CORBA::Any & data);
 
     /// Returns true if the target's type corresponds to the given
     /// @c RepositoryId.
-    virtual CORBA::Boolean target_is_a (const char * id
-                                        )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Boolean target_is_a (const char * id);
 
     /// Add the @c IOP::ServiceContext to the reply (outgoing)
     /// @c IOP::ServiceContextList.
     virtual void add_reply_service_context (
         const IOP::ServiceContext & service_context,
         CORBA::Boolean replace
-        )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        );
 
   public:
 
@@ -270,8 +221,7 @@ namespace TAO
     IOP::ServiceContext * get_service_context_i (
         TAO_Service_Context & service_context_list,
         IOP::ServiceId id
-        )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        );
 
   protected: