1 files changed, 20 insertions, 76 deletions

diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h
index 72c2cb20624..dd1ec663ffa 100644
--- a/TAO/tao/PI/ORBInitInfo.h
+++ b/TAO/tao/PI/ORBInitInfo.h
@@ -77,20 +77,14 @@ public:
   //@{
   /// Return the argument vector for the ORB currently being
   /// initialized as a string sequence.
-  virtual CORBA::StringSeq * arguments (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::StringSeq * arguments (void);
 
   /// Return the ORBid for the ORB currently being initialized.
-  virtual char * orb_id (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * orb_id (void);
 
   /// Return the CodecFactory for the ORB currently being
   /// initialized.
-  virtual IOP::CodecFactory_ptr codec_factory (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual IOP::CodecFactory_ptr codec_factory (void);
 
   /// Register a mapping between a string and a corresponding object
   /// reference with the ORB being initialized.
@@ -102,93 +96,57 @@ public:
    * resolve_initial_references() that may be called in the
    * ORBInitializer::post_init() call.
    */
-  virtual void register_initial_reference (
-      const char * id,
-      CORBA::Object_ptr obj
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ORBInitInfo::InvalidName));
+  virtual void register_initial_reference (const char * id, CORBA::Object_ptr obj);
 
   /// Obtain a reference to an object that may not yet be available
   /// via the usual CORBA::ORB::resolve_initial_references() mechanism
   /// since the ORB may not be fully initialized yet.
-  virtual CORBA::Object_ptr resolve_initial_references (
-      const char * id
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ORBInitInfo::InvalidName));
+  virtual CORBA::Object_ptr resolve_initial_references (const char * id);
 
   /// Register a client request interceptor with the ORB currently
   /// being initialized.
   virtual void add_client_request_interceptor (
-      PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ORBInitInfo::DuplicateName));
+      PortableInterceptor::ClientRequestInterceptor_ptr interceptor);
 
   /// Register a server request interceptor with the ORB currently
   /// being initialized.
   virtual void add_server_request_interceptor (
-      PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ORBInitInfo::DuplicateName));
+      PortableInterceptor::ServerRequestInterceptor_ptr interceptor);
 
   /// Register an IOR interceptor with the ORB currently being
   /// initialized.
   virtual void add_ior_interceptor (
-      PortableInterceptor::IORInterceptor_ptr interceptor
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ORBInitInfo::DuplicateName));
+      PortableInterceptor::IORInterceptor_ptr interceptor);
 
   /// Register a client request interceptor with the ORB currently
   /// being initialized, along with a list of policies.
   virtual void add_client_request_interceptor_with_policy (
       PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
-      const CORBA::PolicyList& policies
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ORBInitInfo::DuplicateName,
-                     CORBA::PolicyError));
+      const CORBA::PolicyList& policies);
 
   /// Register a server request interceptor with the ORB currently
   /// being initialized, along with a list of policies.
   virtual void add_server_request_interceptor_with_policy (
       PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-      const CORBA::PolicyList& policies
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ORBInitInfo::DuplicateName,
-                     CORBA::PolicyError));
+      const CORBA::PolicyList& policies);
 
   /// Register an IOR interceptor with the ORB currently being
   /// initialized, along with a list of policies.
   virtual void add_ior_interceptor_with_policy (
       PortableInterceptor::IORInterceptor_ptr interceptor,
-      const CORBA::PolicyList& policies
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ORBInitInfo::DuplicateName,
-                     CORBA::PolicyError));
+      const CORBA::PolicyList& policies);
 
   /// Reserve a slot in table found within the
   /// PortableInterceptor::Current object.
-  virtual PortableInterceptor::SlotId allocate_slot_id (
-      void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual PortableInterceptor::SlotId allocate_slot_id (void);
 
   /// Register a policy factory of the given policy type with the ORB
   /// currently being initialized.
   virtual void register_policy_factory (
       CORBA::PolicyType type,
-      PortableInterceptor::PolicyFactory_ptr policy_factory
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::PolicyFactory_ptr policy_factory);
 
-  virtual CORBA::ORB_ptr _get_orb (
-      void
-    );
+  virtual CORBA::ORB_ptr _get_orb (void);
   //@}
 
   /**
@@ -208,10 +166,7 @@ public:
    * An accompanying cleanup function (e.g. a TSS destructor) can also
    * be registered.
    */
-  size_t allocate_tss_slot_id (
-      ACE_CLEANUP_FUNC cleanup
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  size_t allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup);
 
   /// Return a pointer to the ORB Core associated with the ORB being
   /// initialized.
@@ -247,14 +202,10 @@ public:
 
   static TAO_ORBInitInfo_ptr _duplicate (TAO_ORBInitInfo_ptr obj);
 
-  static TAO_ORBInitInfo_ptr _narrow (
-      CORBA::Object_ptr obj
-      );
+  static TAO_ORBInitInfo_ptr _narrow (CORBA::Object_ptr obj);
 
 
-  static TAO_ORBInitInfo_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj
-      );
+  static TAO_ORBInitInfo_ptr _unchecked_narrow (CORBA::Object_ptr obj);
 
 
   static TAO_ORBInitInfo_ptr _nil (void)
@@ -311,17 +262,10 @@ namespace TAO
   template<>
   struct TAO_PI_Export Objref_Traits<TAO_ORBInitInfo>
   {
-    static TAO_ORBInitInfo_ptr duplicate (
-        TAO_ORBInitInfo_ptr
-      );
-    static void release (
-        TAO_ORBInitInfo_ptr
-      );
+    static TAO_ORBInitInfo_ptr duplicate (TAO_ORBInitInfo_ptr);
+    static void release (TAO_ORBInitInfo_ptr);
     static TAO_ORBInitInfo_ptr nil (void);
-    static CORBA::Boolean marshal (
-        TAO_ORBInitInfo_ptr p,
-        TAO_OutputCDR & cdr
-      );
+    static CORBA::Boolean marshal (TAO_ORBInitInfo_ptr p, TAO_OutputCDR & cdr);
   };
 }