summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2009-11-26 13:33:44 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2009-11-26 13:33:44 +0000
commitfa1fa52c48f1e5b36e805a3a653a5f79e4d97d5a (patch)
treeaee41735bd6169683674bebd3ea1af4c7b95f983
parent7afa7365d20242ff44324808ed86435bff56bd58 (diff)
downloadATCD-fa1fa52c48f1e5b36e805a3a653a5f79e4d97d5a.tar.gz
Thu Nov 26 12:33:00 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Message_Queue_Test.cpp: Fixed msvc warning
-rw-r--r--ACE/ChangeLog9
-rw-r--r--ACE/tests/Message_Queue_Test.cpp3
2 files changed, 8 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index efdd875f603..280299e9ead 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,9 +1,14 @@
+Thu Nov 26 12:33:00 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tests/Message_Queue_Test.cpp:
+ Fixed msvc warning
+
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.
-
+ 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 a1e9431b82d..fbf029bc5eb 100644
--- a/ACE/tests/Message_Queue_Test.cpp
+++ b/ACE/tests/Message_Queue_Test.cpp
@@ -213,8 +213,7 @@ Counting_Test_Consumer::svc (void)
// a calculated number of blocks then stop; the test checker will determine
// if the number consumed plus the number remaining is correct for the
// number produced.
-
- ACE_RANDR_TYPE seed = ACE_OS::time ();
+ ACE_RANDR_TYPE seed = static_cast<ACE_RANDR_TYPE> (ACE_OS::time ());
int multiple = ACE_OS::rand_r (seed) % 10;
int delay_ms = ACE_OS::rand_r (seed) % 10;