Merge pull request #577 from jwillemsen/jwi-wfmo-versioned

Fixed errors with versioned namespace builds
DOCGroup · Feb 24, 2018 · b93453d · b93453d
2 parents 6dc76be + 250aef2
commit b93453d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp b/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp
@@ -21,8 +21,6 @@
 
 #include "ace/WFMO_Reactor.h"
 
-
-
 class Event_Handler : public ACE_Event_Handler
 {
 public:
@@ -55,6 +53,8 @@ class Event_Handler : public ACE_Event_Handler
   ACE_Manual_Event event_;
 };
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_WFMO_Reactor_Test
 {
 public:
@@ -81,6 +81,8 @@ class ACE_WFMO_Reactor_Test
   }
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
 {

diff --git a/ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp b/ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp
@@ -17,8 +17,6 @@
 #include "ace/Reactor.h"
 #include "ace/WFMO_Reactor.h"
 
-
-
 class Event_Handler : public ACE_Event_Handler
 {
 public:
@@ -31,6 +29,8 @@ class Event_Handler : public ACE_Event_Handler
   ACE_Event event_;
 };
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_WFMO_Reactor_Test
 {
 public:
@@ -47,16 +47,16 @@ class ACE_WFMO_Reactor_Test
   }
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
 {
   Event_Handler handler;
   ACE_WFMO_Reactor reactor;
   ACE_Reactor base_reactor (&reactor);
 
-  //FUZZ: disable check_for_lack_ACE_OS
-  ACE_Time_Value time (1);
-  //FUZZ: enable check_for_lack_ACE_OS
+  ACE_Time_Value sleep_sleep_time (1);
 
   int result =
     reactor.register_handler (&handler);
@@ -74,7 +74,7 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   ACE_WFMO_Reactor_Test::check_for_valid_state (reactor,
                                                 1, 0, 0, 1);
 
-  result = base_reactor.run_reactor_event_loop (time);
+  result = base_reactor.run_reactor_event_loop (sleep_time);
   ACE_TEST_ASSERT (result != -1);
 
   ACE_WFMO_Reactor_Test::check_for_valid_state (reactor,
@@ -87,7 +87,7 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   ACE_WFMO_Reactor_Test::check_for_valid_state (reactor,
                                                 1, 0, 0, 0);
 
-  result = base_reactor.run_reactor_event_loop (time);
+  result = base_reactor.run_reactor_event_loop (sleep_time);
   ACE_TEST_ASSERT (result != -1);
 
   ACE_WFMO_Reactor_Test::check_for_valid_state (reactor,
@@ -109,7 +109,7 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   ACE_WFMO_Reactor_Test::check_for_valid_state (reactor,
                                                 0, 0, 0, 1);
 
-  result = base_reactor.run_reactor_event_loop (time);
+  result = base_reactor.run_reactor_event_loop (sleep_time);
   ACE_TEST_ASSERT (result != -1);
 
   ACE_WFMO_Reactor_Test::check_for_valid_state (reactor,
@@ -129,7 +129,7 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   ACE_WFMO_Reactor_Test::check_for_valid_state (reactor,
                                                 1, 1, 0, 0);
 
-  result = base_reactor.run_reactor_event_loop (time);
+  result = base_reactor.run_reactor_event_loop (sleep_time);
   ACE_TEST_ASSERT (result != -1);
 
   ACE_WFMO_Reactor_Test::check_for_valid_state (reactor,
@@ -151,7 +151,7 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   ACE_WFMO_Reactor_Test::check_for_valid_state (reactor,
                                                 0, 0, 0, 1);
 
-  result = base_reactor.run_reactor_event_loop (time);
+  result = base_reactor.run_reactor_event_loop (sleep_time);
   ACE_TEST_ASSERT (result != -1);
 
   ACE_WFMO_Reactor_Test::check_for_valid_state (reactor,