diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-02-24 17:34:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-24 17:34:10 +0100 |
| commit | b93453d8b0572093c0255e6238de3f311c2f913b (patch) | |
| tree | a0b1ea9f5ccadd9c1b95a6c0caa116db27c16cd1 | |
| parent | 6dc76be4f27a50bda90c8a7ead7c05d66239257b (diff) | |
| parent | 250aef2e14bc22a9faffefb1999bc71646105d1c (diff) | |
| download | ATCD-b93453d8b0572093c0255e6238de3f311c2f913b.tar.gz | |
Merge pull request #577 from jwillemsen/jwi-wfmo-versioned
Fixed errors with versioned namespace builds
| -rw-r--r-- | ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp | 6 | ||||
| -rw-r--r-- | ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp | 20 |
2 files changed, 14 insertions, 12 deletions
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp b/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp index fc4bf1c263c..a0e512a6fc5 100644 --- 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 @@ private: ACE_Manual_Event event_; }; +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + class ACE_WFMO_Reactor_Test { public: @@ -81,6 +81,8 @@ public: } }; +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 index f2093f0e3e7..78f8107aac9 100644 --- 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 @@ public: ACE_Event event_; }; +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + class ACE_WFMO_Reactor_Test { public: @@ -47,6 +47,8 @@ public: } }; +ACE_END_VERSIONED_NAMESPACE_DECL + int ACE_TMAIN (int, ACE_TCHAR *[]) { @@ -54,9 +56,7 @@ ACE_TMAIN (int, ACE_TCHAR *[]) 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, |