Merge

--HG--
branch : trunk

1 files changed, 8 insertions, 4 deletions

diff --git a/src/shared/DelayExecutor.h b/src/shared/DelayExecutor.h
index 7a160d5ec92..664d8ca78a2 100644
--- a/src/shared/DelayExecutor.h
+++ b/src/shared/DelayExecutor.h
@@ -1,5 +1,5 @@
 #ifndef _M_DELAY_EXECUTOR_H
-#define    _M_DELAY_EXECUTOR_H
+#define _M_DELAY_EXECUTOR_H
 
 #include <ace/Task.h>
 #include <ace/Activation_Queue.h>
@@ -8,6 +8,7 @@
 class DelayExecutor : protected ACE_Task_Base
 {
     public:
+
         DelayExecutor();
         virtual ~DelayExecutor();
 
@@ -15,19 +16,22 @@ class DelayExecutor : protected ACE_Task_Base
 
         int execute(ACE_Method_Request* new_req);
 
-        int activate(int num_threads = 1, ACE_Method_Request* pre_svc_hook = 0, ACE_Method_Request* post_svc_hook = 0);
+        int activate(int num_threads = 1, ACE_Method_Request* pre_svc_hook = NULL, ACE_Method_Request* post_svc_hook = NULL);
 
         int deactivate();
 
         bool activated();
 
-        virtual int svc(void);
+        virtual int svc();
+
     private:
+
         ACE_Activation_Queue queue_;
         ACE_Method_Request* pre_svc_hook_;
         ACE_Method_Request* post_svc_hook_;
+        bool activated_;
 
         void activated(bool s);
-        bool activated_;
 };
+
 #endif // _M_DELAY_EXECUTOR_H