Merge branch 'master' into jwi-portablegroupcleanup

45 files changed, 70 insertions, 88 deletions

diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
index eb2b2fbc583..0ba8c9eeb56 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
@@ -39,17 +39,17 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * the PROXY interface must implement:
  *
  * @verbatim
- * void connected (PEER *peer) throw ();
- * void reconnected (PEER *peer) throw ();
- * void disconnected (PEER *peer) throw ();
+ * void connected (PEER *peer) noexcept;
+ * void reconnected (PEER *peer) noexcept;
+ * void disconnected (PEER *peer) noexcept;
  * @endverbatim
  *
  * Similarly, the PEER interface must implement:
  *
  * @verbatim
- * void connected (PROXY *proxy) throw ();
- * void reconnected (PROXY *proxy) throw ();
- * void disconnected (PROXY *proxy) throw ();
+ * void connected (PROXY *proxy) noexcept;
+ * void reconnected (PROXY *proxy) noexcept;
+ * void disconnected (PROXY *proxy) noexcept;
  * @endverbatim
  */
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER>
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
index dbb9b9cfa80..4c40bd9d446 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
@@ -55,7 +55,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  * /// activate the proxy and return the object reference
  * PROXY::_ptr_type
- * PROXY::activate () throw ();
+ * PROXY::activate () noexcept;
  * @endverbatim
  */
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE>
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp
index 3f3b8254f54..f6253758efa 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp
@@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_EC_Channel_Destroyer_Functor::operator() (
-                           TAO_EC_Event_Channel_Base * event_channel) throw ()
+                           TAO_EC_Event_Channel_Base * event_channel) noexcept
 {
   try
     {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h
index b3d44ceb038..3be79f75b7d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h
@@ -24,7 +24,7 @@ struct TAO_RTEvent_Serv_Export TAO_EC_Channel_Destroyer_Functor
   typedef  TAO_EC_Event_Channel_Base * argument;
 
   /// Destroy @c event_channel
-  void operator() (TAO_EC_Event_Channel_Base * event_channel) throw ();
+  void operator() (TAO_EC_Event_Channel_Base * event_channel) noexcept;
 };
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index 68c2c3cb5d8..f5636f24b7a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -128,7 +128,7 @@ TAO_EC_ProxyPushSupplier::cleanup_i ()
 }
 
 void
