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

9 files changed, 15 insertions, 47 deletions

diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
index c65338b9971..8f75a01f480 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
@@ -35,8 +35,7 @@ TAO_EndpointPolicy_Initializer::init (void)
 
       orb_initializer = temp_orb_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                    );
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
     }
   catch (const ::CORBA::Exception& ex)
     {
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp
index a1ffef2b9d3..b0d51bbd0f6 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp
@@ -30,10 +30,7 @@ TAO_EndpointPolicy_Factory::TAO_EndpointPolicy_Factory (TAO_ORB_Core * orb_core)
 CORBA::Policy_ptr
 TAO_EndpointPolicy_Factory::create_policy (
     CORBA::PolicyType type,
-    const CORBA::Any &value
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
+    const CORBA::Any &value)
 {
   if (type == EndpointPolicy::ENDPOINT_POLICY_TYPE)
   {
@@ -74,7 +71,7 @@ TAO_EndpointPolicy_Factory::create_policy (
     if (!found_one)
       throw ::CORBA::PolicyError (CORBA::UNSUPPORTED_POLICY_VALUE);
 
-    TAO_EndpointPolicy_i *tmp;
+    TAO_EndpointPolicy_i *tmp = 0;
     ACE_NEW_THROW_EX (tmp,
       TAO_EndpointPolicy_i (*endpoint_list),
       CORBA::NO_MEMORY (TAO::VMCID,
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h
index 0877fa147df..b4aa4f331ee 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h
@@ -48,9 +48,7 @@ public:
 
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                            const CORBA::Any & value
-                                           )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CORBA::PolicyError));
+                                           );
 private:
 
   TAO_ORB_Core * orb_core_;
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp
index 95f7ec19b8f..82f8f77d499 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp
@@ -17,7 +17,6 @@ void
 TAO_EndpointPolicy_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -25,7 +24,6 @@ void
 TAO_EndpointPolicy_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_policy_factories (info
                                   );
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h
index b75c52d370a..04bb65e447a 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h
@@ -50,12 +50,10 @@ public:
   //@{
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                         );
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                          );
 
   //@}
 
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
index 955e6854896..335a5dd7c11 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
@@ -1,14 +1,12 @@
 // $Id$
 
 #include "tao/EndpointPolicy/EndpointPolicy_i.h"
-
 #include "tao/SystemException.h"
 
 ACE_RCSID (EndpointPolicy,
            EndpointPolicy_i,
            "$Id$")
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EndpointPolicy_i::TAO_EndpointPolicy_i (const EndpointPolicy::EndpointList &value)
@@ -33,7 +31,6 @@ TAO_EndpointPolicy_i::~TAO_EndpointPolicy_i ()
 
 CORBA::PolicyType
 TAO_EndpointPolicy_i::policy_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return EndpointPolicy::ENDPOINT_POLICY_TYPE;
 }
@@ -50,7 +47,6 @@ TAO_EndpointPolicy_i::clone (void) const
 
 EndpointPolicy::EndpointList *
 TAO_EndpointPolicy_i::value (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   EndpointPolicy::EndpointList* list = 0;
   ACE_NEW_RETURN (list,
@@ -62,7 +58,6 @@ TAO_EndpointPolicy_i::value (void)
 
 CORBA::Policy_ptr
 TAO_EndpointPolicy_i::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_EndpointPolicy_i* servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -74,7 +69,6 @@ TAO_EndpointPolicy_i::copy (void)
 
 void
 TAO_EndpointPolicy_i::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->value_.length (0);
 }
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h
index 429b6681ebe..66cee376baa 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h
@@ -60,24 +60,18 @@ public:
 
   // = The EndpointPolicy::Policy methods
 
-  virtual CORBA::PolicyType policy_type (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::PolicyType policy_type (void);
 
-  virtual CORBA::Policy_ptr copy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Policy_ptr copy (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   // Return the cached policy type for this policy.
   virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
 
   virtual EndpointPolicy::EndpointList * value (
     void
-  )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ));
+  );
 
 private:
   /// The attribute
diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
index d33e3e36942..4cd7b83ce7d 100644
--- a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
+++ b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
@@ -83,35 +83,30 @@ IIOPEndpointValue_i::validate_acceptor(TAO_Acceptor * acceptor) const
 
 char *
 IIOPEndpointValue_i::host (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->host_.in());
 }
 
 void
 IIOPEndpointValue_i::host (const char *h)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->host_ = h;
 }
 
 CORBA::UShort
 IIOPEndpointValue_i::port (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->port_;
 }
 
 void
 IIOPEndpointValue_i::port (CORBA::UShort p )
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->port_ = p;
 }
 
 CORBA::ULong
 IIOPEndpointValue_i::protocol_tag (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return IOP::TAG_INTERNET_IOP;
 }
diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h
index 00f3bdad5dd..f42b3b52043 100644
--- a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h
+++ b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h
@@ -84,20 +84,15 @@ public:
   CORBA::Boolean validate_acceptor (TAO_Acceptor *) const;
 
   /// Host attribute get/set operators.
-  char * host (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  void host (const char * h)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  char * host (void);
+  void host (const char * h);
 
   /// Port attribute get/set operators.
-  CORBA::UShort port (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  void port (CORBA::UShort p)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::UShort port (void);
+  void port (CORBA::UShort p);
 
   // Protocol tag get operator, inherited from EndpointValueBase
-  CORBA::ULong protocol_tag (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::ULong protocol_tag (void);
 
 private:
   CORBA::Boolean is_equivalent_i (CORBA::UShort port, const char *host) const;