diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-11-26 04:19:30 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-11-26 04:19:30 +0000 |
| commit | aedca8e3ff7a394ec7d94c4b51e1248d8b4cb747 (patch) | |
| tree | 6b3af3826ebba8ff76e2e2c8d3d08fc5e0f903c1 | |
| parent | f56c2bf097c52c9b3b4baab8e580363025544747 (diff) | |
| download | ATCD-aedca8e3ff7a394ec7d94c4b51e1248d8b4cb747.tar.gz | |
Thu Nov 26 04:19:02 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/tests/Message_Queue_Test.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index fd8f447c407..efdd875f603 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Thu Nov 26 04:19:02 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> + + * tests/Message_Queue_Test.cpp: + + Attempt to resolve warning for MSVC. + Tue Nov 24 09:39:00 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Tokenizer_T.cpp: diff --git a/ACE/tests/Message_Queue_Test.cpp b/ACE/tests/Message_Queue_Test.cpp index ac8a7135a8b..a1e9431b82d 100644 --- a/ACE/tests/Message_Queue_Test.cpp +++ b/ACE/tests/Message_Queue_Test.cpp @@ -123,7 +123,7 @@ Counting_Test_Producer::svc (void) // correct. // Also, to be sure there's not just 1 producer and 1 consumer pinging // back and forth, make the producers randomly delay between blocks. - ACE_OS::srand ((u_int) ACE_OS::time ()); + ACE_OS::srand (static_cast<ACE_RANDR_TYPE> (ACE_OS::time ())); int multiple = ACE_OS::rand () % 10; int delay_ms = (ACE_OS::rand () % 10) / 2; // The delay usually causes the test to time out in the automated |