From 809d2a6a3040db66a203169fb5a24dcf8702036f Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 6 Feb 2007 19:14:51 +0000 Subject: 2007-02-06 Joel Sherrill * rtems++/Task1.cc, rtems++/Task3.cc: Address size_t/uint32_t typing issues in message queue tests. --- testsuites/libtests/ChangeLog | 5 +++++ testsuites/libtests/rtems++/Task1.cc | 10 +++++----- testsuites/libtests/rtems++/Task3.cc | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-) (limited to 'testsuites') diff --git a/testsuites/libtests/ChangeLog b/testsuites/libtests/ChangeLog index b7ad7ffd3c..1ce332efc1 100644 --- a/testsuites/libtests/ChangeLog +++ b/testsuites/libtests/ChangeLog @@ -1,3 +1,8 @@ +2007-02-06 Joel Sherrill + + * rtems++/Task1.cc, rtems++/Task3.cc: Address size_t/uint32_t typing + issues in message queue tests. + 2006-12-02 Ralf Corsépius * configure.ac: New BUG-REPORT address. diff --git a/testsuites/libtests/rtems++/Task1.cc b/testsuites/libtests/rtems++/Task1.cc index fae059bf4c..c4dda82f75 100644 --- a/testsuites/libtests/rtems++/Task1.cc +++ b/testsuites/libtests/rtems++/Task1.cc @@ -12,7 +12,7 @@ * Objective Design Systems Ltd Pty (ODS) * All rights reserved (R) Objective Design Systems Ltd Pty * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -502,7 +502,8 @@ void Task1::screen6(void) const char *u1 = "normal send"; const char *u2 = "urgent send"; char in[100]; - uint32_t size; + size_t size; + uint32_t count; printf("%s - send u1 to mq_2 - ", name_string()); mq_2.send(u1, strlen(u1) + 1); @@ -573,7 +574,6 @@ void Task1::screen6(void) wake_after(3000000); const char *b1 = "broadcast message"; - uint32_t count; printf("%s - broadcast send b1 ...\n", name_string()); mq_2.broadcast(b1, strlen(b1) + 1, count); @@ -643,8 +643,8 @@ void Task1::screen6(void) printf("%s\n", mq_2.last_status_string()); printf("%s - flush mq_2 - ", name_string()); - mq_2.flush(size); - printf("%s, flushed=%i\n", mq_2.last_status_string(), size); + mq_2.flush(count); + printf("%s, flushed=%i\n", mq_2.last_status_string(), count); printf(" * END MessageQueue Class test *\n"); } diff --git a/testsuites/libtests/rtems++/Task3.cc b/testsuites/libtests/rtems++/Task3.cc index 9c94c59640..25ab22c586 100644 --- a/testsuites/libtests/rtems++/Task3.cc +++ b/testsuites/libtests/rtems++/Task3.cc @@ -8,7 +8,7 @@ * * Output parameters: NONE * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -44,7 +44,7 @@ void Task3::screen6() { char in[100]; char out[100]; - uint32_t size; + size_t size; bool loopback = true; while (loopback) -- cgit v1.2.3