diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-11-05 06:52:47 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-11-05 06:52:47 +0000 |
| commit | f2312152344f89a30586b9bf7149fa9707446b61 (patch) | |
| tree | e7363d77da5bdb1cce9c8fec65122835bff72682 | |
| parent | cc438d58cccc42a28a50df1f233bf706ebadb3e6 (diff) | |
| download | ATCD-f2312152344f89a30586b9bf7149fa9707446b61.tar.gz | |
ChangeLogTag:Tue Nov 5 05:54:16 UTC 2002 Don Hinton <dhinton@ieee.org>
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 10 | ||||
| -rw-r--r-- | tests/Multicast_Test.cpp | 8 | ||||
| -rw-r--r-- | tests/run_test.lst | 4 |
4 files changed, 26 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 766aafab3e1..7f7d69dcac6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Tue Nov 5 05:54:16 UTC 2002 Don Hinton <dhinton@ieee.org> + + * tests/Multicast_Test.cpp: Fixed typo in pragma instantiation, + and replaced an instance of char* with ACE_TCHAR* to fix unicode + builds. Added #ifdef for ACE_HAS_THREADS, since it uses + ACE_Task as an active object. + + * tests/run_test;lst: Turned off Multicast_Test and + Token_Stategy_Test for single threaded builds. + Mon Nov 4 18:01:25 UTC 2002 Don Hinton <dhinton@ieee.org> * tests/Makefile.bor: Added new Multicast_Test. Thanks to diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 766aafab3e1..7f7d69dcac6 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,13 @@ +Tue Nov 5 05:54:16 UTC 2002 Don Hinton <dhinton@ieee.org> + + * tests/Multicast_Test.cpp: Fixed typo in pragma instantiation, + and replaced an instance of char* with ACE_TCHAR* to fix unicode + builds. Added #ifdef for ACE_HAS_THREADS, since it uses + ACE_Task as an active object. + + * tests/run_test;lst: Turned off Multicast_Test and + Token_Stategy_Test for single threaded builds. + Mon Nov 4 18:01:25 UTC 2002 Don Hinton <dhinton@ieee.org> * tests/Makefile.bor: Added new Multicast_Test. Thanks to diff --git a/tests/Multicast_Test.cpp b/tests/Multicast_Test.cpp index fbb1f196509..0af18a90e1c 100644 --- a/tests/Multicast_Test.cpp +++ b/tests/Multicast_Test.cpp @@ -44,7 +44,7 @@ ACE_RCSID(tests, Multicast_Test, "$Id$") -#if defined (ACE_HAS_IP_MULTICAST) +#if defined (ACE_HAS_IP_MULTICAST) && defined (ACE_HAS_THREADS) /* * The 'finished' flag is used to break out of an infninite loop in the @@ -200,7 +200,7 @@ MCT_Config::open (int argc, ACE_TCHAR *argv[]) // 224.255.0.0 to 238.255.255.255, but we only allow the // administrative "site local" range, 239.255.0.0 to // 239.255.255.255. - char *group = getopt.opt_arg (); + ACE_TCHAR *group = getopt.opt_arg (); if (this->group_start_.set (group) != 0) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Bad group address:%s\n"), @@ -806,7 +806,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) template class ACE_Vector<ACE_CString *>; template class ACE_Array_Base<ACE_String_Base<char> *>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Vector<ACE_CString> +#pragma instantiate ACE_Vector<ACE_CString *> #pragma instantiate ACE_Array_Base<ACE_String_Base<char> *> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -823,4 +823,4 @@ ACE_TMAIN (int, ACE_TCHAR *argv[]) ACE_END_TEST; return 1; } -#endif /* ACE_HAS_IP_MULTICAST */ +#endif /* ACE_HAS_IP_MULTICAST && ACE_HAS_THREADS */ diff --git a/tests/run_test.lst b/tests/run_test.lst index 55c9573dde7..f7588b76a64 100644 --- a/tests/run_test.lst +++ b/tests/run_test.lst @@ -69,7 +69,7 @@ MT_Reactor_Timer_Test: !VxWorks MT_Reactor_Upcall_Test: !VxWorks MT_SOCK_Test: !chorus Malloc_Test: !VxWorks -Multicast_Test +Multicast_Test: !ST Naming_Test: OTHER !chorus !LynxOS !Unicos !VxWorks New_Fail_Test: ALL !DISABLED Notify_Performance_Test @@ -120,7 +120,7 @@ Timer_Queue_Test Timeprobe_Test Time_Service_Test: ALL !STATIC !DISABLED !missing_netsvcs TOKEN !chorus !Unicos Time_Value_Test -Token_Strategy_Test +Token_Strategy_Test: !ST Tokens_Test: ALL MSVC !DISABLED TOKEN !chorus !Unicos TP_Reactor_Test: ALL TSS_Test |