Tue Jul 31 09:39:43 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

22 files changed, 83 insertions, 84 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 2f9ea23877b..fe1b1b3214a 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,8 +1,34 @@
+Tue Jul 31 09:39:43 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * contrib/utility/Example/ExH/BadCast/bad_cast.cpp:
+        * contrib/utility/Example/ExH/Compound/compound.cpp:
+        * contrib/utility/Example/ExH/HelloWorld/hello_world.cpp:
+        * contrib/utility/Example/ExH/LogicToSystem/logic_to_system.cpp:
+        * contrib/utility/Test/ExH/Compound/compound.cpp:
+        * contrib/utility/Test/ExH/Converter/converter.cpp:
+        * contrib/utility/Test/ExH/Logic/DescriptiveException/descriptive_exception.cpp:
+        * contrib/utility/Test/ExH/System/DescriptiveException/descriptive_exception.cpp:
+        * contrib/utility/Test/ReferenceCounting/DefaultImpl/default_impl.cpp:
+        * contrib/utility/Test/ReferenceCounting/Interface/interface.cpp:
+        * contrib/utility/Test/ReferenceCounting/SmartPtr/smart_ptr.cpp:
+        * contrib/utility/Test/ReferenceCounting/StrictPtr/strict_ptr.cpp:
+        * contrib/utility/Utility/ReferenceCounting/DefaultImpl.hpp:
+        * contrib/utility/Utility/ReferenceCounting/DefaultImpl.ipp:
+        * contrib/utility/Utility/ReferenceCounting/Interface.hpp:
+        * contrib/utility/Utility/ReferenceCounting/Interface.tpp:
+        * contrib/utility/Utility/ReferenceCounting/SmartPtr.hpp:
+        * contrib/utility/Utility/ReferenceCounting/SmartPtr.tpp:
+        * contrib/utility/Utility/ReferenceCounting/StrictPtr.hpp:
+        * contrib/utility/Utility/ReferenceCounting/StrictPtr.tpp:
+        * contrib/utility/Vault/hetero/map.hpp:
+
+          Zap the usage of exception specification.
+
 Tue Jul 31 07:52:25 UTC 2007  Olli Savia  <ops@iki.fi>
 
         * ace/os_include/os_dirent.h:
-          Removed #undef rewinddir. Iy May have broken compilation 
-          compilation on some platforms so ACE_OS::rewinddir() 
+          Removed #undef rewinddir. Iy May have broken compilation
+          compilation on some platforms so ACE_OS::rewinddir()
           may need tweaking.
 
 Tue Jul 31 06:45:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
diff --git a/ACE/contrib/utility/Example/ExH/BadCast/bad_cast.cpp b/ACE/contrib/utility/Example/ExH/BadCast/bad_cast.cpp
index cb4a59e26a9..169ddaebf38 100644
--- a/ACE/contrib/utility/Example/ExH/BadCast/bad_cast.cpp
+++ b/ACE/contrib/utility/Example/ExH/BadCast/bad_cast.cpp
@@ -24,7 +24,7 @@ struct B
 };
 
 void
