diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-03-30 09:34:35 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-03-30 09:34:35 +0000 |
| commit | 9379020e25ee533d959a8b753c1c7399ab3ef32b (patch) | |
| tree | e4545b6a8ae055313e981aaa6d430a75890f884f | |
| parent | 022f7a842dd994755bbf34cf9cd96bfab9a87ef4 (diff) | |
| download | ATCD-9379020e25ee533d959a8b753c1c7399ab3ef32b.tar.gz | |
Tue Mar 30 09:34:38 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Thread_Timer_Queue_Adapter_Test.cpp:
Fixed compilation problems with single threaded builds
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp | 11 |
2 files changed, 15 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index f67a045616d..fb0917b413c 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 30 09:34:38 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Thread_Timer_Queue_Adapter_Test.cpp: + Fixed compilation problems with single threaded builds + Tue Mar 30 07:50:02 UTC 2010 Vladimir Zykov <vladimir.zykov@prismtech.com> * tests/MT_NonBlocking_Connect_Test.cpp: diff --git a/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp b/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp index c3883b8c2c5..6b74e4a81da 100644 --- a/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp +++ b/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp @@ -13,9 +13,10 @@ #include "ace/Timer_Wheel.h" #include "ace/Timer_Queue_Adapters.h" - #include "test_config.h" +#if defined (ACE_HAS_THREADS) + /// ICustomEventHandler /// /// Used to demonstrate the usage of custom event handlers. This is called by the @@ -172,11 +173,15 @@ typedef ACE_Timer_Wheel_Iterator_T <ICustomEventHandler*, typedef ACE_Thread_Timer_Queue_Adapter<TTimerWheel, ICustomEventHandler*> TTimerWheelThreadAdapter; +#endif /* ACE_HAS_THREADS */ + int run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("Thread_Timer_Queue_Adapter_Test")); +#if defined (ACE_HAS_THREADS) + // Start the thread adapter TTimerWheelThreadAdapter TimerWheelThreadAdapter; TimerWheelThreadAdapter.activate(); @@ -292,6 +297,10 @@ run_main (int, ACE_TCHAR *[]) ACE_DEBUG((LM_DEBUG, ACE_TEXT("%I(%t) Success in Multiple timers test.\n"))); } +#else + ACE_ERROR ((LM_INFO, + ACE_TEXT ("threads not supported on this platform\n"))); +#endif /* ACE_HAS_THREADS */ ACE_END_TEST; return 0; |