diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2007-01-05 13:19:23 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2007-01-05 13:19:23 +0000 |
| commit | 8cf1727754ed9f0f0eb7ecde157298f4c7dd41ee (patch) | |
| tree | 0b402ed0258623614e866a31887d99e07be93777 | |
| parent | d9547a49d5080dfb393b6c06bf5279a74df8184b (diff) | |
| download | ATCD-8cf1727754ed9f0f0eb7ecde157298f4c7dd41ee.tar.gz | |
Fri Jan 5 13:15:16 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/ace/INET_Addr.cpp | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 2e7d5de1255..e2fa82c2461 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Fri Jan 5 13:15:16 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/INET_Addr.cpp: + + Replaced #if ACE_HAS_IPV6 with #if defined () to avoid confusing + doxygen. + Fri Jan 5 12:59:18 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Manual_Event_Test.cpp: diff --git a/ACE/ace/INET_Addr.cpp b/ACE/ace/INET_Addr.cpp index 45b7738dbe9..b32fe9ddfb5 100644 --- a/ACE/ace/INET_Addr.cpp +++ b/ACE/ace/INET_Addr.cpp @@ -53,7 +53,7 @@ ACE_INET_Addr::addr_to_string (ACE_TCHAR s[], + 1 // sizeof (':'), addr/port sep + 1; // sizeof ('\0'), terminating NUL ACE_TCHAR const *format = ACE_LIB_TEXT("%s:%d"); -#if ACE_HAS_IPV6 +#if defined (ACE_HAS_IPV6) if (ACE_OS::strchr(hoststr,':') != 0) { total_len += 2; // ACE_OS::strlen ("[]") IPv6 addr frames |