summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/ChangeLog-98c7
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp9
-rw-r--r--TAO/tests/Param_Test/tests.cpp2
3 files changed, 13 insertions, 5 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 9d109420425..42cd03ee60e 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,10 @@
+Thu May 14 08:30:26 1998 Carlos O'Ryan <coryan@watusi.cs.wustl.edu>
+
+ * tests/Param_Test/tests.cpp:
+ * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp:
+ Added the right .in() or .out() calls for some T_var types
+ passed to functions expecting a T_ptr or T_out parameter.
+
Thu May 14 13:14:40 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
* tests/Cubit/TAO/IDL_Cubit/cubit.idl:
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index 94f11d56d78..80a4345b474 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -568,10 +568,11 @@ Test_ECG::get_ec (CosNaming::NamingContext_ptr naming_context,
CORBA::Object_var ec_ptr =
naming_context->resolve (channel_name, _env);
- if (_env.exception () != 0 || CORBA::is_nil (ec_ptr))
+ if (_env.exception () != 0 || CORBA::is_nil (ec_ptr.in ()))
return RtecEventChannelAdmin::EventChannel::_nil ();
- return RtecEventChannelAdmin::EventChannel::_narrow (ec_ptr, _env);
+ return RtecEventChannelAdmin::EventChannel::_narrow (ec_ptr.in (),
+ _env);
}
void
@@ -882,7 +883,7 @@ void
Test_ECG::push_consumer (void *consumer_cookie,
ACE_hrtime_t arrival,
const RtecEventComm::EventSet &events,
- CORBA::Environment & _env)
+ CORBA::Environment &)
{
int ID =
(ACE_reinterpret_cast(Test_Consumer**,consumer_cookie)
@@ -1571,7 +1572,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events,
}
void
-Test_Consumer::disconnect_push_consumer (CORBA::Environment &_env)
+Test_Consumer::disconnect_push_consumer (CORBA::Environment &)
{
}
diff --git a/TAO/tests/Param_Test/tests.cpp b/TAO/tests/Param_Test/tests.cpp
index e29b82f32a8..bcd82710008 100644
--- a/TAO/tests/Param_Test/tests.cpp
+++ b/TAO/tests/Param_Test/tests.cpp
@@ -3242,7 +3242,7 @@ Test_AnySeq::run_sii_test (Param_Test_ptr objref,
{
Param_Test::AnySeq_var out (this->out_.out ());
this->ret_ = objref->test_anyseq (this->in_.in (),
- this->inout_,
+ this->inout_.inout (),
out,
env);
return (env.exception () ? -1:0);