summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ChangeLog7
-rw-r--r--ACE/ace/INET_Addr.cpp2
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