Merge branch 'master' into format-security

17 files changed, 0 insertions, 19 deletions

diff --git a/ACE/examples/ASX/CCM_App/CCM_App.cpp b/ACE/examples/ASX/CCM_App/CCM_App.cpp
index 696fa0aa19e..1b59432e963 100644
--- a/ACE/examples/ASX/CCM_App/CCM_App.cpp
+++ b/ACE/examples/ASX/CCM_App/CCM_App.cpp
@@ -6,7 +6,6 @@
 #include "ace/svc_export.h"
 
 
-
 typedef ACE_Task<ACE_SYNCH> MT_Task;
 typedef ACE_Stream<ACE_SYNCH> MT_Stream;
 typedef ACE_Module<ACE_SYNCH> MT_Module;
diff --git a/ACE/examples/ASX/CCM_App/SC_Client.cpp b/ACE/examples/ASX/CCM_App/SC_Client.cpp
index 311de59c89d..f38955830ad 100644
--- a/ACE/examples/ASX/CCM_App/SC_Client.cpp
+++ b/ACE/examples/ASX/CCM_App/SC_Client.cpp
@@ -1,7 +1,6 @@
 #include "ace/ACE.h"
 
 
-
 // Pretty simple, eh? ;-)
 
 int
diff --git a/ACE/examples/ASX/CCM_App/SC_Server.cpp b/ACE/examples/ASX/CCM_App/SC_Server.cpp
index 8cfa03453f9..5b77547b128 100644
--- a/ACE/examples/ASX/CCM_App/SC_Server.cpp
+++ b/ACE/examples/ASX/CCM_App/SC_Server.cpp
@@ -9,7 +9,6 @@
 #include "ace/Sig_Adapter.h"
 
 
-
 class Event_Handler : public ACE_Event_Handler
 {
 public:
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp
index 3cafe8d1149..287fefcf1fc 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp
@@ -6,7 +6,6 @@
 #include "Options.h"
 
 
-
 Consumer_Router::Consumer_Router (Peer_Router_Context *prc)
   : Peer_Router (prc)
 {
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp
index 33e079ca875..d97f61f976c 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp
@@ -4,7 +4,6 @@
 #include "Event_Analyzer.h"
 
 
-
 int
 Event_Analyzer::open (void *)
 {
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp
index 76c24753020..d8ee1bddc3d 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp
@@ -9,7 +9,6 @@
 #include "Options.h"
 
 
-
 /* static */
 Options *Options::instance_ = 0;
 
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Options.h b/ACE/examples/ASX/Event_Server/Event_Server/Options.h
index de5bc064093..5d125cb16ee 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Options.h
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Options.h
@@ -113,7 +113,6 @@ private:
 
   static Options *instance_;
   // Static Singleton.
-
 };
 
 #include "Options.inl"
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
index 41f00d1bb4c..c9b98e55bac 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
@@ -7,7 +7,6 @@
 #include "Peer_Router.h"
 
 
-
 // Send the <ACE_Message_Block> to all the peers.  Note that in a
 // "real" application this logic would most likely be more selective,
 // i.e., it would actually do "routing" based on addressing
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
index 68ac0b56e6c..edea2f8968d 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
@@ -6,7 +6,6 @@
 #include "Options.h"
 
 
-
 // Handle outgoing messages in a separate thread.
 
 int
diff --git a/ACE/examples/ASX/Message_Queue/bounded_buffer.cpp b/ACE/examples/ASX/Message_Queue/bounded_buffer.cpp
index be146982be5..1024ab549da 100644
--- a/ACE/examples/ASX/Message_Queue/bounded_buffer.cpp
+++ b/ACE/examples/ASX/Message_Queue/bounded_buffer.cpp
@@ -9,7 +9,6 @@
 #include "ace/OS_NS_unistd.h"
 
 
-
 #if defined (ACE_HAS_THREADS)
 
 // The producer reads data from the stdin stream, creates a message,
diff --git a/ACE/examples/ASX/Message_Queue/buffer_stream.cpp b/ACE/examples/ASX/Message_Queue/buffer_stream.cpp
index 95408d3897d..e8f60673ba1 100644
--- a/ACE/examples/ASX/Message_Queue/buffer_stream.cpp
+++ b/ACE/examples/ASX/Message_Queue/buffer_stream.cpp
@@ -18,7 +18,6 @@
 #include "ace/Truncate.h"
 
 
-
 #if defined (ACE_HAS_THREADS)
 
 typedef ACE_Stream<ACE_MT_SYNCH> MT_Stream;
@@ -66,7 +65,6 @@ public:
   // Receive message from producer and print to stdout.
 
 private:
-
   ACE_Time_Value timeout_;
 };
 
diff --git a/ACE/examples/ASX/Message_Queue/priority_buffer.cpp b/ACE/examples/ASX/Message_Queue/priority_buffer.cpp
index cb72c5fa5e9..c622d99844b 100644
--- a/ACE/examples/ASX/Message_Queue/priority_buffer.cpp
+++ b/ACE/examples/ASX/Message_Queue/priority_buffer.cpp
@@ -11,7 +11,6 @@
 #include "ace/Truncate.h"
 
 
-
 #if defined (ACE_HAS_THREADS)
 
 // Global thread manager.
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
index 75755e7d538..9f756808704 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
@@ -5,7 +5,6 @@
 #include "Options.h"
 
 
-
 #if defined (ACE_HAS_THREADS)
 
 typedef Acceptor_Factory<Consumer_Handler, CONSUMER_KEY> CONSUMER_FACTORY;
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp
index 53341e28ee3..511ef3e899b 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp
@@ -3,7 +3,6 @@
 #include "Event_Analyzer.h"
 
 
-
 #if defined (ACE_HAS_THREADS)
 
 int
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp
index 2c464220d6e..80084147d6e 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp
@@ -9,7 +9,6 @@
 #include "Options.h"
 
 
-
 #if defined (ACE_HAS_THREADS)
 
 Options::Options (void)
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp
index 51daaf8dcd7..7e8797e5102 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp
@@ -9,7 +9,6 @@
 #include "Options.h"
 
 
-
 #if defined (ACE_HAS_THREADS)
 
 // Define some short-hand macros to deal with long templates
@@ -140,7 +139,6 @@ Peer_Handler<ROUTER, KEY>::open (void *a)
 template <class ROUTER, class KEY> int
 Peer_Handler<ROUTER, KEY>::handle_input (ACE_HANDLE h)
 {
-
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) input arrived on sd %d\n"), h));
 //  ACE_Reactor::instance ()->remove_handler(h,
 //                                          ACE_Event_Handler::ALL_EVENTS_MASK
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
index 9eaa54699a4..17cf3dd51f2 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
@@ -5,7 +5,6 @@
 #include "Supplier_Router.h"
 
 
-
 #if defined (ACE_HAS_THREADS)
 
 typedef Acceptor_Factory<Supplier_Handler, SUPPLIER_KEY> SUPPLIER_FACTORY;