-TAO_EC_ProxyPushSupplier::deactivate () throw ()
+TAO_EC_ProxyPushSupplier::deactivate () noexcept
 {
   try
     {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
index f361456a132..9cd3b7ac0a5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
@@ -69,7 +69,7 @@ public:
     RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy) = 0;
 
   /// Deactivate from the POA
-  virtual void deactivate () throw ();
+  virtual void deactivate () noexcept;
 
   /// Disconnect this from
   virtual void disconnect_push_supplier () = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp
index 8c5b302c917..0f6ee7e7b58 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp
@@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_EC_Supplier_Proxy_Disconnect_Functor::operator() (
-                       RtecEventComm::PushSupplier_ptr supplier) throw ()
+                       RtecEventComm::PushSupplier_ptr supplier) noexcept
 {
   try
     {
@@ -23,7 +23,7 @@ TAO_EC_Supplier_Proxy_Disconnect_Functor::operator() (
 
 void
 TAO_EC_Consumer_Proxy_Disconnect_Functor::operator() (
-                       RtecEventComm::PushConsumer_ptr consumer) throw ()
+                       RtecEventComm::PushConsumer_ptr consumer) noexcept
 {
   try
     {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
index d8a0d1104a8..4a5b4f7d90b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
@@ -24,7 +24,7 @@ struct TAO_RTEvent_Serv_Export TAO_EC_Supplier_Proxy_Disconnect_Functor
   typedef  RtecEventComm::PushSupplier_ptr argument;
 
   /// Disconnect from @c supplier
-  void operator() (RtecEventComm::PushSupplier_ptr supplier) throw ();
+  void operator() (RtecEventComm::PushSupplier_ptr supplier) noexcept;
 };
 
 /**
@@ -49,7 +49,7 @@ struct TAO_RTEvent_Serv_Export TAO_EC_Consumer_Proxy_Disconnect_Functor
   typedef  RtecEventComm::PushConsumer_ptr argument;
 
   /// Disconnect from @c consumer
-  void operator() (RtecEventComm::PushConsumer_ptr consumer) throw ();
+  void operator() (RtecEventComm::PushConsumer_ptr consumer) noexcept;
 };
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h
index 08e4776a875..7cc9fb79285 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h
@@ -43,13 +43,13 @@ protected:
   ~ScopeGuardImplBase()
   {
   }
-  ScopeGuardImplBase(const ScopeGuardImplBase& other) throw()
+  ScopeGuardImplBase(const ScopeGuardImplBase& other) noexcept
     : dismissed_(other.dismissed_)
   {
     other.Dismiss();
   }
   template <typename J>
-  static void SafeExecute(J& j) throw()
+  static void SafeExecute(J& j) noexcept
   {
     if (!j.dismissed_)
       try
@@ -63,10 +63,10 @@ protected:
 
   mutable bool dismissed_;
 public:
-  ScopeGuardImplBase() throw() : dismissed_(false)
+  ScopeGuardImplBase() noexcept : dismissed_(false)
   {
   }
-  void Dismiss() const throw()
+  void Dismiss() const noexcept
   {
     dismissed_ = true;
   }
@@ -82,7 +82,7 @@ public:
   {
     return ScopeGuardImpl0<F>(fun);
   }
-  ~ScopeGuardImpl0() throw()
+  ~ScopeGuardImpl0() noexcept
   {
     SafeExecute(*this);
   }
@@ -111,7 +111,7 @@ public:
   {
     return ScopeGuardImpl1<F, P1>(fun, p1);
   }
-  ~ScopeGuardImpl1() throw()
+  ~ScopeGuardImpl1() noexcept
   {
     SafeExecute(*this);
   }
@@ -141,7 +141,7 @@ public:
   {
     return ScopeGuardImpl2<F, P1, P2>(fun, p1, p2);
   }
-  ~ScopeGuardImpl2() throw()
+  ~ScopeGuardImpl2() noexcept
   {
     SafeExecute(*this);
   }
@@ -172,7 +172,7 @@ public:
   {
     return ScopeGuardImpl3<F, P1, P2, P3>(fun, p1, p2, p3);
   }
-  ~ScopeGuardImpl3() throw()
+  ~ScopeGuardImpl3() noexcept
   {
     SafeExecute(*this);
   }
@@ -206,7 +206,7 @@ public:
   {
     return ObjScopeGuardImpl0<Obj, MemFun>(obj, memFun);
   }
-  ~ObjScopeGuardImpl0() throw()
+  ~ObjScopeGuardImpl0() noexcept
   {
     SafeExecute(*this);
   }
@@ -235,7 +235,7 @@ public:
   {
     return ObjScopeGuardImpl1<Obj, MemFun, P1>(obj, memFun, p1);
   }
-  ~ObjScopeGuardImpl1() throw()
+  ~ObjScopeGuardImpl1() noexcept
   {
     SafeExecute(*this);
   }
@@ -265,7 +265,7 @@ public:
   {
     return ObjScopeGuardImpl2<Obj, MemFun, P1, P2>(obj, memFun, p1, p2);
   }
-  ~ObjScopeGuardImpl2() throw()
+  ~ObjScopeGuardImpl2() noexcept
   {
     SafeExecute(*this);
   }
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp
index 482ffe8721c..0077fb4b1fe 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp
@@ -1,13 +1,10 @@
 #include "TestBroadcaster.h"
 
-
 TestBroadcaster::TestBroadcaster()
 {
-} /* end of TestBroadcaster::TestBroadcaster */
-
+}
 
-TestBroadcaster::~TestBroadcaster()
-  throw()
+TestBroadcaster::~TestBroadcaster() noexcept
 {
   // ensure nothrow guarantee
   try
@@ -17,13 +14,11 @@ TestBroadcaster::~TestBroadcaster()
   catch(...)
   {
   }
-} /* end of TestBroadcaster::~TestBroadcaster */
-
+}
 
 bool TestBroadcaster::connect(
   CORBA::ORB_ptr p_orb,
-  std::string const & rc_channelIor
-)
+  std::string const & rc_channelIor)
 {
   try
   {
@@ -59,8 +54,7 @@ bool TestBroadcaster::connect(
   }
 
   return true;
-} /* end of TestBroadcaster::connect */
-
+}
 
 bool TestBroadcaster::disconnect()
 {
@@ -111,10 +105,9 @@ bool TestBroadcaster::sendData()
   }
 
   return true;
-} /* end of TestBroadcaster::sendData */
-
+}
 
 bool TestBroadcaster::isConnected() const
 {
   return !CORBA::is_nil(mv_sequenceProxyPushConsumer.in());
-} /* end of TestBroadcaster::isConnected */
+}
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h
index 8685542fc1c..806eb731202 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h
@@ -15,8 +15,7 @@ class bug3688_Export TestBroadcaster
     TestBroadcaster ();
 
     /// Destructor.
-    ~TestBroadcaster ()
-      throw ();
+    ~TestBroadcaster () noexcept;
 
     bool connect(
       CORBA::ORB_ptr p_orb,
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h
index 5d2c3fd03fa..dbdcc48e6d6 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h
@@ -132,7 +132,7 @@ namespace TAO
   class TAO_Export ARDB_Refcount_Functor
   {
   public:
-    void operator() (TAO_Asynch_Reply_Dispatcher_Base *ardb) throw ();
+    void operator() (TAO_Asynch_Reply_Dispatcher_Base *ardb) noexcept;
   };
 }
 
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.inl b/TAO/tao/Asynch_Reply_Dispatcher_Base.inl
index ec6c1639ce3..2825c91566b 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.inl
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.inl
@@ -5,7 +5,7 @@ namespace TAO
 {
   ACE_INLINE void
   ARDB_Refcount_Functor::operator () (
-      TAO_Asynch_Reply_Dispatcher_Base *ardb) throw ()
+      TAO_Asynch_Reply_Dispatcher_Base *ardb) noexcept
   {
     (void) ardb->intrusive_remove_ref (ardb);
   }
diff --git a/TAO/tao/Bounded_Array_Sequence_T.h b/TAO/tao/Bounded_Array_Sequence_T.h
index d52a4db56cc..dc2c6b22f2b 100644
--- a/TAO/tao/Bounded_Array_Sequence_T.h
+++ b/TAO/tao/Bounded_Array_Sequence_T.h
@@ -72,7 +72,7 @@ public:
   inline value_type * get_buffer(CORBA::Boolean orphan = false) {
     return impl_.get_buffer(orphan);
   }
