diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-04-22 03:18:22 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-04-22 03:18:22 +0000 |
| commit | 4602da8e6277484c1bf1a67be2a1410daecc5c51 (patch) | |
| tree | a8efce962a48d710d1664ef468fb42f5a0f36569 /TAO | |
| parent | dbe6c036aefeea83a806b0601420d43a3c0cd585 (diff) | |
| download | ATCD-4602da8e6277484c1bf1a67be2a1410daecc5c51.tar.gz | |
ChangeLogTag:Fri Apr 21 20:13:49 2000 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 10 | ||||
| -rw-r--r-- | TAO/performance-tests/POA/Demux/demux_test_client.cpp | 4 | ||||
| -rw-r--r-- | TAO/performance-tests/POA/Demux/demux_test_server.cpp | 6 |
3 files changed, 12 insertions, 8 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index abf8ee83c82..305fe5c67f2 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Fri Apr 21 20:13:49 2000 Carlos O'Ryan <coryan@uci.edu> + + * performance-tests/POA/Demux/demux_test_client.cpp: + * performance-tests/POA/Demux/demux_test_server.cpp: + The ORB id strings were not const-correct, but they are + actually not needed for this test so I just use empty strings as + ids. + Fri Apr 21 19:41:20 2000 Darrell Brunsch <brunsch@uci.edu> * TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp: @@ -17,7 +25,7 @@ Fri Apr 21 18:40:12 2000 Carlos O'Ryan <coryan@uci.edu> * tests/MProfile/test_i.cpp: Removed an extra #include, the file included does not exist and - it is not needed, clearly too much cut&past programming. + it is not needed, clearly too much cut&paste programming. Fri Apr 21 17:31:55 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp index 6eebf799a4f..c094cc192ba 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp @@ -52,11 +52,9 @@ Demux_Test_Client::init (int argc, char *argv [], // Grab the ORB ACE_TRY_EX (GET_ORB) { - char *orb_name = "internet"; // unused by TAO - // get the underlying ORB this->orb_ = - CORBA::ORB_init (argc, argv, orb_name, ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); ACE_TRY_CHECK_EX (GET_ORB); } ACE_CATCHANY diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp index e2b46dc47d7..98165a62e98 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp @@ -55,11 +55,9 @@ Demux_Test_Server::init (int argc, char *argv [], // Grab the ORB ACE_TRY_EX(GET_ORB) { - char *orb_name = "internet"; // unused by TAO - // get the underlying ORB this->orb_ = - CORBA::ORB_init (argc, argv, orb_name, ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); ACE_TRY_CHECK_EX(GET_ORB); } ACE_CATCHANY @@ -245,7 +243,7 @@ Demux_Test_Server::init (int argc, char *argv [], for (j = 0; j < this->num_objs_; j++) { - PortableServer::ObjectId_var id; + PortableServer::ObjectId_var id; if (!use_user_id_) { |