Fri Sep 22 15:31:54 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com>

4 files changed, 22 insertions, 11 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 63960a9c828..f8c5e798d5d 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Fri Sep 22 15:31:54 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/IIOP_Acceptor.cpp:
+          Fix for remaining IPV6 test failures.
+
+        * tests/Bug_2188_Regression/broken.mpc:
+        * tests/Bug_2188_Regression/client.cpp:
+          Updated the mpc file to be consistent with current builds. Added
+          an explicit type case to the client to silence some build warnings.
+
+
 Thu Sep 21 14:59:37 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * tests/Bug_2188_Regression:
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index c1a78f3e02c..ce96357b3b2 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -722,6 +722,7 @@ TAO_IIOP_Acceptor::parse_address (const char *address,
     {
       if (addr.set((unsigned short)0,tmp_host) != 0)
         return -1;
+      this->default_address_.set(addr);
       host_defaulted = addr.is_any();
       if (def_type)
         *def_type = AF_INET;
@@ -887,8 +888,10 @@ TAO_IIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core, int def_type)
   bool ipv6_only = (def_type == AF_INET6) ||
     orb_core->orb_params ()->connect_ipv6_only ();
 #if defined (ACE_WIN32)
-  ipv4_only |= this->default_address_.get_type () == AF_INET;
-  ipv6_only |= this->default_address_.get_type () == AF_INET6;
+  if (this->default_address_.get_type () == AF_INET)
+    ipv4_only = true;
+  else
+    ipv6_only = true;
 #endif /* ACE_WIN32 */
   // If the loopback interface is the only interface then include it
   // in the list of interfaces to query for a hostname, otherwise
diff --git a/TAO/tests/Bug_2188_Regression/broken.mpc b/TAO/tests/Bug_2188_Regression/broken.mpc
index 26ee088bef9..184d57d6c73 100644
--- a/TAO/tests/Bug_2188_Regression/broken.mpc
+++ b/TAO/tests/Bug_2188_Regression/broken.mpc
@@ -1,10 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
-  IDL_Files {
-    broken.idl
-  }
+project(*Server): taoserver {
+  idlflags += -Sa -St
 
   Source_Files {
     broken_i.cpp
@@ -12,10 +10,9 @@ project(*Server): taoexe, portableserver {
   }
 }
 
-project(*Client): taoexe {
-  IDL_Files {
-    broken.idl
-  }
+project(*Client): taoclient {
+  after += *Server
+
   Source_Files {
     brokenC.cpp
     client.cpp
diff --git a/TAO/tests/Bug_2188_Regression/client.cpp b/TAO/tests/Bug_2188_Regression/client.cpp
index 154ea153d04..093af6fc026 100644
--- a/TAO/tests/Bug_2188_Regression/client.cpp
+++ b/TAO/tests/Bug_2188_Regression/client.cpp
@@ -66,7 +66,7 @@ main (int argc, char *argv[])
 
       CharArray_slice * char_array = CharArray_alloc();
       for (int i = 0; i < 10; i++)
-        char_array[i] = 'a' + i;
+        char_array[i] = (char)('a' + i);
       atobj->a_charArray (char_array ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;