-  inline void swap(bounded_array_sequence & rhs) throw() {
+  inline void swap(bounded_array_sequence & rhs) noexcept {
     impl_.swap(rhs.impl_);
   }
   static value_type * allocbuf(CORBA::ULong maximum) {
diff --git a/TAO/tao/Bounded_Basic_String_Sequence_T.h b/TAO/tao/Bounded_Basic_String_Sequence_T.h
index a249e9110ff..d048cc0edc0 100644
--- a/TAO/tao/Bounded_Basic_String_Sequence_T.h
+++ b/TAO/tao/Bounded_Basic_String_Sequence_T.h
@@ -88,7 +88,7 @@ public:
   inline value_type * get_buffer(CORBA::Boolean orphan = false) {
     return impl_.get_buffer(orphan);
   }
-  inline void swap(bounded_basic_string_sequence & rhs) throw() {
+  inline void swap(bounded_basic_string_sequence & rhs) noexcept {
     impl_.swap(rhs.impl_);
   }
 
diff --git a/TAO/tao/Bounded_Object_Reference_Sequence_T.h b/TAO/tao/Bounded_Object_Reference_Sequence_T.h
index d86427db8b2..ac95fe9c926 100644
--- a/TAO/tao/Bounded_Object_Reference_Sequence_T.h
+++ b/TAO/tao/Bounded_Object_Reference_Sequence_T.h
@@ -90,7 +90,7 @@ public:
     return impl_.get_buffer(orphan);
   }
   // @copydoc TAO::details::generic_sequence::swap
-  inline void swap(bounded_object_reference_sequence & rhs) throw() {
+  inline void swap(bounded_object_reference_sequence & rhs) noexcept {
     impl_.swap(rhs.impl_);
   }
 
diff --git a/TAO/tao/Bounded_Value_Sequence_T.h b/TAO/tao/Bounded_Value_Sequence_T.h
index 3579c6cd2b3..07383956c04 100644
--- a/TAO/tao/Bounded_Value_Sequence_T.h
+++ b/TAO/tao/Bounded_Value_Sequence_T.h
@@ -84,7 +84,7 @@ public:
     return impl_.get_buffer(orphan);
   }
   // @copydoc TAO::details::generic_sequence::swap()
-  inline void swap(bounded_value_sequence & rhs) throw() {
+  inline void swap(bounded_value_sequence & rhs) noexcept {
     impl_.swap(rhs.impl_);
   }
   static value_type * allocbuf(CORBA::ULong maximum) {
diff --git a/TAO/tao/Generic_Sequence_T.h b/TAO/tao/Generic_Sequence_T.h
index 46e48aa5189..eca632bf6fa 100644
--- a/TAO/tao/Generic_Sequence_T.h
+++ b/TAO/tao/Generic_Sequence_T.h
@@ -315,7 +315,7 @@ public:
     return tmp.buffer_;
   }
 
-  void swap(generic_sequence & rhs) throw()
+  void swap(generic_sequence & rhs) noexcept
   {
     std::swap(maximum_, rhs.maximum_);
     std::swap(length_, rhs.length_);
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp
index 63fbd04897f..9567e23fe2f 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.cpp
+++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp
@@ -331,7 +331,7 @@ TAO_AMH_Response_Handler::_remove_ref ()
 namespace TAO
 {
   void
-  ARH_Refcount_Functor::operator () (TAO_AMH_Response_Handler *arh) throw ()
+  ARH_Refcount_Functor::operator () (TAO_AMH_Response_Handler *arh) noexcept
   {
     (void) arh->_remove_ref ();
   }
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h
index b10938f4c32..17332561b9d 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.h
+++ b/TAO/tao/Messaging/AMH_Response_Handler.h
@@ -198,7 +198,7 @@ namespace TAO
   class TAO_Messaging_Export ARH_Refcount_Functor
   {
   public:
-    void operator() (TAO_AMH_Response_Handler *arh) throw ();
+    void operator() (TAO_AMH_Response_Handler *arh) noexcept;
   };
 }
 
diff --git a/TAO/tao/PortableServer/Servant_var.cpp b/TAO/tao/PortableServer/Servant_var.cpp
index 3b1a63f7512..e89515b1e9f 100644
--- a/TAO/tao/PortableServer/Servant_var.cpp
+++ b/TAO/tao/PortableServer/Servant_var.cpp
@@ -31,7 +31,7 @@ PortableServer::Servant_var<T>::_duplicate (T * p)
 }
 
 template <class T>
-PortableServer::Servant_var<T>::~Servant_var ()  /* throw () */
+PortableServer::Servant_var<T>::~Servant_var ()  /* noexcept */
 {
   // 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
diff --git a/TAO/tao/PortableServer/Servant_var.h b/TAO/tao/PortableServer/Servant_var.h
index ae34add8165..d5ff171f722 100644
--- a/TAO/tao/PortableServer/Servant_var.h
+++ b/TAO/tao/PortableServer/Servant_var.h
@@ -32,7 +32,7 @@ namespace PortableServer
    * @author Jody Hagins
    *
    * @todo Life would be much easier if _add_ref() and _remove_ref() had
-   *       throw specs of "throw ()", that can be hidden in static
+   *       throw specs of "noexcept", that can be hidden in static
    *       methods though.
    */
   template<class T>
diff --git a/TAO/tao/PortableServer/Servant_var.inl b/TAO/tao/PortableServer/Servant_var.inl
index c3a78412637..a5c397ebc93 100644
--- a/TAO/tao/PortableServer/Servant_var.inl
+++ b/TAO/tao/PortableServer/Servant_var.inl
@@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class T>
 ACE_INLINE void
-PortableServer::Servant_var<T>::swap (Servant_var<T> & rhs) /* throw () */
+PortableServer::Servant_var<T>::swap (Servant_var<T> & rhs) /* noexcept */
 {
   std::swap (this->ptr_, rhs.ptr_);
 }
diff --git a/TAO/tao/Unbounded_Array_Sequence_T.h b/TAO/tao/Unbounded_Array_Sequence_T.h
index 6a304a519b9..873376148af 100644
--- a/TAO/tao/Unbounded_Array_Sequence_T.h
+++ b/TAO/tao/Unbounded_Array_Sequence_T.h
@@ -77,7 +77,7 @@ public:
   inline value_type * get_buffer(CORBA::Boolean orphan = false) {
     return impl_.get_buffer(orphan);
   }
-  inline void swap(unbounded_array_sequence & rhs) throw() {
+  inline void swap(unbounded_array_sequence & rhs) noexcept {
     impl_.swap(rhs.impl_);
   }
   static value_type * allocbuf(CORBA::ULong maximum) {
diff --git a/TAO/tao/Unbounded_Basic_String_Sequence_T.h b/TAO/tao/Unbounded_Basic_String_Sequence_T.h
index c6839076d9d..13bb9b898f0 100644
--- a/TAO/tao/Unbounded_Basic_String_Sequence_T.h
+++ b/TAO/tao/Unbounded_Basic_String_Sequence_T.h
@@ -98,7 +98,7 @@ public:
     return impl_.get_buffer(orphan);
   }
   // @copydoc TAO::details::generic_sequence::swap
-  inline void swap(unbounded_basic_string_sequence & rhs) throw() {
+  inline void swap(unbounded_basic_string_sequence & rhs) noexcept {
     impl_.swap(rhs.impl_);
   }
 
diff --git a/TAO/tao/Unbounded_Object_Reference_Sequence_T.h b/TAO/tao/Unbounded_Object_Reference_Sequence_T.h
index 2de1bb30c5a..8d43f831c7a 100644
--- a/TAO/tao/Unbounded_Object_Reference_Sequence_T.h
+++ b/TAO/tao/Unbounded_Object_Reference_Sequence_T.h
@@ -92,7 +92,7 @@ public:
     return impl_.get_buffer(orphan);
   }
   // @copydoc TAO::details::generic_sequence::swap()
-  inline void swap(unbounded_object_reference_sequence & rhs) throw() {
+  inline void swap(unbounded_object_reference_sequence & rhs) noexcept {
     impl_.swap(rhs.impl_);
   }
 
diff --git a/TAO/tao/Unbounded_Octet_Sequence_T.h b/TAO/tao/Unbounded_Octet_Sequence_T.h
index dc7a3bf1053..f1a301be14b 100644
--- a/TAO/tao/Unbounded_Octet_Sequence_T.h
+++ b/TAO/tao/Unbounded_Octet_Sequence_T.h
@@ -223,7 +223,7 @@ public:
     return !this->operator==(rhs);
   }
 
-  inline void swap(unbounded_value_sequence & rhs) throw() {
+  inline void swap(unbounded_value_sequence & rhs) noexcept {
     std::swap (mb_, rhs.mb_);
     std::swap (maximum_, rhs.maximum_);
     std::swap (length_, rhs.length_);
diff --git a/TAO/tao/Unbounded_Value_Sequence_T.h b/TAO/tao/Unbounded_Value_Sequence_T.h
index a9cbab9133e..b190d90e54a 100644
--- a/TAO/tao/Unbounded_Value_Sequence_T.h
+++ b/TAO/tao/Unbounded_Value_Sequence_T.h
@@ -77,7 +77,7 @@ public:
   inline value_type * get_buffer(CORBA::Boolean orphan = false) {
     return impl_.get_buffer(orphan);
   }
-  inline void swap(unbounded_value_sequence & rhs) throw() {
+  inline void swap(unbounded_value_sequence & rhs) noexcept {
     impl_.swap(rhs.impl_);
   }
   static value_type * allocbuf(CORBA::ULong maximum) {
diff --git a/TAO/tao/Utils/Implicit_Deactivator.cpp b/TAO/tao/Utils/Implicit_Deactivator.cpp
index 76066530e04..c8175590c58 100644
--- a/TAO/tao/Utils/Implicit_Deactivator.cpp
+++ b/TAO/tao/Utils/Implicit_Deactivator.cpp
@@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO::Utils::Implicit_Deactivation_Functor::operator () (
-   PortableServer::ServantBase * servant) throw ()
+   PortableServer::ServantBase * servant) noexcept
 {
   try
     {
diff --git a/TAO/tao/Utils/Implicit_Deactivator.h b/TAO/tao/Utils/Implicit_Deactivator.h
index 2a7f9d4e763..20e27fc40cb 100644
--- a/TAO/tao/Utils/Implicit_Deactivator.h
+++ b/TAO/tao/Utils/Implicit_Deactivator.h
@@ -36,7 +36,7 @@ namespace TAO
       typedef PortableServer::ServantBase * argument;
 
       // Deactivate an implicitly activated servant
-      void operator() (PortableServer::ServantBase * servant) throw ();
+      void operator() (PortableServer::ServantBase * servant) noexcept;
     };
 
     /**
diff --git a/TAO/tao/Utils/ORB_Destroyer.cpp b/TAO/tao/Utils/ORB_Destroyer.cpp
index 1d33628198b..337c0594512 100644
--- a/TAO/tao/Utils/ORB_Destroyer.cpp
+++ b/TAO/tao/Utils/ORB_Destroyer.cpp
@@ -3,7 +3,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
-TAO::Utils::ORB_Destroyer_Functor::operator() (CORBA::ORB_ptr orb) throw ()
+TAO::Utils::ORB_Destroyer_Functor::operator() (CORBA::ORB_ptr orb) noexcept
 {
   try
     {
diff --git a/TAO/tao/Utils/ORB_Destroyer.h b/TAO/tao/Utils/ORB_Destroyer.h
index e6febb40611..694ab3d35fc 100644
--- a/TAO/tao/Utils/ORB_Destroyer.h
+++ b/TAO/tao/Utils/ORB_Destroyer.h
@@ -35,7 +35,7 @@ namespace TAO
       typedef CORBA::ORB_ptr argument;
 
       /// Destroy the ORB
-      void operator() (CORBA::ORB_ptr orb) throw ();
+      void operator() (CORBA::ORB_ptr orb) noexcept;
     };
 
     /**
diff --git a/TAO/tao/Utils/PolicyList_Destroyer.cpp b/TAO/tao/Utils/PolicyList_Destroyer.cpp
index f4e06fcbc1c..67554c18b53 100644
--- a/TAO/tao/Utils/PolicyList_Destroyer.cpp
+++ b/TAO/tao/Utils/PolicyList_Destroyer.cpp
@@ -6,7 +6,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::Utils::PolicyList_Destroyer::~PolicyList_Destroyer() throw ()
+TAO::Utils::PolicyList_Destroyer::~PolicyList_Destroyer() noexcept
 {
   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 821ba11dbb7..9e18fd6acbc 100644
--- a/TAO/tao/Utils/PolicyList_Destroyer.h
+++ b/TAO/tao/Utils/PolicyList_Destroyer.h
@@ -34,7 +34,7 @@ namespace TAO
     {
     public:
       PolicyList_Destroyer(CORBA::ULong length_hint);
-      ~PolicyList_Destroyer() throw ();
+      ~PolicyList_Destroyer() noexcept;
     };
   } // namespace Utils
 } // namespace TAO
diff --git a/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h b/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h
index 163806e5da2..33d4c0bea3f 100644
--- a/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h
+++ b/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h
@@ -79,7 +79,7 @@ public:
   inline value_type * get_buffer(CORBA::Boolean orphan = false) {
     return impl_.get_buffer(orphan);
   }
-  inline void swap(bounded_valuetype_sequence & rhs) throw() {
+  inline void swap(bounded_valuetype_sequence & rhs) noexcept {
     impl_.swap(rhs.impl_);
   }
 
diff --git a/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h b/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h
index bc3d23335f8..876644394f5 100644
--- a/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h
+++ b/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h
@@ -82,7 +82,7 @@ public:
   inline value_type * get_buffer(CORBA::Boolean orphan = false) {
     return impl_.get_buffer(orphan);
   }
-  inline void swap(unbounded_valuetype_sequence & rhs) throw() {
+  inline void swap(unbounded_valuetype_sequence & rhs) noexcept {
     impl_.swap(rhs.impl_);
   }
 
diff --git a/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp b/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp
index 97e8ee72f65..f2ffdd12f74 100644
--- a/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp
+++ b/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp
@@ -13,13 +13,10 @@ PersistentPoa::PersistentPoa ()
 {
 }
 
-
-PersistentPoa::~PersistentPoa ()
-  throw ()
+PersistentPoa::~PersistentPoa () noexcept
 {
 }
 
-
 int PersistentPoa::init (int argc, ACE_TCHAR *argv[])
 {
   int result = 0;
diff --git a/TAO/tests/Bug_2936_Regression/PersistentPOA.h b/TAO/tests/Bug_2936_Regression/PersistentPOA.h
index 4bf9951ab43..d0c4cb61542 100644
--- a/TAO/tests/Bug_2936_Regression/PersistentPOA.h
+++ b/TAO/tests/Bug_2936_Regression/PersistentPOA.h
@@ -18,16 +18,13 @@ class bug2936_Export PersistentPoa
     PersistentPoa ();
 
     /// Destructor.
-    ~PersistentPoa ()
-      throw ();
+    ~PersistentPoa () noexcept;
 
-  // protected types and methods
   protected:
     virtual int init (int argc, ACE_TCHAR *argv[]);
 
     virtual int fini ();
 
-  // private methods and instance variables
   private:
     CORBA::ORB_var                 mv_orb;
     PortableServer::POA_var        mv_rootPOA;
diff --git a/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp b/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp
index ab58e626593..f5c5e4cbc49 100644
--- a/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp
+++ b/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp
@@ -8,8 +8,7 @@ PersistentPoa::PersistentPoa ()
 {
 }
 
-PersistentPoa::~PersistentPoa ()
-  throw ()
+PersistentPoa::~PersistentPoa () noexcept
 {
 }
 
diff --git a/TAO/tests/Bug_3251_Regression/PersistentPoa.h b/TAO/tests/Bug_3251_Regression/PersistentPoa.h
index 33402ea49d1..c09e319f5bb 100644
--- a/TAO/tests/Bug_3251_Regression/PersistentPoa.h
+++ b/TAO/tests/Bug_3251_Regression/PersistentPoa.h
@@ -16,8 +16,7 @@ class bug_3251_Export PersistentPoa:  public ACE_Service_Object
   public:
     PersistentPoa ();
 
-    ~PersistentPoa ()
-      throw ();
+    ~PersistentPoa () noexcept;
 
   // protected types and methods
   protected:
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
index d3911bd2262..946e30b8030 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
@@ -24,8 +24,7 @@ DllOrb::DllOrb (int nthreads)
 {
 }
 
-DllOrb::~DllOrb ()
-  throw ()
+DllOrb::~DllOrb () noexcept
 {
 #if defined (ACE_HAS_THREADS)
   delete mp_barrier;
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h
index d89675926db..a42c9ab236d 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h
@@ -26,7 +26,7 @@ class DllOrb_Export DllOrb
     DllOrb (int nthreads = 1);
 
     /// Destructor.
-    ~DllOrb () throw ();
+    ~DllOrb () noexcept;
 
     CORBA::ORB_ptr orb () const;
 
diff --git a/TAO/tests/POA/DSI/Database_i.cpp b/TAO/tests/POA/DSI/Database_i.cpp
index ffde543eed5..382c256fc04 100644
--- a/TAO/tests/POA/DSI/Database_i.cpp
+++ b/TAO/tests/POA/DSI/Database_i.cpp
@@ -358,7 +358,7 @@ DatabaseImpl::Employee::operator new (size_t size, const std::nothrow_t &)
 }
 
 void
-DatabaseImpl::Employee::operator delete (void *ptr, const std::nothrow_t&) throw ()
+DatabaseImpl::Employee::operator delete (void *ptr, const std::nothrow_t&) noexcept
 {
   DATABASE::instance ()->free (ptr);
 }
diff --git a/TAO/tests/POA/DSI/Database_i.h b/TAO/tests/POA/DSI/Database_i.h
index a097500c96c..8948004fd4f 100644
--- a/TAO/tests/POA/DSI/Database_i.h
+++ b/TAO/tests/POA/DSI/Database_i.h
@@ -112,7 +112,7 @@ public:
 
     /// Overloaded new operator, nothrow_t variant.
     void *operator new (size_t bytes, const std::nothrow_t &nt);
-    void operator delete (void *p, const std::nothrow_t&) throw ();
+    void operator delete (void *p, const std::nothrow_t&) noexcept;
     void *operator new (size_t);
     void operator delete (void *pointer);
 
diff --git a/TAO/utils/wxNamingViewer/wxAutoDialog.h b/TAO/utils/wxNamingViewer/wxAutoDialog.h
index a1e59cce11c..51292dc2ddb 100644
--- a/TAO/utils/wxNamingViewer/wxAutoDialog.h
+++ b/TAO/utils/wxNamingViewer/wxAutoDialog.h
@@ -3,15 +3,14 @@
 #ifndef i_wxAutoDialog_h
 #define i_wxAutoDialog_h
 
-
 template <class D>
 class WxAutoDialog
 {
 public:
-  explicit WxAutoDialog( D* dialog) throw():dialog( dialog) {}
-  ~WxAutoDialog() throw() { dialog->Destroy(); }
+  explicit WxAutoDialog( D* dialog) noexcept:dialog( dialog) {}
+  ~WxAutoDialog() noexcept { dialog->Destroy(); }
 
-  D* operator->() const throw() { return dialog; }
+  D* operator->() const noexcept { return dialog; }
 
 protected:
   D* dialog;