Sun Feb 11 12:38:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 8 insertions, 25 deletions

diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
index f38a6462b49..266ed9542f6 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
@@ -15,7 +15,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 char *
 TAO::ORT_Adapter_Impl::tao_server_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // No need to duplicate, the ort_template_ method has to do the duplicate
   return this->ort_template_->server_id ();
@@ -23,7 +22,6 @@ TAO::ORT_Adapter_Impl::tao_server_id (void)
 
 char *
 TAO::ORT_Adapter_Impl::tao_orb_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // No need to duplicate, the ort_template_ method has to do the duplicate
   return this->ort_template_->orb_id ();
@@ -31,7 +29,6 @@ TAO::ORT_Adapter_Impl::tao_orb_id (void)
 
 PortableInterceptor::AdapterName *
 TAO::ORT_Adapter_Impl::tao_adapter_name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // No need to duplicate, the ort_template_ method has to do the duplicate
   return this->ort_template_->adapter_name ();
@@ -40,7 +37,6 @@ TAO::ORT_Adapter_Impl::tao_adapter_name (void)
 CORBA::Object_ptr
 TAO::ORT_Adapter_Impl::make_object (const char *repo_id,
                                     const PortableInterceptor::ObjectId &id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->ort_factory_->make_object (repo_id, id);
 }
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
index 3b5c09072de..bdc9af25c20 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
@@ -65,14 +65,11 @@ namespace TAO
      * Methods
      */
     //@{
-    virtual char * tao_server_id (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * tao_server_id (void);
 
-    virtual char * tao_orb_id (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * tao_orb_id (void);
 
-    virtual PortableInterceptor::AdapterName * tao_adapter_name (void)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual PortableInterceptor::AdapterName * tao_adapter_name (void);
     //@}
 
     /**
@@ -84,8 +81,7 @@ namespace TAO
     //@{
     virtual CORBA::Object_ptr make_object (
         const char * repository_id,
-        const PortableInterceptor::ObjectId & id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+        const PortableInterceptor::ObjectId & id);
     //@}
 
   private:
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
index 6588c5e4a6e..622bb1a0eb5 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
@@ -30,21 +30,18 @@ namespace TAO
 
   char *
   ObjectReferenceTemplate::server_id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup (this->server_id_);
   }
 
   char *
   ObjectReferenceTemplate::orb_id (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup (this->orb_id_);
   }
 
   PortableInterceptor::AdapterName *
   ObjectReferenceTemplate::adapter_name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     PortableInterceptor::AdapterName *adapter_name = 0;
 
@@ -65,7 +62,6 @@ namespace TAO
       const char *,
       const PortableInterceptor::ObjectId &
       )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (CORBA::is_nil(poa_.in()))
       throw ::CORBA::BAD_INV_ORDER ();
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
index eeb4cae1deb..e97ac59a3b0 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
@@ -25,7 +25,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/ObjRefTemplate/Default_ORTC.h"
-#include "tao/SystemException.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
@@ -69,14 +68,11 @@ namespace TAO
      * PortableInterceptor::ObjectReferenceTemplate ValueType.
      */
     //@{
-    virtual char * server_id (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * server_id (void);
 
-    virtual char * orb_id (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * orb_id (void);
 
-    virtual PortableInterceptor::AdapterName * adapter_name (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual PortableInterceptor::AdapterName * adapter_name (void);
     //@}
 
     /**
@@ -88,8 +84,7 @@ namespace TAO
     //@{
     virtual CORBA::Object_ptr make_object (
       const char * repository_id,
-      const PortableInterceptor::ObjectId & id)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+      const PortableInterceptor::ObjectId & id);
     //@}
 
   protected: