diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-05-13 17:34:36 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-05-13 17:34:36 +0000 |
| commit | eb5e737bb94341f2f5596048ed16fc3802a0be7d (patch) | |
| tree | 737d0c9b198234eeeaf42ce3fbd22b6c59f40759 | |
| parent | cd229b5d59474c87fab7b5e8ca99a11a29e826eb (diff) | |
| download | ATCD-eb5e737bb94341f2f5596048ed16fc3802a0be7d.tar.gz | |
Mon May 13 17:34:28 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/INET_Addr_Test.cpp:
Fixed error in logging
* tests/Multihomed_INET_Addr_Test.cpp:
Unicode fixes
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/tests/INET_Addr_Test.cpp | 2 | ||||
| -rw-r--r-- | ACE/tests/Multihomed_INET_Addr_Test.cpp | 8 |
3 files changed, 13 insertions, 5 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 23e090bba05..f0f1e907144 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Mon May 13 17:34:28 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/INET_Addr_Test.cpp: + Fixed error in logging + + * tests/Multihomed_INET_Addr_Test.cpp: + Unicode fixes + Mon May 13 07:13:57 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> * NEWS: diff --git a/ACE/tests/INET_Addr_Test.cpp b/ACE/tests/INET_Addr_Test.cpp index b339a7b2dfa..ded94646e05 100644 --- a/ACE/tests/INET_Addr_Test.cpp +++ b/ACE/tests/INET_Addr_Test.cpp @@ -96,7 +96,7 @@ int run_main (int, ACE_TCHAR *[]) ACE_TEXT ("0x%x != 0x%x\n"), ipv4_addresses[i], addr.get_ip_address (), - addr32)); + ACE_HTONL (addr32))); status = 1; } diff --git a/ACE/tests/Multihomed_INET_Addr_Test.cpp b/ACE/tests/Multihomed_INET_Addr_Test.cpp index 100bc588bb3..d0c5a62537c 100644 --- a/ACE/tests/Multihomed_INET_Addr_Test.cpp +++ b/ACE/tests/Multihomed_INET_Addr_Test.cpp @@ -221,8 +221,8 @@ int run_main (int, ACE_TCHAR *[]) if (0 != ACE_OS::strcmp (addr.get_host_addr(), primary_dotted_decimal)) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%s failed get_host_addr() check\n") - ACE_TEXT ("%s != %s\n"), + ACE_TEXT ("%C failed get_host_addr() check\n") + ACE_TEXT ("%C != %C\n"), primary_dotted_decimal, addr.get_host_addr (), primary_dotted_decimal)); @@ -406,8 +406,8 @@ int run_main (int, ACE_TCHAR *[]) if (0 != ACE_OS::strcmp (addr.get_host_addr(), primary_dotted_decimal)) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%s failed second get_ip_address() check\n") - ACE_TEXT ("%s != %s\n"), + ACE_TEXT ("%C failed second get_ip_address() check\n") + ACE_TEXT ("%C != %C\n"), primary_dotted_decimal, addr.get_host_addr (), primary_dotted_decimal)); |