summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-10-27 11:28:51 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-10-27 11:28:51 +0000
commit60a02578a8ad1219e9d4db4d38f8446b2c806ee7 (patch)
tree084365dc71605692e0ea5f126694d8cae858a9d0
parent48fa8ab3356af6d93c505ec7f3fc8209c44da54b (diff)
downloadATCD-60a02578a8ad1219e9d4db4d38f8446b2c806ee7.tar.gz
ChangeLogTag: Thu Oct 27 11:25:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ChangeLog5
-rw-r--r--tests/Process_Strategy_Test.cpp2
-rw-r--r--tests/Reactor_Dispatch_Order_Test.cpp2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d8c7773fb6..fd196f5d60f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 27 11:25:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * examples/Threads/barrier2.cpp:
+ 64bit fixes
+
Thu Oct 27 11:58:07 2005 Simon McQueen <sm@prismtech.com>
* bin/tao_other_tests.lst:
diff --git a/tests/Process_Strategy_Test.cpp b/tests/Process_Strategy_Test.cpp
index f74e36939d3..c95bac4ac3b 100644
--- a/tests/Process_Strategy_Test.cpp
+++ b/tests/Process_Strategy_Test.cpp
@@ -586,7 +586,7 @@ client (void *arg)
command = "read";
command_len = ACE_OS::strlen (command);
- int bytes_read = 0;
+ ssize_t bytes_read = 0;
if (connector.connect (stream, server_addr) == -1)
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/tests/Reactor_Dispatch_Order_Test.cpp b/tests/Reactor_Dispatch_Order_Test.cpp
index 9e90801f0d6..fe3b7a6adc5 100644
--- a/tests/Reactor_Dispatch_Order_Test.cpp
+++ b/tests/Reactor_Dispatch_Order_Test.cpp
@@ -145,7 +145,7 @@ test_reactor_dispatch_order (ACE_Reactor &reactor)
Handler handler (reactor);
// This should trigger a call to <handle_input>.
- int result =
+ ssize_t result =
ACE::send_n (handler.pipe_.write_handle (),
message,
ACE_OS::strlen (message));