diff options
| -rw-r--r-- | TAO/ChangeLog-98c | 8 | ||||
| -rw-r--r-- | TAO/tao/boa.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/deep_copy.cpp | 1 |
3 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 537a5588225..bda50ef81ae 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,11 @@ +Tue Jul 29 19:31:11 1997 Douglas C. Schmidt <schmidt@flamenco.cs.wustl.edu> + + * tao/boa.cpp (get_boa): Added casts of ACE_UINT32 so that we + don't have ambiguous calls to the constructor of ACE_INET_Addr. + + * tao/deep_copy.cpp (deep_copy): Removed an unreachable return + value. + Mon Jul 21 15:08:36 1997 Chris Cleeland <cleeland@cs.wustl.edu> * TAO version 0.0.7, released Mon Jul 21 15:08:36 1997. diff --git a/TAO/tao/boa.cpp b/TAO/tao/boa.cpp index ee575ca2ea2..cb1ec8222be 100644 --- a/TAO/tao/boa.cpp +++ b/TAO/tao/boa.cpp @@ -70,7 +70,7 @@ CORBA_BOA::get_named_boa (CORBA_ORB_ptr orb, // ROA initialization with name specified; it'll come from // /etc/services if it's not a port number. - ACE_INET_Addr boa_name (name, INADDR_ANY); + ACE_INET_Addr boa_name (name, (ACE_UINT32) INADDR_ANY); tcp_oa = ROA::init (orb, boa_name, env); @@ -109,7 +109,7 @@ CORBA_BOA::get_boa (CORBA_ORB_ptr orb, // ROA initialization with null name means anonymous OA - ACE_INET_Addr anonymous ((unsigned short) 0, INADDR_ANY); + ACE_INET_Addr anonymous ((u_short) 0, (ACE_UINT32) INADDR_ANY); tcp_oa = ROA::init (orb, anonymous, env); diff --git a/TAO/tao/deep_copy.cpp b/TAO/tao/deep_copy.cpp index db926d46161..6a0ef23463f 100644 --- a/TAO/tao/deep_copy.cpp +++ b/TAO/tao/deep_copy.cpp @@ -768,7 +768,6 @@ TAO_Marshal_Sequence::deep_copy (CORBA_TypeCode_ptr tc, dmsg ("TAO_Marshal_Struct::deep_copy detected error"); return CORBA_TypeCode::TRAVERSE_STOP; } - return retval; } // deep_copy for Array |