diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-12-16 23:13:06 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-12-16 23:13:06 +0000 |
| commit | a02cac391a6f1bf9a74dfc07c91e066891fdfd96 (patch) | |
| tree | 4500c1a9197549237b81d0bb084d6c4f2e35fed0 | |
| parent | 7caf7713bb3ca0e56c90b04ecdbc19f1fea6077f (diff) | |
| download | ATCD-a02cac391a6f1bf9a74dfc07c91e066891fdfd96.tar.gz | |
ChangeLogTag: Mon Dec 16 17:09:55 2002 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/tao/CORBALOC_Parser.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/ORB.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 2 |
4 files changed, 15 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a7576026ffd..ac48881061c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Mon Dec 16 17:09:55 2002 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tao/CORBALOC_Parser.cpp: + * tao/ORB.cpp: + * tao/ORB_Core.cpp: + + Silly errors in the fix below. Thanks to Chris Cleeland + <cleeland_c@ociweb.com> for catching it. + Mon Dec 16 14:27:15 2002 Jeff Parsons <j.parsons@vanderbilt.edu> * tao/Any.cpp: diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index 8a2c93268d8..abb8ac5b806 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -119,7 +119,7 @@ TAO_CORBALOC_Parser::assign_key_string (char *& cloc_name_ptr, + key_string.length ()); // Copy the default <iiop> prefix. - ACE_OS::strcpy (end_point.out (), + ACE_OS::strcpy (end_point.inout (), iiop_prefix); // Append '://' @@ -146,7 +146,7 @@ TAO_CORBALOC_Parser::assign_key_string (char *& cloc_name_ptr, // Example: // prot_name.c_str () = iiop - ACE_OS::strcpy (end_point.out (), + ACE_OS::strcpy (end_point.inout (), prot_name.c_str ());; diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 66e6ebb4955..bb82ebc0396 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1008,9 +1008,9 @@ CORBA_ORB::resolve_service (TAO_MCAST_SERVICEID mcast_service_id ACE_OS::strlen (port_ptr.in ()) + 2); - ACE_OS::strcpy (def_init_ref.out (), prefix); - ACE_OS::strcat (def_init_ref.out (), port_ptr.in ()); - ACE_OS::strcat (def_init_ref.out (), "::"); + ACE_OS::strcpy (def_init_ref.inout (), prefix); + ACE_OS::strcat (def_init_ref.inout (), port_ptr.in ()); + ACE_OS::strcat (def_init_ref.inout (), "::"); CORBA::String_var default_init_ref = this->orb_core_->orb_params ()->default_init_ref (); diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 27b2d15c6ef..5dda244d238 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -962,7 +962,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) ACE_OS::strlen (ns_port_ptr.in ()) + 2); - ACE_OS::strcpy (def_init_ref.out (), prefix); + ACE_OS::strcpy (def_init_ref.inout (), prefix); ACE_OS::strcat (def_init_ref.inout (), ns_port_ptr.in ()); ACE_OS::strcat (def_init_ref.inout (), "::"); |