summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-03 00:38:41 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-03 00:38:41 +0000
commitcd979a2ced63601eab109cc10a44ffac5cb691e2 (patch)
treec2cf5c64731b2b8ff7bee0e99cb7010bcc9b10a4
parent8a42715a5c7eb6baa165bd6590c11a335c95e478 (diff)
downloadATCD-cd979a2ced63601eab109cc10a44ffac5cb691e2.tar.gz
ChangeLogTag:Fri Jul 2 19:37:16 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
-rw-r--r--ChangeLog-99b10
-rw-r--r--tests/Future_Test.cpp3
-rw-r--r--tests/Message_Queue_Test.cpp2
3 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b
index b783ee54eac..1b20d78f411 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,3 +1,13 @@
+Fri Jul 2 19:37:16 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
+
+ * tests/Future_Test.cpp:
+ The timeout variable was declared in one scope but used in
+ another one. Added another timeout variable to keep it happy.
+
+ * tests/Message_Queue_Test.cpp:
+ A pointer was initialize using "0x" i think it was a typo and
+ should be "0".
+
Fri Jul 2 13:54:14 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
* ace/Future_Set.cpp,
diff --git a/tests/Future_Test.cpp b/tests/Future_Test.cpp
index 091f99aeb9d..7618f6b2795 100644
--- a/tests/Future_Test.cpp
+++ b/tests/Future_Test.cpp
@@ -556,6 +556,7 @@ main (int, ASYS_TCHAR *[])
ASYS_TEXT ("ACE_Future<T>::Set followed by Ace_Future<T>::Get does ")
ASYS_TEXT ("not work, broken Ace_Future<> implementation.\n")));
}
+
{
ACE_DEBUG ((LM_DEBUG,
ASYS_TEXT ("Checking if Ace_Future<T>::operator= is implemented ")
@@ -581,6 +582,8 @@ main (int, ASYS_TCHAR *[])
// implementation was bad
int value = 0;
+ ACE_Time_Value timeout (ACE_OS::gettimeofday () + ACE_Time_Value (10));
+
f1.set (100);
f1.get (value, &timeout);
diff --git a/tests/Message_Queue_Test.cpp b/tests/Message_Queue_Test.cpp
index 92267fd6837..bbf1721b103 100644
--- a/tests/Message_Queue_Test.cpp
+++ b/tests/Message_Queue_Test.cpp
@@ -225,7 +225,7 @@ single_thread_performance_test (int queue_type = 0)
MAX_MESSAGE_SIZE),
-1);
- ACE_Message_Block **receive_block_p = 0x;
+ ACE_Message_Block **receive_block_p = 0;
ACE_NEW_RETURN (receive_block_p,
ACE_Message_Block *[max_messages],
-1);