1 files changed, 8 insertions, 13 deletions
diff --git a/ace/Proactor.inl b/ace/Proactor.inl
index 37b887c14d6..c4c29697efc 100644
--- a/ace/Proactor.inl
+++ b/ace/Proactor.inl
@@ -1,14 +1,11 @@
-// -*- C++ -*-
-//
+/* -*- C++ -*- */
 // $Id$
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE int
 ACE_Proactor::run_event_loop (void)
 {
   ACE_TRACE ("ACE_Proactor::run_event_loop");
-  ACE_Proactor * const p = ACE_Proactor::instance ();
+  ACE_Proactor *p = ACE_Proactor::instance ();
 
   if (p == 0)
     return -1;
@@ -20,12 +17,12 @@ ACE_INLINE int
 ACE_Proactor::run_event_loop (ACE_Time_Value &tv)
 {
   ACE_TRACE ("ACE_Proactor::run_event_loop (tv)");
-  ACE_Proactor * const p = ACE_Proactor::instance ();
+  ACE_Proactor *p = ACE_Proactor::instance ();
 
   if (p == 0)
     return -1;
 
-  return p->proactor_run_event_loop
+  return p->proactor_run_event_loop 
     (tv, ACE_Proactor::check_reconfiguration);
 }
 
@@ -33,7 +30,7 @@ ACE_INLINE int
 ACE_Proactor::reset_event_loop(void)
 {
   ACE_TRACE ("ACE_Proactor::reset_event_loop");
-  ACE_Proactor * const p = ACE_Proactor::instance ();
+  ACE_Proactor *p = ACE_Proactor::instance ();
 
   if (p == 0)
     return -1;
@@ -45,7 +42,7 @@ ACE_INLINE int
 ACE_Proactor::end_event_loop (void)
 {
   ACE_TRACE ("ACE_Proactor::end_event_loop");
-  ACE_Proactor * const p = ACE_Proactor::instance ();
+  ACE_Proactor *p = ACE_Proactor::instance ();
 
   if (p == 0)
     return -1;
@@ -57,7 +54,7 @@ ACE_INLINE int
 ACE_Proactor::event_loop_done (void)
 {
   ACE_TRACE ("ACE_Proactor::event_loop_done");
-  ACE_Proactor * const p = ACE_Proactor::instance ();
+  ACE_Proactor *p = ACE_Proactor::instance ();
 
   if (p == 0)
     return -1;
@@ -69,12 +66,10 @@ ACE_INLINE int
 ACE_Proactor::post_wakeup_completions (int how_many)
 {
   ACE_TRACE ("ACE_Proactor::post_wakeup_completions");
-  ACE_Proactor * const p = ACE_Proactor::instance ();
+  ACE_Proactor *p = ACE_Proactor::instance ();
 
   if (p == 0)
     return -1;
 
   return p->proactor_post_wakeup_completions (how_many);
 }
-
-ACE_END_VERSIONED_NAMESPACE_DECL