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

9 files changed, 6 insertions, 18 deletions

diff --git a/TAO/tao/Utils/Implicit_Deactivator.cpp b/TAO/tao/Utils/Implicit_Deactivator.cpp
index b1799cf088b..cc40c5c1892 100644
--- a/TAO/tao/Utils/Implicit_Deactivator.cpp
+++ b/TAO/tao/Utils/Implicit_Deactivator.cpp
@@ -10,7 +10,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 void
 TAO::Utils::Implicit_Deactivation_Functor::operator () (
    PortableServer::ServantBase * servant)
-  ACE_THROW_SPEC (())
 {
 
   try
diff --git a/TAO/tao/Utils/Implicit_Deactivator.h b/TAO/tao/Utils/Implicit_Deactivator.h
index 68077296726..d2646599ad2 100644
--- a/TAO/tao/Utils/Implicit_Deactivator.h
+++ b/TAO/tao/Utils/Implicit_Deactivator.h
@@ -39,8 +39,7 @@ namespace TAO
       typedef PortableServer::ServantBase * argument;
 
       // Deactivate an implicitly activated servant
-      void operator() (PortableServer::ServantBase * servant)
-        ACE_THROW_SPEC (());
+      void operator() (PortableServer::ServantBase * servant);
     };
 
     /**
diff --git a/TAO/tao/Utils/ORB_Destroyer.cpp b/TAO/tao/Utils/ORB_Destroyer.cpp
index f21bef3f86d..7418bbd01fb 100644
--- a/TAO/tao/Utils/ORB_Destroyer.cpp
+++ b/TAO/tao/Utils/ORB_Destroyer.cpp
@@ -9,7 +9,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO::Utils::ORB_Destroyer_Functor::operator() (CORBA::ORB_ptr orb)
-  ACE_THROW_SPEC (())
 {
   try
     {
diff --git a/TAO/tao/Utils/ORB_Destroyer.h b/TAO/tao/Utils/ORB_Destroyer.h
index 920ba64d3e5..fac9de338ad 100644
--- a/TAO/tao/Utils/ORB_Destroyer.h
+++ b/TAO/tao/Utils/ORB_Destroyer.h
@@ -38,8 +38,7 @@ namespace TAO
       typedef CORBA::ORB_ptr argument;
 
       /// Destroy the ORB
-      void operator() (CORBA::ORB_ptr orb)
-        ACE_THROW_SPEC (());
+      void operator() (CORBA::ORB_ptr orb);
     };
 
     /**
diff --git a/TAO/tao/Utils/ORB_Manager.cpp b/TAO/tao/Utils/ORB_Manager.cpp
index e07ded0d198..9b349c66957 100644
--- a/TAO/tao/Utils/ORB_Manager.cpp
+++ b/TAO/tao/Utils/ORB_Manager.cpp
@@ -16,7 +16,6 @@
 #include "tao/PortableServer/IdAssignmentPolicyC.h"
 #include "tao/PortableServer/LifespanPolicyC.h"
 
-#include "tao/Environment.h"
 #include "tao/ORBInitializer_Registry.h"
 
 #include "ace/Log_Msg.h"
diff --git a/TAO/tao/Utils/PolicyList_Destroyer.cpp b/TAO/tao/Utils/PolicyList_Destroyer.cpp
index a5acabe07da..46e5a6fdfe4 100644
--- a/TAO/tao/Utils/PolicyList_Destroyer.cpp
+++ b/TAO/tao/Utils/PolicyList_Destroyer.cpp
@@ -1,5 +1,4 @@
 #include "tao/Utils/PolicyList_Destroyer.h"
-#include "tao/Environment.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Utils/PolicyList_Destroyer.inl"
@@ -12,7 +11,6 @@ ACE_RCSID (Utils,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::Utils::PolicyList_Destroyer::~PolicyList_Destroyer()
-  ACE_THROW_SPEC (())
 {
 
   for (CORBA::ULong i = 0; i != length(); ++i)
diff --git a/TAO/tao/Utils/PolicyList_Destroyer.h b/TAO/tao/Utils/PolicyList_Destroyer.h
index ef2ef408805..36f4aead23a 100644
--- a/TAO/tao/Utils/PolicyList_Destroyer.h
+++ b/TAO/tao/Utils/PolicyList_Destroyer.h
@@ -37,8 +37,7 @@ namespace TAO
     {
     public:
       PolicyList_Destroyer(CORBA::ULong length_hint);
-      ~PolicyList_Destroyer()
-        ACE_THROW_SPEC (());
+      ~PolicyList_Destroyer();
     };
 
   } // namespace Utils
diff --git a/TAO/tao/Utils/Servant_Var.h b/TAO/tao/Utils/Servant_Var.h
index ee6c34f4087..1492c97b2c8 100644
--- a/TAO/tao/Utils/Servant_Var.h
+++ b/TAO/tao/Utils/Servant_Var.h
@@ -22,8 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
+#include "tao/orbconf.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -60,8 +59,7 @@ namespace TAO
 
       /// Destructor.  Removes a reference from the underlying object,
       /// possibly destroying it.
-      ~Servant_Var()
-        ACE_THROW_SPEC (());
+      ~Servant_Var();
 
       /// Assignment operator.  Assumes ownership of @c p.
       Servant_Var<T> & operator=(T * p);
@@ -137,8 +135,7 @@ namespace TAO
       /**
        * Often used to implement strong exception safety.
        */
-      void swap(Servant_Var<T> & rhs)
-        ACE_THROW_SPEC(());
+      void swap(Servant_Var<T> & rhs);
 
     private:
       T * ptr_;
diff --git a/TAO/tao/Utils/Servant_Var.inl b/TAO/tao/Utils/Servant_Var.inl
index ca6e0e6f9bf..03b3f8c2e2a 100644
--- a/TAO/tao/Utils/Servant_Var.inl
+++ b/TAO/tao/Utils/Servant_Var.inl
@@ -75,7 +75,6 @@ TAO::Utils::Servant_Var<T>::operator= (T * p)
 
 template <class T> ACE_INLINE
 TAO::Utils::Servant_Var<T>::~Servant_Var (void)
-  ACE_THROW_SPEC (())
 {
   // Unfortunately, there is no throw spec on _remove_ref, so we
   // can't assume that it will not throw.  If it does, then we are in