Merge branch 'jwi-portablegroupcleanup' of https://github.com/jwillemsen/ATCD into jwi-portablegroupcleanup

11 files changed, 34 insertions, 42 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,