-foo () throw (Utility::ExH::System::Exception)
+foo ()
 {
   A a;
 
diff --git a/ACE/contrib/utility/Example/ExH/Compound/compound.cpp b/ACE/contrib/utility/Example/ExH/Compound/compound.cpp
index 9e042ca9c1e..8b68b8d25ea 100644
--- a/ACE/contrib/utility/Example/ExH/Compound/compound.cpp
+++ b/ACE/contrib/utility/Example/ExH/Compound/compound.cpp
@@ -50,7 +50,7 @@ public:
 public:
 
   void
-  foo (char const* str) throw (InvalidArgument, NotInitialized)
+  foo (char const* str)
   {
     // This is just an example.
 
@@ -72,7 +72,7 @@ public:
   // we allow to throw System exception and any logic exception
   // derived from Base::Exception
   virtual void
-  vfoo () throw (Exception, System::Exception) = 0;
+  vfoo () = 0;
 };
 
 class Derived : public Base
@@ -87,7 +87,7 @@ public:
 
 public:
   virtual void
-  vfoo () throw (NotImplemented, System::Exception)
+  vfoo ()
   {
     std::string str ("Derived::vfoo: not implemented yet.");
     throw NotImplemented (str);
diff --git a/ACE/contrib/utility/Example/ExH/HelloWorld/hello_world.cpp b/ACE/contrib/utility/Example/ExH/HelloWorld/hello_world.cpp
index ee678ffa66f..cdbe41d915a 100644
--- a/ACE/contrib/utility/Example/ExH/HelloWorld/hello_world.cpp
+++ b/ACE/contrib/utility/Example/ExH/HelloWorld/hello_world.cpp
@@ -28,15 +28,14 @@ public:
   class InvalidArg : public Exception {};
 
 public:
-  Application () throw (ExH::System::Exception)
+  Application ()
       : // The std::string c-tor may throw any kind of exceptions besides
         // quite possible std::bad_alloc.
         greeting_ ("Hello, world!")
   {
   }
 
-  Application (char const * greeting) throw (InvalidArg,
-                                             ExH::System::Exception)
+  Application (char const * greeting)
       : greeting_ (greeting == 0 ? "" : greeting)
   {
     if (greeting == 0) throw InvalidArg ();
@@ -45,7 +44,7 @@ public:
 public:
 
   void
-  run () throw (FeelingDizzy, ExH::System::Exception)
+  run ()
   {
     static unsigned int dizzy_count (0);
 
diff --git a/ACE/contrib/utility/Example/ExH/LogicToSystem/logic_to_system.cpp b/ACE/contrib/utility/Example/ExH/LogicToSystem/logic_to_system.cpp
index ba5944404f0..446da7f18d4 100644
--- a/ACE/contrib/utility/Example/ExH/LogicToSystem/logic_to_system.cpp
+++ b/ACE/contrib/utility/Example/ExH/LogicToSystem/logic_to_system.cpp
@@ -17,7 +17,7 @@ struct SubsystemA
   class Exception : public Utility::ExH::Logic::Exception {};
 
   void
-  foo () throw (Exception)
+  foo ()
   {
     throw Exception ();
   }
@@ -27,7 +27,7 @@ struct SubsystemA
 struct SubsystemB
 {
   void
-  foo () throw (Utility::ExH::System::Exception)
+  foo ()
   {
     SubsystemA a;
     a.foo ();
diff --git a/ACE/contrib/utility/Test/ExH/Compound/compound.cpp b/ACE/contrib/utility/Test/ExH/Compound/compound.cpp
index d3319f5d7dc..df06353d4b9 100644
--- a/ACE/contrib/utility/Test/ExH/Compound/compound.cpp
+++ b/ACE/contrib/utility/Test/ExH/Compound/compound.cpp
@@ -11,7 +11,7 @@ using namespace Utility::ExH;
 
 struct E {};
 
-void postcondition (bool p) throw (E)
+void postcondition (bool p)
 {
   if (!p) throw E ();
 }
diff --git a/ACE/contrib/utility/Test/ExH/Converter/converter.cpp b/ACE/contrib/utility/Test/ExH/Converter/converter.cpp
index 396b616e6a6..00c65a04a3f 100644
--- a/ACE/contrib/utility/Test/ExH/Converter/converter.cpp
+++ b/ACE/contrib/utility/Test/ExH/Converter/converter.cpp
@@ -14,7 +14,7 @@ using namespace Utility::ExH;
 
 struct E {};
 
-void postcondition (bool p) throw (E)
+void postcondition (bool p)
 {
   if (!p) throw E ();
 }
diff --git a/ACE/contrib/utility/Test/ExH/Logic/DescriptiveException/descriptive_exception.cpp b/ACE/contrib/utility/Test/ExH/Logic/DescriptiveException/descriptive_exception.cpp
index 7c3246df491..f225c0c0b4e 100644
--- a/ACE/contrib/utility/Test/ExH/Logic/DescriptiveException/descriptive_exception.cpp
+++ b/ACE/contrib/utility/Test/ExH/Logic/DescriptiveException/descriptive_exception.cpp
@@ -12,7 +12,7 @@ using namespace Utility::ExH::Logic;
 
 struct E {};
 
-void postcondition (bool p) throw (E)
+void postcondition (bool p)
 {
   if (!p) throw E ();
 }
diff --git a/ACE/contrib/utility/Test/ExH/System/DescriptiveException/descriptive_exception.cpp b/ACE/contrib/utility/Test/ExH/System/DescriptiveException/descriptive_exception.cpp
index 4cd14da8627..7eb39f431f5 100644
--- a/ACE/contrib/utility/Test/ExH/System/DescriptiveException/descriptive_exception.cpp
+++ b/ACE/contrib/utility/Test/ExH/System/DescriptiveException/descriptive_exception.cpp
@@ -12,7 +12,7 @@ using namespace Utility::ExH::System;
 
 struct E {};
 
-void postcondition (bool p) throw (E)
+void postcondition (bool p)
 {
   if (!p) throw E ();
 }
diff --git a/ACE/contrib/utility/Test/ReferenceCounting/DefaultImpl/default_impl.cpp b/ACE/contrib/utility/Test/ReferenceCounting/DefaultImpl/default_impl.cpp
index 971751b6677..428e78cd061 100644
--- a/ACE/contrib/utility/Test/ReferenceCounting/DefaultImpl/default_impl.cpp
+++ b/ACE/contrib/utility/Test/ReferenceCounting/DefaultImpl/default_impl.cpp
@@ -52,7 +52,7 @@ private:
 
 struct E {};
 
-void postcondition (bool p) throw (E)
+void postcondition (bool p)
 {
   if (!p) throw E ();
 }
diff --git a/ACE/contrib/utility/Test/ReferenceCounting/Interface/interface.cpp b/ACE/contrib/utility/Test/ReferenceCounting/Interface/interface.cpp
index a9cb4d55824..8299881424e 100644
--- a/ACE/contrib/utility/Test/ReferenceCounting/Interface/interface.cpp
+++ b/ACE/contrib/utility/Test/ReferenceCounting/Interface/interface.cpp
@@ -66,7 +66,7 @@ private:
 
 struct E {};
 
-void postcondition (bool p) throw (E)
+void postcondition (bool p)
 {
   if (!p) throw E ();
 }
diff --git a/ACE/contrib/utility/Test/ReferenceCounting/SmartPtr/smart_ptr.cpp b/ACE/contrib/utility/Test/ReferenceCounting/SmartPtr/smart_ptr.cpp
index 67f4442a359..e03a0a06cfd 100644
--- a/ACE/contrib/utility/Test/ReferenceCounting/SmartPtr/smart_ptr.cpp
+++ b/ACE/contrib/utility/Test/ReferenceCounting/SmartPtr/smart_ptr.cpp
@@ -53,7 +53,7 @@ ImplPtr;
 
 struct E {};
 
-void postcondition (bool p) throw (E)
+void postcondition (bool p)
 {
   if (!p) throw E ();
 }
diff --git a/ACE/contrib/utility/Test/ReferenceCounting/StrictPtr/strict_ptr.cpp b/ACE/contrib/utility/Test/ReferenceCounting/StrictPtr/strict_ptr.cpp
index 1fcee9448ea..76fe667900f 100644
--- a/ACE/contrib/utility/Test/ReferenceCounting/StrictPtr/strict_ptr.cpp
+++ b/ACE/contrib/utility/Test/ReferenceCounting/StrictPtr/strict_ptr.cpp
@@ -53,7 +53,7 @@ ImplPtr;
 
 struct E {};
 
-void postcondition (bool p) throw (E)
+void postcondition (bool p)
 {
   if (!p) throw E ();
 }
diff --git a/ACE/contrib/utility/Utility/ReferenceCounting/DefaultImpl.hpp b/ACE/contrib/utility/Utility/ReferenceCounting/DefaultImpl.hpp
index 7aaaff75741..54ff2dada9c 100644
--- a/ACE/contrib/utility/Utility/ReferenceCounting/DefaultImpl.hpp
+++ b/ACE/contrib/utility/Utility/ReferenceCounting/DefaultImpl.hpp
@@ -34,30 +34,30 @@ namespace Utility
       InconsistentState;
 
     public:
-      DefaultImpl () throw (SystemException);
+      DefaultImpl ();
 
       virtual
       ~DefaultImpl () throw ();
 
     public:
       virtual void
-      add_ref () const throw (Exception, SystemException);
+      add_ref () const throw;
 
       virtual void
       remove_ref () const throw ();
 
       virtual count_t
-      refcount_value () const throw (Exception, SystemException);
+      refcount_value () const;
 
     protected:
       virtual void
-      add_ref_i () const throw (Exception, SystemException);
+      add_ref_i () const;
 
       virtual bool
-      remove_ref_i () const throw (Exception, SystemException);
+      remove_ref_i () const;
 
       virtual count_t
-      refcount_value_i () const throw (Exception, SystemException);
+      refcount_value_i () const;
 
       typename SynchPolicy::Mutex&
       lock_i () const throw ();
diff --git a/ACE/contrib/utility/Utility/ReferenceCounting/DefaultImpl.ipp b/ACE/contrib/utility/Utility/ReferenceCounting/DefaultImpl.ipp
index bac28c77ea2..eaed51a644a 100644
--- a/ACE/contrib/utility/Utility/ReferenceCounting/DefaultImpl.ipp
+++ b/ACE/contrib/utility/Utility/ReferenceCounting/DefaultImpl.ipp
@@ -11,7 +11,7 @@ namespace Utility
 
     template <typename SynchPolicy>
     DefaultImpl<SynchPolicy>::
-    DefaultImpl () throw (Interface::SystemException)
+    DefaultImpl ()
         : ref_count_ (1),
           lock_ ()
     {
@@ -27,7 +27,7 @@ namespace Utility
 
     template <typename SynchPolicy>
     void DefaultImpl<SynchPolicy>::
-    add_ref () const throw (Exception, SystemException)
+    add_ref () const
     {
       WriteGuard_ guard (lock_);
       add_ref_i ();
@@ -53,7 +53,7 @@ namespace Utility
 
     template <typename SynchPolicy>
     Interface::count_t DefaultImpl<SynchPolicy>::
-    refcount_value () const throw (Exception, SystemException)
+    refcount_value () const
     {
       ReadGuard_ guard (lock_);
       return refcount_value_i ();
@@ -63,14 +63,14 @@ namespace Utility
 
     template <typename SynchPolicy>
     void DefaultImpl<SynchPolicy>::
-    add_ref_i () const throw (Exception, SystemException)
+    add_ref_i () const
     {
       ref_count_++;
     }
 
     template <typename SynchPolicy>
     bool DefaultImpl<SynchPolicy>::
-    remove_ref_i () const throw (Exception, SystemException)
+    remove_ref_i () const
     {
       bool destroy (false);
       if (ref_count_ > 0)
@@ -89,7 +89,7 @@ namespace Utility
 
     template <typename SynchPolicy>
     Interface::count_t DefaultImpl<SynchPolicy>::
-    refcount_value_i () const throw (Exception, SystemException)
+    refcount_value_i () const
     {
       return ref_count_;
     }
diff --git a/ACE/contrib/utility/Utility/ReferenceCounting/Interface.hpp b/ACE/contrib/utility/Utility/ReferenceCounting/Interface.hpp
index 5b71d746087..4f0a8f24201 100644
--- a/ACE/contrib/utility/Utility/ReferenceCounting/Interface.hpp
+++ b/ACE/contrib/utility/Utility/ReferenceCounting/Interface.hpp
@@ -35,13 +35,13 @@ namespace Utility
       
     public:
       virtual void
-      add_ref () const throw (Exception, SystemException) = 0;
+      add_ref () const = 0;
 
       virtual void
       remove_ref () const throw () = 0;
 
       virtual count_t
-      refcount_value () const throw (Exception, SystemException) = 0;
+      refcount_value () const = 0;
 
     protected:
       Interface () throw ();
@@ -51,13 +51,13 @@ namespace Utility
 
     protected:
       virtual void
-      add_ref_i () const throw (Exception, SystemException) = 0;
+      add_ref_i () const = 0;
 
       virtual bool
-      remove_ref_i () const throw (Exception, SystemException) = 0;
+      remove_ref_i () const = 0;
 
       virtual count_t
-      refcount_value_i () const throw (Exception, SystemException) = 0;
+      refcount_value_i () const = 0;
 
     private:
       // Copy semanic is not supported.
@@ -68,8 +68,7 @@ namespace Utility
 
     template <typename Type>
     Type*
-    add_ref (Type* ptr)
-      throw (Interface::Exception, Interface::SystemException);
+    add_ref (Type* ptr);
   }
 }
 
diff --git a/ACE/contrib/utility/Utility/ReferenceCounting/Interface.tpp b/ACE/contrib/utility/Utility/ReferenceCounting/Interface.tpp
index 6a6a1d2d263..ff426ff7bcc 100644
--- a/ACE/contrib/utility/Utility/ReferenceCounting/Interface.tpp
+++ b/ACE/contrib/utility/Utility/ReferenceCounting/Interface.tpp
@@ -10,7 +10,6 @@ namespace Utility
     template <typename Type>
     inline Type*
     add_ref (Type* ptr)
-      throw (Interface::Exception, Interface::SystemException)
     {
       if (ptr != 0) ptr->add_ref ();
       return ptr;
diff --git a/ACE/contrib/utility/Utility/ReferenceCounting/SmartPtr.hpp b/ACE/contrib/utility/Utility/ReferenceCounting/SmartPtr.hpp
index 682f0678ee1..ab6163e5d18 100644
--- a/ACE/contrib/utility/Utility/ReferenceCounting/SmartPtr.hpp
+++ b/ACE/contrib/utility/Utility/ReferenceCounting/SmartPtr.hpp
@@ -33,12 +33,10 @@ namespace Utility
 
       SmartPtr () throw ();
       SmartPtr (Type* ptr) throw ();
-      SmartPtr (SmartPtr<Type> const& s_ptr)
-        throw (Interface::Exception, Interface::SystemException);
+      SmartPtr (SmartPtr<Type> const& s_ptr);
 
       template <typename Other>
-      SmartPtr (SmartPtr<Other> const& s_ptr)
-        throw (Interface::Exception, Interface::SystemException);
+      SmartPtr (SmartPtr<Other> const& s_ptr);
 
       // d-tor
 
@@ -50,13 +48,11 @@ namespace Utility
       operator= (Type* ptr) throw ();
 
       SmartPtr<Type>&
-      operator= (SmartPtr<Type> const& s_ptr)
-        throw (Interface::Exception, Interface::SystemException);
+      operator= (SmartPtr<Type> const& s_ptr);
 
       template <typename Other>
       SmartPtr<Type>&
-      operator= (SmartPtr<Other> const& s_ptr)
-        throw (Interface::Exception, Interface::SystemException);
+      operator= (SmartPtr<Other> const& s_ptr);
 
       //conversions
 
@@ -65,7 +61,7 @@ namespace Utility
       // accessors
 
       Type*
-      operator-> () const throw (NotInitialized);
+      operator-> () const;
 
       Type*
       in () const throw ();
@@ -80,20 +76,18 @@ namespace Utility
     // Specialization of add_ref function for SmartPtr<T>
     template <typename T>
     T*
-    add_ref (SmartPtr<T> const& ptr)
-      throw (Interface::Exception, Interface::SystemException);
+    add_ref (SmartPtr<T> const& ptr);
 
 
     // Dynamic type conversion function for SmartPtr's
     template <typename D, typename S>
     D*
-    smart_cast (SmartPtr<S> const& s)
-      throw (Interface::Exception, Interface::SystemException);
+    smart_cast (SmartPtr<S> const& s);
 
     // Acquisition function
     template <typename T>
     SmartPtr<T>
-    acquire (T* ptr) throw (Interface::Exception, Interface::SystemException);
+    acquire (T* ptr);
   }
 }
 
diff --git a/ACE/contrib/utility/Utility/ReferenceCounting/SmartPtr.tpp b/ACE/contrib/utility/Utility/ReferenceCounting/SmartPtr.tpp
index 6596c67f1b1..515eee7c1a9 100644
--- a/ACE/contrib/utility/Utility/ReferenceCounting/SmartPtr.tpp
+++ b/ACE/contrib/utility/Utility/ReferenceCounting/SmartPtr.tpp
@@ -26,7 +26,6 @@ namespace Utility
     template <typename T>
     SmartPtr<T>::
     SmartPtr (SmartPtr<Type> const& s_ptr)
-      throw (Interface::Exception, Interface::SystemException)
         : ptr_ (add_ref (s_ptr.in ()))
     {
     }
@@ -35,7 +34,6 @@ namespace Utility
     template <typename Other>
     SmartPtr<T>::
     SmartPtr (SmartPtr<Other> const& s_ptr)
-      throw (Interface::Exception, Interface::SystemException)
         : ptr_ (add_ref (s_ptr.in ()))
     {
     }
@@ -71,7 +69,6 @@ namespace Utility
     template <typename T>
     SmartPtr<T>& SmartPtr<T>::
     operator= (SmartPtr<Type> const& s_ptr)
-      throw (Interface::Exception, Interface::SystemException)
     {
       Type* old_ptr (ptr_);
       Type* new_ptr (add_ref (s_ptr.in ())); // this can throw
@@ -87,7 +84,6 @@ namespace Utility
     template <typename Other>
     SmartPtr<T>& SmartPtr<T>::
     operator= (SmartPtr<Other> const& s_ptr)
-      throw (Interface::Exception, Interface::SystemException)
     {
       Type*  old_ptr (ptr_);
       Other* new_ptr (add_ref (s_ptr.in ())); // this can throw
@@ -112,7 +108,7 @@ namespace Utility
 
     template <typename T>
     T* SmartPtr<T>::
-    operator-> () const throw (NotInitialized)
+    operator-> () const
     {
       if (ptr_ == 0)
       {
@@ -143,7 +139,6 @@ namespace Utility
     template <typename T>
     T*
     add_ref (SmartPtr<T> const& ptr)
-      throw (Interface::Exception, Interface::SystemException)
     {
       // delegate to generic implementation
       return add_ref (ptr.in ());
@@ -153,7 +148,6 @@ namespace Utility
     template <typename D, typename S>
     D*
     smart_cast (SmartPtr<S> const& s)
-      throw (Interface::Exception, Interface::SystemException)
     {
       return add_ref (dynamic_cast<D*>(s.in ()));
     }
@@ -161,7 +155,7 @@ namespace Utility
     // Acquisition function
     template <typename T>
     SmartPtr<T>
-    acquire (T* ptr) throw (Interface::Exception, Interface::SystemException)
+    acquire (T* ptr)
     {
       return SmartPtr<T> (ptr);
     }
diff --git a/ACE/contrib/utility/Utility/ReferenceCounting/StrictPtr.hpp b/ACE/contrib/utility/Utility/ReferenceCounting/StrictPtr.hpp
index c88c90d5e50..76b1781f911 100644
--- a/ACE/contrib/utility/Utility/ReferenceCounting/StrictPtr.hpp
+++ b/ACE/contrib/utility/Utility/ReferenceCounting/StrictPtr.hpp
@@ -36,12 +36,10 @@ namespace Utility
       explicit
       StrictPtr (Type* ptr) throw ();
 
-      StrictPtr (StrictPtr<Type> const& s_ptr)
-        throw (Interface::Exception, Interface::SystemException);
+      StrictPtr (StrictPtr<Type> const& s_ptr);
 
       template <typename Other>
-      StrictPtr (StrictPtr<Other> const& s_ptr)
-        throw (Interface::Exception, Interface::SystemException);
+      StrictPtr (StrictPtr<Other> const& s_ptr);
       // d-tor
 
       ~StrictPtr () throw ();
@@ -52,13 +50,11 @@ namespace Utility
       operator= (Type* ptr) throw ();
 
       StrictPtr<Type>&
-      operator= (StrictPtr<Type> const& s_ptr)
-        throw (Interface::Exception, Interface::SystemException);
+      operator= (StrictPtr<Type> const& s_ptr);
 
       template <typename Other>
       StrictPtr<Type>&
-      operator= (StrictPtr<Other> const& s_ptr)
-        throw (Interface::Exception, Interface::SystemException);
+      operator= (StrictPtr<Other> const& s_ptr);
 
       // conversions
 
@@ -75,7 +71,7 @@ namespace Utility
       // accessors
 
       Type*
-      operator-> () const throw (NotInitialized);
+      operator-> () const;
 
       Type*
       in () const throw ();
@@ -90,14 +86,12 @@ namespace Utility
     // Specialization of add_ref function for StrictPtr<T>
     template <typename T>
     T*
-    add_ref (StrictPtr<T> const& ptr)
-      throw (Interface::Exception, Interface::SystemException);
+    add_ref (StrictPtr<T> const& ptr);
 
     // Dynamic type conversion function for StrictPtr's
     template <typename D, typename S>
     StrictPtr<D>
-    strict_cast (StrictPtr<S> const& s)
-      throw (Interface::Exception, Interface::SystemException);
+    strict_cast (StrictPtr<S> const& s);
   }
 }
 
diff --git a/ACE/contrib/utility/Utility/ReferenceCounting/StrictPtr.tpp b/ACE/contrib/utility/Utility/ReferenceCounting/StrictPtr.tpp
index 6a30188119c..9e15632e7a6 100644
--- a/ACE/contrib/utility/Utility/ReferenceCounting/StrictPtr.tpp
+++ b/ACE/contrib/utility/Utility/ReferenceCounting/StrictPtr.tpp
@@ -26,7 +26,6 @@ namespace Utility
     template <typename T>
     StrictPtr<T>::
     StrictPtr (StrictPtr<Type> const& s_ptr)
-      throw (Interface::Exception, Interface::SystemException)
         : ptr_ (add_ref (s_ptr.in ()))
     {
     }
@@ -35,7 +34,6 @@ namespace Utility
     template <typename Other>
     StrictPtr<T>::
     StrictPtr (StrictPtr<Other> const& s_ptr)
-      throw (Interface::Exception, Interface::SystemException)
         : ptr_ (add_ref (s_ptr.in ()))
     {
     }
@@ -70,7 +68,6 @@ namespace Utility
     template <typename T>
     StrictPtr<T>& StrictPtr<T>::
     operator= (StrictPtr<Type> const& s_ptr)
-      throw (Interface::Exception, Interface::SystemException)
     {
       Type* old_ptr (ptr_);
       Type* new_ptr (add_ref (s_ptr.in ())); // this can throw
@@ -86,7 +83,6 @@ namespace Utility
     template <typename Other>
     StrictPtr<T>& StrictPtr<T>::
     operator= (StrictPtr<Other> const& s_ptr)
-      throw (Interface::Exception, Interface::SystemException)
     {
       Type*  old_ptr (ptr_);
       Other* new_ptr (add_ref (s_ptr.in ())); // this can throw
@@ -117,7 +113,7 @@ namespace Utility
 
     template <typename T>
     T* StrictPtr<T>::
-    operator-> () const throw (NotInitialized)
+    operator-> () const
     {
       if (ptr_ == 0)
       {
@@ -148,7 +144,6 @@ namespace Utility
     template <typename T>
     T*
     add_ref (StrictPtr<T> const& ptr)
-      throw (Interface::Exception, Interface::SystemException)
     {
       // delegate to generic implementation
       return add_ref (ptr.in ());
@@ -158,7 +153,6 @@ namespace Utility
     template <typename D, typename S>
     StrictPtr<D>
     strict_cast (StrictPtr<S> const& s)
-      throw (Interface::Exception, Interface::SystemException)
     {
       return StrictPtr<D>(add_ref (dynamic_cast<D*>(s.in ())));
     }
diff --git a/ACE/contrib/utility/Vault/hetero/map.hpp b/ACE/contrib/utility/Vault/hetero/map.hpp
index b6a3e920633..2959c06fbd8 100644
--- a/ACE/contrib/utility/Vault/hetero/map.hpp
+++ b/ACE/contrib/utility/Vault/hetero/map.hpp
@@ -72,7 +72,7 @@ namespace Utility
 
         template <typename T>
         T&
-        second () throw (Typing)
+        second ()
         {
           Value<T>* v = dynamic_cast<Value<T>*> (second_);
           if (v == 0) throw Typing ();
@@ -82,7 +82,7 @@ namespace Utility
 
         template <typename T>
         T const&
-        second () const throw (Typing)
+        second () const
         {
           Value<T>* v = dynamic_cast<Value<T>*> (second_);
           if (v == 0) throw Typing ();