diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-08-03 19:13:52 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-08-03 19:13:52 +0000 |
| commit | fa1ddc8b72f59c2f8fb50d74d1ca7362d7099aaf (patch) | |
| tree | d9b5687e1a791686d8f3a412940179d7a619877a | |
| parent | 0905254fad9def418ef28e16deb87c6d67532cea (diff) | |
| download | ATCD-fa1ddc8b72f59c2f8fb50d74d1ca7362d7099aaf.tar.gz | |
Sat Aug 3 19:13:41 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* examples/OS/Process/process.cpp:
Renamed local variable to resolve scoreboard error
* tests/CDR_Array_Test.cpp:
Unicode logging fix
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/examples/OS/Process/process.cpp | 20 | ||||
| -rw-r--r-- | ACE/tests/CDR_Array_Test.cpp | 2 |
3 files changed, 19 insertions, 11 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 1e511169759..44ab4d94554 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Sat Aug 3 19:13:41 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/OS/Process/process.cpp: + Renamed local variable to resolve scoreboard error + + * tests/CDR_Array_Test.cpp: + Unicode logging fix + Fri Aug 2 12:52:08 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> * docs/bczar/bczar.html: diff --git a/ACE/examples/OS/Process/process.cpp b/ACE/examples/OS/Process/process.cpp index c65a7451c4c..99e538f8aaa 100644 --- a/ACE/examples/OS/Process/process.cpp +++ b/ACE/examples/OS/Process/process.cpp @@ -133,11 +133,11 @@ test_more (void) if (new_process.spawn (options) == -1) { - int error = ACE_OS::last_error (); + int const error_number = ACE_OS::last_error (); ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p errno = %d.\n"), ACE_TEXT ("test_more"), - error)); + error_number)); } ACE_exitcode status; @@ -163,11 +163,11 @@ test_date (void) ACE_Process new_process; if (new_process.spawn (options) == -1) { - int error = ACE_OS::last_error (); + int const error_number = ACE_OS::last_error (); ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p errno = %d.\n"), ACE_TEXT ("test_date"), - error)); + error_number)); return; } @@ -192,11 +192,11 @@ test_ls (void) ACE_Process new_process; if (new_process.spawn (options) == -1) { - int error = ACE_OS::last_error (); + int error_number = ACE_OS::last_error (); ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p errno = %d.\n"), ACE_TEXT ("test_ls"), - error)); + error_number)); } ACE_exitcode status; @@ -218,11 +218,11 @@ test_wait (void) ACE_Process process1; if (process1.spawn (options) == -1) { - int error = ACE_OS::last_error (); + int const error_number = ACE_OS::last_error (); ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p errno = %d.\n"), ACE_TEXT ("test_ls"), - error)); + error_number)); } int result; @@ -254,11 +254,11 @@ test_wait (void) ACE_Process process2; if (process2.spawn (options) == -1) { - int error = ACE_OS::last_error (); + int const error_number = ACE_OS::last_error (); ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p errno = %d.\n"), ACE_TEXT ("test_ls"), - error)); + error_number)); } //FUZZ: disable check_for_lack_ACE_OS diff --git a/ACE/tests/CDR_Array_Test.cpp b/ACE/tests/CDR_Array_Test.cpp index be6448e9771..87d6d12f59b 100644 --- a/ACE/tests/CDR_Array_Test.cpp +++ b/ACE/tests/CDR_Array_Test.cpp @@ -622,7 +622,7 @@ CDR_Test<T, H>::do_test (int total, int niter, int use_array, CDR_Test<T, H>::ttoh (cv, cs); ACE_ERROR((LM_ERROR, ACE_TEXT ( "Wrong value at pos %d:" ) - ACE_TEXT ( " '%s' should be '%s'.\n" ), + ACE_TEXT ( " '%C' should be '%C'.\n" ), i, rs, cs)); errors++; if (errors == maxerrors) |