Mon Sep 13 18:15:27 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

          *:
          Zapped trailing whitespaces using
          find -name \*.h -o -name \*.cpp -name \*.inl | xargs perl -i -pe's/\s+\n/\n/'

52 files changed, 120 insertions, 118 deletions

diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h
index b021dcaa44c..55e623d21ed 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h
@@ -20,12 +20,12 @@
 class  Messenger_i : public virtual POA_Messenger
 {
 public:
-  //Constructor 
+  //Constructor
   Messenger_i (void);
-  
-  //Destructor 
+
+  //Destructor
   virtual ~Messenger_i (void);
-  
+
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h
index b021dcaa44c..55e623d21ed 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h
@@ -20,12 +20,12 @@
 class  Messenger_i : public virtual POA_Messenger
 {
 public:
-  //Constructor 
+  //Constructor
   Messenger_i (void);
-  
-  //Destructor 
+
+  //Destructor
   virtual ~Messenger_i (void);
-  
+
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Priorities.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Priorities.h
index 581af1cb221..8fd79a67cb8 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Priorities.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Priorities.h
@@ -1,4 +1,4 @@
-// $Id$ 
+// $Id$
 
 #ifndef _PRIORITIES_H_
 #define _PRIORITIES_H_
@@ -7,4 +7,4 @@
 #define HIGH_PRIORITY 0
 #define DEFAULT_PRIORITY LOW_PRIORITY
 
-#endif 
+#endif
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h
index ef9b4a759a2..3ea208dd978 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h
@@ -13,12 +13,12 @@
 class  Messenger_i : public virtual POA_Messenger
 {
 public:
-  //Constructor 
+  //Constructor
   Messenger_i (void);
-  
-  //Destructor 
+
+  //Destructor
   virtual ~Messenger_i (void);
-  
+
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h
index ef9b4a759a2..3ea208dd978 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h
@@ -13,12 +13,12 @@
 class  Messenger_i : public virtual POA_Messenger
 {
 public:
-  //Constructor 
+  //Constructor
   Messenger_i (void);
-  
-  //Destructor 
+
+  //Destructor
   virtual ~Messenger_i (void);
-  
+
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
index e5d5ca95c44..eade1aa488f 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
@@ -12,6 +12,7 @@
 #include "orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h"
 #include "orbsvcs/FtRtEvent/Utils/Log.h"
 #include "ace/OS_main.h"
+#include "ace/OS_NS_strings.h"
 
 int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
index c3fbcce5f76..60988ef91a8 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
@@ -6,6 +6,7 @@
 #include "ace/SOCK_Acceptor.h"
 #include "ace/SOCK_Stream.h"
 #include "orbsvcs/FtRtEvent/Utils/UUID.h"
+#include "ace/OS_NS_sys_time.h"
 
 const int WAIT_FOR_REGISTRATION_TIME = 10; //sec
 const int MAX_ID_STRING = 10;
diff --git a/TAO/orbsvcs/IFR_Service/drv_private_ifr.h b/TAO/orbsvcs/IFR_Service/drv_private_ifr.h
index e901e9a97be..26064d473b7 100644
--- a/TAO/orbsvcs/IFR_Service/drv_private_ifr.h
+++ b/TAO/orbsvcs/IFR_Service/drv_private_ifr.h
@@ -75,10 +75,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // The ACE_Process_Options default size of 1024 is sometimes not enough.
 const unsigned long TAO_IDL_COMMAND_LINE_BUFFER_SIZE = 4 * 1024;
 
-extern const char *DRV_files[];   
+extern const char *DRV_files[];
 // All files to be processed.
 
-extern long DRV_nfiles;     
+extern long DRV_nfiles;
 // How many are there?
 
 extern long DRV_file_index;
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h
index 41860b51a21..0be2c96e0bb 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h
@@ -45,7 +45,7 @@ public:
   virtual int visit_structure (AST_Structure *node);
   virtual int visit_enum (AST_Enum *node);
   virtual int visit_union (AST_Union *node);
-  
+
   virtual CORBA::IDLType_ptr ir_current (void) const;
   // Lets the visitor one level above acess this value.
 
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h
index 21c3e6475d2..bb19ea4ed0d 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h
@@ -45,10 +45,10 @@ public:
   virtual int visit_structure (AST_Structure *node);
   virtual int visit_enum (AST_Enum *node);
   virtual int visit_union (AST_Union *node);
-  
+
   virtual CORBA::IDLType_ptr ir_current (void) const;
   // Lets the visitor one level above acess this value.
-  
+
 private:
   int add_members (AST_Union *node, CORBA::UnionDef_ptr union_def);
   // Common code called whether we are creating a new union
diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_visitor.h
index a280bd84101..f9b91f173b3 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_visitor.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_visitor.h
@@ -41,7 +41,7 @@ class ifr_visitor : public ast_visitor
   //
 public:
   virtual ~ifr_visitor (void);
-  
+
   virtual int visit_decl (AST_Decl *d);
   virtual int visit_scope (UTL_Scope *node);
   virtual int visit_type (AST_Type *node);
@@ -96,7 +96,7 @@ public:
 
   ACE_Lock &lock (void) const;
   // Accessor for our lock.
-  
+
 protected:
   // Not abstract but we want to force subclassing anyway.
   ifr_visitor (void);
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
index f4dde176033..c0b22e1877e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
@@ -124,7 +124,7 @@ private:
 
   /// The default environment buffer length
   int env_buf_len_;
- 
+
   /// Maximum number of environment variables
   int max_env_vars_;
 };
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
index 2cf290d07c5..50af16887ac 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
@@ -145,7 +145,7 @@ private:
   /// The persistent XML file name.
   ACE_TString persist_file_name_;
 
-  /// Should check the server address and remove previous server if 
+  /// Should check the server address and remove previous server if
   /// the address is reused.
   bool unregister_if_address_reused_;
 };
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h
index 302df853cc8..b41e75d4426 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h
@@ -55,7 +55,7 @@ public:
   int init (const Options& opts);
 
   int unregister_if_address_reused (const ACE_CString& server_id,
-                                    const ACE_CString& name, 
+                                    const ACE_CString& name,
                                     const char* partial_ior);
 
   /// Add a new server to the Repository
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h
index 5ab9d4bbc65..643ea3408f3 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h
@@ -46,10 +46,10 @@ public:
     virtual ~Callback() {}
 
     virtual void next_server (const ACE_CString& server_id,
-      const ACE_CString& server_name, const ACE_CString& aname, 
-      const ACE_CString& startup_cmd, const EnvList& env_vars, 
-      const ACE_CString& working_dir, const ACE_CString& actmode, 
-      int start_limit, const ACE_CString& partial_ior, 
+      const ACE_CString& server_name, const ACE_CString& aname,
+      const ACE_CString& startup_cmd, const EnvList& env_vars,
+      const ACE_CString& working_dir, const ACE_CString& actmode,
+      int start_limit, const ACE_CString& partial_ior,
       const ACE_CString& ior) = 0;
 
     virtual void next_activator (const ACE_CString& activator_name,
diff --git a/TAO/orbsvcs/PSS/PSDL_Interface_Scope.h b/TAO/orbsvcs/PSS/PSDL_Interface_Scope.h
index 3f28e08a3a3..9fc126fa966 100644
--- a/TAO/orbsvcs/PSS/PSDL_Interface_Scope.h
+++ b/TAO/orbsvcs/PSS/PSDL_Interface_Scope.h
@@ -68,7 +68,7 @@ class TAO_PSDL_Export TAO_PSDL_Interface_Scope : public TAO_PSDL_Scope
 
   int get_module_name (const ACE_CString &identifier_name,
                        ACE_CString &module_name);
-  
+
   int get_interface_name (const ACE_CString &identifier_name,
                           ACE_CString &interface_name);
 
diff --git a/TAO/orbsvcs/PSS/PSDL_Module_Scope.h b/TAO/orbsvcs/PSS/PSDL_Module_Scope.h
index 283a1067bb6..5ee36266477 100644
--- a/TAO/orbsvcs/PSS/PSDL_Module_Scope.h
+++ b/TAO/orbsvcs/PSS/PSDL_Module_Scope.h
@@ -65,10 +65,10 @@ class TAO_PSDL_Export TAO_PSDL_Module_Scope : public TAO_PSDL_Scope
             ACE_CString &identifier_type);
 
   int find (const ACE_CString &identifier_name);
-  
+
   int get_module_name (const ACE_CString &identifier_name,
                        ACE_CString &module_name);
-  
+
   int get_interface_name (const ACE_CString &identifier_name,
                           ACE_CString &interface_name);
 
diff --git a/TAO/orbsvcs/PSS/PSDL_Root_Scope.h b/TAO/orbsvcs/PSS/PSDL_Root_Scope.h
index df0856c8880..e4e2171fa50 100644
--- a/TAO/orbsvcs/PSS/PSDL_Root_Scope.h
+++ b/TAO/orbsvcs/PSS/PSDL_Root_Scope.h
@@ -65,10 +65,10 @@ public:
 
   int get_module_name (const ACE_CString &identifier_name,
                        ACE_CString &module_name);
-  
+
   int get_interface_name (const ACE_CString &identifier_name,
                           ACE_CString &interface_name);
-  
+
   /// Public methods to return the scopes needed.
   TAO_PSDL_Scope *parent_scope (void);
 
diff --git a/TAO/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.h b/TAO/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.h
index cd8d558a4a2..af1072746f0 100644
--- a/TAO/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.h
+++ b/TAO/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.h
@@ -47,7 +47,7 @@ private:
 
   void print_for_sequence_typedefs (ACE_CString identifier_type,
                                     ACE_CString identifier);
-  
+
   // Generate the code that should go into the stub implementation
   // file for the type_declarators.
   void gen_code_for_si (void);
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h b/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h
index 3a6d4463fa3..5f4119984e8 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h
@@ -36,7 +36,7 @@ static int configs_size = sizeof(configs)/sizeof(configs[0]);
 
 
 // This sets up Scheduler_Factory to use the runtime version.
-int scheduler_factory_setup = 
+int scheduler_factory_setup =
   ACE_Scheduler_Factory::use_runtime (configs_size, configs, infos_size, infos);
 
 // EOF
diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h
index ede10e0e1ec..a476858c61c 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h
@@ -30,7 +30,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class Fill_ACE_QoS
- * 
+ *
  * This class helps users to add new flow specs and provides
  * utility functions for filling up the flow specs for simplex/duplex
  * sessions.
diff --git a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h
index 11dcd720911..6df31d6cf67 100644
--- a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h
+++ b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h
@@ -79,7 +79,7 @@ ntptime (timeval t)
         return (s << 16 | usec2ntp((u_int)t.tv_usec) >> 16);
 }
 
-ACE_INLINE ACE_UINT32 
+ACE_INLINE ACE_UINT32
 ntptime()
 {
   //
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h
index 4c804304f54..bc3f03882db 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h
@@ -104,7 +104,7 @@ private:
  *
  * @brief Implements a Command object that invokes the
  * disconnected_i() method on the target, passing an argument of type
- * Object. 
+ * Object.
  *
  * <H2>Memory Managment</H2>
  * It does not assume ownership of Object nor the Target
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h
index ad80bc38f68..d72eeb81f17 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h
@@ -27,7 +27,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
   \class TAO_EC_Thread_Flags
 
   \brief Parse thread flags from string to a long.
- 
+
   Encapsulate flags used for creating threads with \a
   ACE_OS::thr_create and \a ACE_Task::activate.
 
@@ -76,7 +76,7 @@ public:
     \brief Returns value of THR_SCOPE_* used, or zero if unknown.
   */
   long scope() const { return this->scope_; }
- 
+
   /*!
     \brief Returns value of THR_SCHED_* used, or zero if unknown.
   */
@@ -90,7 +90,7 @@ public:
     \return the priority, or ACE_DEFAULT_THREAD_PRIORITY if the scheduler is unknown.
   */
   long default_priority () const;
- 
+
 
 
   struct Supported_Flag
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
index 49d4f1a30d4..9978ebac44d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
@@ -46,7 +46,7 @@ class TAO_LoadBalancing_Export TAO_LB_LoadManager
 public:
 
   /// Constructor.
-  TAO_LB_LoadManager (int ping_timeout, 
+  TAO_LB_LoadManager (int ping_timeout,
                       int ping_interval);
 
   virtual int svc (void);
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h b/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h
index 9ae1ef978e2..712d43deb0c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h
@@ -43,12 +43,12 @@ namespace CORBA
  * @brief Base Strategy for Log / Log Record Storage
  *
  */
-class TAO_Log_Serv_Export TAO_Log_Persistence_Strategy 
+class TAO_Log_Serv_Export TAO_Log_Persistence_Strategy
   : public ACE_Service_Object
 {
 public:
   /// @brief Log Store Factory
-  virtual TAO_LogStore* 
+  virtual TAO_LogStore*
     create_log_store (TAO_LogMgr_i* logmgr_i)     = 0;
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h
index 8c76dbc99a3..7b03ba75b03 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h
@@ -86,7 +86,7 @@ public:
   // Factory Methods
 
   /// Create the stream that can operate on a disk file
-  virtual TAO_Storable_Base *create_stream(const ACE_CString & file, 
+  virtual TAO_Storable_Base *create_stream(const ACE_CString & file,
                                            const ACE_TCHAR * mode);
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h
index eec7e570347..4210fb99c45 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h
@@ -32,8 +32,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * @brief The Event Map for Consumers.
  *
  */
-typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxySupplier, 
-                               TAO_SYNCH_RW_MUTEX> 
+typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxySupplier,
+                               TAO_SYNCH_RW_MUTEX>
   TAO_Notify_Consumer_Map;
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
index 3dc1b144832..afae176dab5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
@@ -52,7 +52,7 @@ public:
 
   TAO_Notify::Topology_Object* load_child (
     const ACE_CString &type,
-    CORBA::Long id, 
+    CORBA::Long id,
     const TAO_Notify::NVPList& attrs);
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
index ce95bb061ea..0e1012360e2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
@@ -26,7 +26,7 @@
 #include "orbsvcs/Notify/ID_Factory.h"
 #include "orbsvcs/Notify/ETCL_Filter.h"
 #include "orbsvcs/Notify/Topology_Saver.h"
-  
+
 
 #if defined(_MSC_VER)
 #pragma warning(push)
@@ -73,7 +73,7 @@ public:
 
   virtual TAO_Notify::Topology_Object* load_child (
           const ACE_CString &type,
-          CORBA::Long id, 
+          CORBA::Long id,
           const TAO_Notify::NVPList& attrs);
 
   virtual TAO_Notify_Object::ID get_filter_id (CosNotifyFilter::Filter_ptr filter);
@@ -82,7 +82,7 @@ public:
 
 protected:
 
-  CosNotifyFilter::Filter_ptr 
+  CosNotifyFilter::Filter_ptr
     create_filter (const char *constraint_grammar,
                    const TAO_Notify_Object::ID& id,
                    TAO_Notify_ETCL_Filter*& filter);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
index 77c27c7e2e8..d988afabfa2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
@@ -26,7 +26,7 @@
 #include "orbsvcs/Notify/Topology_Object.h"
 #include "orbsvcs/Notify/EventChannel.h"
 
-class TAO_Notify_EventChannel; 
+class TAO_Notify_EventChannel;
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
index 7810a37421b..bc9398463b2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
@@ -33,7 +33,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * @brief Service Object to obtain a CosNotifyFilter::FilterFactory reference.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_FilterFactory 
+class TAO_Notify_Serv_Export TAO_Notify_FilterFactory
   : public ACE_Service_Object, public TAO_Notify::Topology_Object
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h
index 29ffa7cd26c..f15f886431a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h
@@ -30,7 +30,7 @@ public:
   /// Remove the statistics for this event channel
   ~TAO_MonitorSupplierAdmin (void);
 
-  /// Register our statistic and control objects 
+  /// Register our statistic and control objects
   void register_stats_controls (TAO_MonitorEventChannel* mec,
                                 const ACE_CString& name);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
index 3419780448e..a61b936f5c4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
@@ -169,10 +169,10 @@ protected:
 
   /// The default PC QoS Properties.
   CosNotification::QoSProperties pc_qos_;
-  
+
   /// The default consumer admin filter operator.
   CosNotifyChannelAdmin::InterFilterGroupOperator defaultConsumerAdminFilterOp_;
-  
+
   /// The default supplier admin filter operator.
   CosNotifyChannelAdmin::InterFilterGroupOperator defaultSupplierAdminFilterOp_;
 };
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
index f191c6d45ac..e6a802e905e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
@@ -70,7 +70,7 @@ public:
 
   ACE_Time_Value last_ping() const;
   void last_ping(const ACE_Time_Value& tv);
- 
+
 protected:
   /// Access the Supplier
   TAO_Notify_Supplier* supplier (void);
@@ -78,7 +78,7 @@ protected:
   /// Accept an event from the Supplier
   void push_i (TAO_Notify_Event * event);
 
-  /// Last time either push an event or validate connection 
+  /// Last time either push an event or validate connection
   /// via _non_exist call.
   ACE_Atomic_Op<TAO_SYNCH_MUTEX, ACE_Time_Value> last_ping_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
index d4b8d62f7b1..ee2a9a2c4d3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
@@ -48,7 +48,7 @@ public:
   virtual ACE_CString get_ior (void) const;
 
 protected:
-  
+
   virtual CORBA::Object_ptr get_supplier (void);
 
   /// The Supplier
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h
index 63ea04584dd..c7617c94a47 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h
@@ -41,7 +41,7 @@ class TAO_Notify_EventChannelFactory;
  * = LOCKING
  * = TODO
  */
-class TAO_Notify_Serv_Export TAO_Notify_validate_client_Task 
+class TAO_Notify_Serv_Export TAO_Notify_validate_client_Task
   : public ACE_Task<ACE_NULL_SYNCH>
 {
 public:
@@ -65,7 +65,7 @@ private:
   /// The delay of first time validate.
   ACE_Time_Value delay_;
 
-  /// The validate interval 
+  /// The validate interval
   ACE_Time_Value interval_;
 
   /// The event channel
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
index c88007d70f3..394693e1d32 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
@@ -185,7 +185,7 @@ public:
    */
   void generic_factory (TAO_PG_GenericFactory * generic_factory);
 
-  /// Get active or inactive member count in a group. 
+  /// Get active or inactive member count in a group.
   size_t member_count (
     const PortableServer::ObjectId & oid, bool is_active);
 
@@ -193,7 +193,7 @@ public:
   bool is_alive (
     const PortableServer::ObjectId & oid,
     CORBA::Object_ptr member);
- 
+
   /// Remove the inactive members.
   void remove_inactive_members ();
 
@@ -246,10 +246,10 @@ private:
 
   /// Help function to get active or inactive member infos.
   TAO_PG_MemberInfo_Set get_members (bool is_alive);
-  
+
   /// Ping the remote to verify the connections.
-  bool ping (CORBA::ORB_ptr orb, 
-             CORBA::Object_var& obj, 
+  bool ping (CORBA::ORB_ptr orb,
+             CORBA::Object_var& obj,
              const TimeBase::TimeT& tt);
 
   /// Reference to the POA that created the object group references.
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h
index 318bb24e2aa..0814173a275 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h
@@ -34,9 +34,9 @@ public:
   /// Constructor
   Send_Task (void);
 
-  /// This is for compilers that are a PITA complaining that we are 
-  /// hiding something. 
-  virtual int init (int argc, ACE_TCHAR *argv[]) 
+  /// This is for compilers that are a PITA complaining that we are
+  /// hiding something.
+  virtual int init (int argc, ACE_TCHAR *argv[])
   {
     return ACE_Task_Base::init (argc, argv);
   }
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h b/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h
index 5ecc2954d86..cf80fb9115d 100644
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h
@@ -4,7 +4,7 @@
 #define TEST_IMPL_HPP
 
 #include "TestS.h"
-    
+
 class Server_impl   : public virtual POA_server
 {
 public:
@@ -13,7 +13,7 @@ public:
   virtual void shutdown ();
 
 private:
-  CORBA::ORB_var orb_;    
+  CORBA::ORB_var orb_;
 };
 
 #endif /* TEST_IMPL_HPP */
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h
index a11046ec762..4edfe313641 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h
@@ -11,7 +11,7 @@ class  Messenger_i : public POA_Messenger
 {
  public:
   Messenger_i (CORBA::ORB_ptr orb);
-  
+
   virtual ~Messenger_i (void);
 
   CORBA::Boolean send_message (const char * user_name,
@@ -23,7 +23,7 @@ class  Messenger_i : public POA_Messenger
   CosNotifyChannelAdmin::StructuredProxyPushConsumer_var consumer_proxy_;
 };
 
-#endif 
+#endif
 
 
 
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h
index a2b07b3fd30..9be7bc4cbdc 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h
@@ -6,7 +6,7 @@
 
 #include "orbsvcs/CosNotifyCommS.h"
 
-class StructuredEventConsumer_i : 
+class StructuredEventConsumer_i :
   public virtual POA_CosNotifyComm::StructuredPushConsumer
 {
 public:
@@ -30,4 +30,4 @@ private:
     int count_;
 };
 
-#endif 
+#endif
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h
index 8a3ab506e1f..376fb3873c7 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h
@@ -5,7 +5,7 @@
 
 #include "orbsvcs/CosNotifyCommS.h"
 
-class StructuredEventSupplier_i : 
+class StructuredEventSupplier_i :
   public virtual POA_CosNotifyComm::StructuredPushSupplier
 {
 public:
@@ -13,7 +13,7 @@ public:
     StructuredEventSupplier_i(CORBA::ORB_ptr orb);
     virtual void disconnect_structured_push_supplier ();
 
-    
+
     virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
@@ -23,4 +23,4 @@ private:
     CORBA::ORB_var orb_;
 };
 
-#endif 
+#endif
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.h b/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.h
index 12a504f7230..2201809a698 100644
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.h
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.h
@@ -4,7 +4,7 @@
 #define TEST_IMPL_HPP
 
 #include "TestS.h"
-    
+
 class Server_impl : public virtual POA_Test::Server
 {
 public:
@@ -13,7 +13,7 @@ public:
   virtual void shutdown ();
 
 private:
-  CORBA::ORB_var orb_;    
+  CORBA::ORB_var orb_;
 };
 
 #endif /* TEST_IMPL_HPP */
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
index ccb9c6c524c..4c0e0ef2ceb 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
@@ -13,12 +13,12 @@ class  Test_Dummy_i
   : public virtual POA_Test::Dummy
 {
 public:
-  // Constructor 
+  // Constructor
   Test_Dummy_i (void);
-  
-  // Destructor 
+
+  // Destructor
   virtual ~Test_Dummy_i (void);
-  
+
   virtual  char * getMessage (void);
 };
 
@@ -26,17 +26,17 @@ class  Test_Time_i
   : public virtual POA_Test::Time
 {
 public:
-  // Constructor 
+  // Constructor
   Test_Time_i (void);
-  
-  // Destructor 
+
+  // Destructor
   virtual ~Test_Time_i (void);
-  
+
   virtual
   ::CORBA::Long current_time (
       void
     );
-  
+
   virtual
   void shutdown (
       void
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h
index 4a4bc5670dd..e3e10eea60e 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h
@@ -17,12 +17,12 @@ class  Test_interfaceOne_i
   : public virtual POA_Test::interfaceOne
 {
 public:
-  // Constructor 
+  // Constructor
   Test_interfaceOne_i (void);
-  
-  // Destructor 
+
+  // Destructor
   virtual ~Test_interfaceOne_i (void);
-  
+
   virtual void getstruct (::Test::structOne_out tester);
 };
 
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h
index 3520155bf02..4ba52e0064b 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h
@@ -5,7 +5,7 @@
 #include <iostream>
 const char *ior = "file://ecf.ior";
 
-CosNotifyChannelAdmin::EventChannel_var 
+CosNotifyChannelAdmin::EventChannel_var
 get_event_channel(CORBA::ORB_ptr orb)
 
 {
@@ -20,8 +20,8 @@ get_event_channel(CORBA::ORB_ptr orb)
 
   if (CORBA::is_nil(obj.in ()))
   {
-    std::cerr << "Bad ec_fact.ior " << std::endl; 
-    ACE_OS::exit (1);    
+    std::cerr << "Bad ec_fact.ior " << std::endl;
+    ACE_OS::exit (1);
   }
 
   CosNotifyChannelAdmin::EventChannelFactory_var factory =
@@ -40,20 +40,20 @@ get_event_channel(CORBA::ORB_ptr orb)
   }
   catch (CORBA::SystemException& se )
   {
-    std::cerr << "System exception occurred during get_all_channels: " 
+    std::cerr << "System exception occurred during get_all_channels: "
       << se << std::endl;
     throw;
   }
 
   if( channelIdSeq->length() == 0 )
   {
-    try 
+    try
     {
       ec = factory->create_channel( init_qos, init_admin, id);
     }
     catch (CORBA::SystemException& se )
     {
-      std::cerr << "System exception occurred during find_channel: " 
+      std::cerr << "System exception occurred during find_channel: "
         << se << std::endl;
       throw;
     }
@@ -65,14 +65,14 @@ get_event_channel(CORBA::ORB_ptr orb)
     }
     catch (CosNotifyChannelAdmin::ChannelNotFound& )
     {
-      std::cerr << "ChannelNotFound: " 
+      std::cerr << "ChannelNotFound: "
         << channelIdSeq[0] << std::endl;
       throw;
     }
 
     catch (CORBA::SystemException& se )
     {
-      std::cerr << "System exception occurred during get_event_channel: " 
+      std::cerr << "System exception occurred during get_event_channel: "
         << se << std::endl;
       throw;
     }
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h
index 3520155bf02..4ba52e0064b 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h
@@ -5,7 +5,7 @@
 #include <iostream>
 const char *ior = "file://ecf.ior";
 
-CosNotifyChannelAdmin::EventChannel_var 
+CosNotifyChannelAdmin::EventChannel_var
 get_event_channel(CORBA::ORB_ptr orb)
 
 {
@@ -20,8 +20,8 @@ get_event_channel(CORBA::ORB_ptr orb)
 
   if (CORBA::is_nil(obj.in ()))
   {
-    std::cerr << "Bad ec_fact.ior " << std::endl; 
-    ACE_OS::exit (1);    
+    std::cerr << "Bad ec_fact.ior " << std::endl;
+    ACE_OS::exit (1);
   }
 
   CosNotifyChannelAdmin::EventChannelFactory_var factory =
@@ -40,20 +40,20 @@ get_event_channel(CORBA::ORB_ptr orb)
   }
   catch (CORBA::SystemException& se )
   {
-    std::cerr << "System exception occurred during get_all_channels: " 
+    std::cerr << "System exception occurred during get_all_channels: "
       << se << std::endl;
     throw;
   }
 
   if( channelIdSeq->length() == 0 )
   {
-    try 
+    try
     {
       ec = factory->create_channel( init_qos, init_admin, id);
     }
     catch (CORBA::SystemException& se )
     {
-      std::cerr << "System exception occurred during find_channel: " 
+      std::cerr << "System exception occurred during find_channel: "
         << se << std::endl;
       throw;
     }
@@ -65,14 +65,14 @@ get_event_channel(CORBA::ORB_ptr orb)
     }
     catch (CosNotifyChannelAdmin::ChannelNotFound& )
     {
-      std::cerr << "ChannelNotFound: " 
+      std::cerr << "ChannelNotFound: "
         << channelIdSeq[0] << std::endl;
       throw;
     }
 
     catch (CORBA::SystemException& se )
     {
-      std::cerr << "System exception occurred during get_event_channel: " 
+      std::cerr << "System exception occurred during get_event_channel: "
         << se << std::endl;
       throw;
     }
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
index 59f6477c7af..d85dc6edabb 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h
@@ -95,7 +95,7 @@ class FilterClient
 
   void wait_consumer_complete ();
 
-  void verify_filter (CosNotifyFilter::FilterAdmin_var& admin, 
+  void verify_filter (CosNotifyFilter::FilterAdmin_var& admin,
                       const char* constraint_expr,
                       const char* mod_constraint_expr);
 
@@ -145,7 +145,7 @@ class FilterClient
 
   CosNotifyChannelAdmin::AdminID adminid_1_id_;
   CosNotifyChannelAdmin::AdminID adminid_2_id_;
-  
+
   CosNotifyChannelAdmin::ChannelID channel_id_;
 
   bool use_persistent_;
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
index 34d0240c104..2249dcaef0e 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
@@ -59,7 +59,7 @@ public:
   virtual TAO_Notify_Object::ID get_filter_id (CosNotifyFilter::Filter_ptr filter);
   virtual CosNotifyFilter::Filter_ptr get_filter (const TAO_Notify_Object::ID& id);
   virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
-    
+
 protected:
   /// Release this object.
   virtual void release (void);
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h
index 2662b3acb41..b221cecf8e5 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h
@@ -53,7 +53,7 @@ static int configs_size = sizeof(configs)/sizeof(configs[0]);
 
 
 // This sets up Scheduler_Factory to use the runtime version.
-int scheduler_factory_setup = 
+int scheduler_factory_setup =
   ACE_Scheduler_Factory::use_runtime (configs_size, configs, infos_size, infos);
 
 // EOF
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
index b0fa2c85cbd..5b13c8e4912 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
@@ -56,7 +56,7 @@ static int configs_size = sizeof(configs)/sizeof(configs[0]);
 
 
 // This sets up Scheduler_Factory to use the runtime version.
-int scheduler_factory_setup = 
+int scheduler_factory_setup =
   ACE_Scheduler_Factory::use_runtime (configs_size, configs, infos_size, infos);
 
 // EOF