summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Cleeland <chris.cleeland@gmail.com>2005-06-03 14:31:10 +0000
committerChris Cleeland <chris.cleeland@gmail.com>2005-06-03 14:31:10 +0000
commit4ad85f30f9a9d1bcd37804183bab7ed44017b86c (patch)
treeeac843cee3b1d35dac9be9412c478fe4643df9fe
parentb085c45564c5cb7d4a8e12529783d1ddf7324839 (diff)
downloadATCD-4ad85f30f9a9d1bcd37804183bab7ed44017b86c.tar.gz
Fri Jun 3 09:17:13 2005 Chris Cleeland <cleeland_c@ociweb.com>
-rw-r--r--TAO/ChangeLog13
-rw-r--r--TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp4
2 files changed, 14 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index edb2853913a..4b28c201cb0 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Fri Jun 3 09:17:13 2005 Chris Cleeland <cleeland_c@ociweb.com>
+
+ * tests/IOR_Endpoint_Hostnames/list_interfaces.cpp (main):
+
+ Since this code was copied from
+ TAO_IIOP_Acceptor::probe_interfaces(), update this code to look
+ like the code there. This was also in response to seemingly
+ nonsense complaints on one platform in the line containing
+ ACE_static_cast(), so hopefully the change to static_cast<>
+ remedies that as well.
+
Fri Jun 3 14:49:14 2005 Simon McQueen <sm@prismtech.com>
* orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp:
@@ -17,7 +28,7 @@ Thu Jun 2 11:06:05 2005 Justin Michel <michel_j@ociweb.com>
* orbsvcs/examples/ImR/Advanced/TestServer.cpp:
Add an explicit constructor to work around BCB6 compiler
- warnings about implicit char* to string conversion.
+ warnings about implicit char* to string conversion.
Thu Jun 2 09:10:38 2005 Chris Cleeland <cleeland_c@ociweb.com>
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp b/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
index 854c9c11cf1..ada38d98bf5 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
@@ -58,9 +58,9 @@ main (int argc, char *argv[])
// in the list of interfaces to query for a hostname, otherwise
// exclude it from the list.
if (if_cnt == lo_cnt)
- endpoint_count = ACE_static_cast(unsigned long, if_cnt);
+ endpoint_count = static_cast<unsigned long> (if_cnt);
else
- endpoint_count = ACE_static_cast(unsigned long, if_cnt - lo_cnt);
+ endpoint_count = static_cast<unsigned long> (if_cnt - lo_cnt);
// The number of hosts/interfaces we want to cache may not be the
// same as the number of detected interfaces so keep a separate