ChangeLogTag:Wed Mar 5 21:45:39 2003 Steve Huston <shuston@riverace.com>

3 files changed, 12 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 2f97d7d8ce0..1c287bb3139 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Mar  5 21:45:39 2003  Steve Huston  <shuston@riverace.com>
+
+	* ace/INET_Addr.cpp (get_port_number_from_name): Correct arg name
+	  for ACE_UNUSED_ARG. Suspected cut/paste error.
+
+	* tests/ACE_Test.cpp: const_cast the pointers returned from
+	  ACE::execname() so they can be deleted on MSVC6.
+
 Wed Mar  5 07:05:11 2003  Phil Mesnier  <mesnier_p@ociweb.com>
 
 	* ace/ace-dll.icc:
diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp
index e58e4aaaf94..ac5d28f2c2f 100644
--- a/ace/INET_Addr.cpp
+++ b/ace/INET_Addr.cpp
@@ -326,7 +326,7 @@ static int get_port_number_from_name (const char port_name[],
 
 #if defined (VXWORKS) || defined (CHORUS) || defined (ACE_LACKS_GETSERVBYNAME)
   port_number = -1;
-  ACE_UNUSED_ARG (host_name);
+  ACE_UNUSED_ARG (port_name);
   ACE_UNUSED_ARG (protocol);
 #else
   port_number = 0;
diff --git a/tests/ACE_Test.cpp b/tests/ACE_Test.cpp
index b9962c753c0..525c732c53d 100644
--- a/tests/ACE_Test.cpp
+++ b/tests/ACE_Test.cpp
@@ -36,7 +36,7 @@ execname_test (void)
   if (newname != prog1)   // Didn't find .exe correctly
     {
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("Name %s, not %s\n"), newname, prog1));
-      delete [] newname;
+      delete [] ACE_const_cast (ACE_TCHAR *, newname);
       ++error_count;
     }
 
@@ -44,7 +44,7 @@ execname_test (void)
   if (newname != prog2)   // Didn't find .exe correctly
     {
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("Name %s, not %s\n"), newname, prog2));
-      delete [] newname;
+      delete [] ACE_const_cast (ACE_TCHAR *, newname);
       ++error_count;
     }
 
@@ -56,7 +56,7 @@ execname_test (void)
       ++error_count;
     }
   else
-    delete [] newname;
+    delete [] ACE_const_cast (ACE_TCHAR *, newname);
 #endif /* ACE_WIN32 */
 
   return error_count;