summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-05 11:42:53 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-05 11:42:53 +0000
commitb9c45e78b12fd3d269dd4e692f2eb8f9cc4a1ed7 (patch)
tree0ef3c48010ca53f20d5800250a9694de5f4a0fcd
parenteca22c9345ac9c5f300c16ebcdb81228547a8778 (diff)
downloadATCD-b9c45e78b12fd3d269dd4e692f2eb8f9cc4a1ed7.tar.gz
(run): declare loop index "i" outside of loop because it is used again
-rw-r--r--TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp28
1 files changed, 15 insertions, 13 deletions
diff --git a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
index aff72d722e4..4ae74542768 100644
--- a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
+++ b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
@@ -191,7 +191,9 @@ ECB_SupplierID_Test::run (CORBA::ORB_ptr orb,
RtecScheduler::Scheduler_ptr scheduler,
CORBA::Environment& _env)
{
- for (int i = 0; i < ECB_SupplierID_Test::PHASE_END; ++i)
+ int i;
+
+ for (i = 0; i < ECB_SupplierID_Test::PHASE_END; ++i)
{
this->event_count_[i] = 0;
this->error_count_[i] = 0;
@@ -471,14 +473,14 @@ ECB_SupplierID_Test::Consumer::open (const char* name,
TimeBase::TimeT time;
ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
scheduler->set (this->rt_info_,
- RtecScheduler::VERY_HIGH_CRITICALITY,
- time, time, time,
- 0,
- RtecScheduler::VERY_LOW_IMPORTANCE,
- time,
- 0,
- RtecScheduler::OPERATION,
- _env);
+ RtecScheduler::VERY_HIGH_CRITICALITY,
+ time, time, time,
+ 0,
+ RtecScheduler::VERY_LOW_IMPORTANCE,
+ time,
+ 0,
+ RtecScheduler::OPERATION,
+ _env);
TAO_CHECK_ENV_RETURN_VOID (_env);
// = Connect as a consumer.
@@ -491,7 +493,7 @@ ECB_SupplierID_Test::Consumer::connect (CORBA::Environment& _env)
{
if (CORBA::is_nil (this->consumer_admin_.in ()))
return;
-
+
this->supplier_proxy_ =
this->consumer_admin_->obtain_push_supplier (_env);
TAO_CHECK_ENV_RETURN_VOID (_env);
@@ -527,7 +529,7 @@ void
ECB_SupplierID_Test::Consumer::close (CORBA::Environment &_env)
{
this->disconnect (_env);
- this->consumer_admin_ =
+ this->consumer_admin_ =
RtecEventChannelAdmin::ConsumerAdmin::_nil ();
}
@@ -593,7 +595,7 @@ ECB_SupplierID_Test::Supplier::connect (CORBA::Environment& _env)
{
if (CORBA::is_nil (this->supplier_admin_.in ()))
return;
-
+
this->consumer_proxy_ =
this->supplier_admin_->obtain_push_consumer (_env);
TAO_CHECK_ENV_RETURN_VOID (_env);
@@ -630,7 +632,7 @@ void
ECB_SupplierID_Test::Supplier::close (CORBA::Environment &_env)
{
this->disconnect (_env);
- this->supplier_admin_ =
+ this->supplier_admin_ =
RtecEventChannelAdmin::SupplierAdmin::_nil ();
}