Sun May 27 15:35:46 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

10 files changed, 32 insertions, 32 deletions

diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
index 13be4bf52ae..0978675ce82 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
@@ -149,20 +149,20 @@ AdminProperties::parse_args(int argc, char *argv[])
 
   while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter ("-max_queue_length")))
+      if (0 != (current_arg = arg_shifter.get_the_parameter ("-max_queue_length")))
         {
           this->max_queue_length_ = ACE_OS::atoi (current_arg);
           // Max. queue length.
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-max_consumers")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-max_consumers")))
         {
           this->max_consumers_ = ACE_OS::atoi (current_arg);
           // Max consumers allowed to connect.
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-max_suppliers")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-max_suppliers")))
         {
           this->max_suppliers_ = ACE_OS::atoi (current_arg);
           // Max. number of suppliers allowed to connect.
@@ -173,13 +173,13 @@ AdminProperties::parse_args(int argc, char *argv[])
           this->reject_new_events_ = 1;
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-consumers")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-consumers")))
         {
           this->consumers_ = ACE_OS::atoi (current_arg);
           // Number of consumers to create.
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-suppliers")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-suppliers")))
         {
           this->suppliers_ = ACE_OS::atoi (current_arg);
           // Number of suppliers to create.
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
index bcbe39449ed..dd508e4b43a 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
@@ -141,17 +141,17 @@ ConnectDisconnect::parse_args(int argc, char *argv[])
 
     while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter ("-count")))
+      if (0 != (current_arg = arg_shifter.get_the_parameter ("-count")))
         {
           this->count_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-consumers")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-consumers")))
         {
           this->consumers_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-suppliers")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-suppliers")))
         {
           this->suppliers_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
index 3980a578d17..c46dbbecaac 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -135,7 +135,7 @@ Events::parse_args (int argc,
           arg_shifter.consume_arg ();
 
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-events")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-events")))
         {
           this->event_count_ = ACE_OS::atoi (current_arg);
           // The number of events to send/receive.
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index ebaebc1f8b4..9351c8884df 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
@@ -33,23 +33,23 @@ IdAssignment::parse_args (int argc,
 
     while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter ("-iter")))
+      if (0 != (current_arg = arg_shifter.get_the_parameter ("-iter")))
         {
           this->iter_ = ACE_OS::atoi (current_arg);
           // The number of times to repeat the test.
           arg_shifter.consume_arg ();
         }
-      if ((current_arg = arg_shifter.get_the_parameter ("-ec_count")))
+      if (0 != (current_arg = arg_shifter.get_the_parameter ("-ec_count")))
         {
           this->ec_count_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
-      if ((current_arg = arg_shifter.get_the_parameter ("-ca_count")))
+      if (0 != (current_arg = arg_shifter.get_the_parameter ("-ca_count")))
         {
           this->consumer_admin_count_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
-      if ((current_arg = arg_shifter.get_the_parameter ("-sa_count")))
+      if (0 != (current_arg = arg_shifter.get_the_parameter ("-sa_count")))
         {
           this->supplier_admin_count_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
index 7a824f69f10..2d43e10c4d0 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
@@ -33,7 +33,7 @@ LifeCycle::parse_args (int argc,
 
     while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter ("-count")))
+      if (0 != (current_arg = arg_shifter.get_the_parameter ("-count")))
         {
           this->count_ = ACE_OS::atoi (current_arg);
           // The number of times to create and destroy.
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
index a47a9314e37..a042fa95fad 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
@@ -137,31 +137,31 @@ Sequence::parse_args (int argc,
 
     while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter ("-events")))
+      if (0 != (current_arg = arg_shifter.get_the_parameter ("-events")))
         {
           this->event_count_ = ACE_OS::atoi (current_arg); // The number of events to send/receive.
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-SupplierBatchSize")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-SupplierBatchSize")))
         {
           this->supplier_batch_size_ = ACE_OS::atoi (current_arg); // Supplier batch size
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-ConsumerBatchSize")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-ConsumerBatchSize")))
         {
           this->consumer_batch_size_ = ACE_OS::atoi (current_arg); // Consumer batch size
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-ConsumerDelay")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-ConsumerDelay")))
         {
           this->consumer_delay_ = ACE_Time_Value (ACE_OS::atoi (current_arg), 0); // Consumer delay in secs.
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-Pacing"))) // in seconds
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-Pacing"))) // in seconds
         {
           this->pacing_ = (TimeBase::TimeT) ACE_OS::atoi (current_arg);
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
index 79690c36c2c..59801244fb6 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
@@ -111,7 +111,7 @@ Simple_Test::parse_args (int argc,
 
     while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter ("-events")))
+      if (0 != (current_arg = arg_shifter.get_the_parameter ("-events")))
         {
           this->event_count_ = ACE_OS::atoi (current_arg);
           // The number of events to send/receive.
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
index 74766c7287b..6fa0d87b4fe 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
@@ -51,7 +51,7 @@ TAO_Notify_Tests_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter)
 
           while (arg_shifter.is_anything_left ())
             {
-              if ((current_arg = arg_shifter.get_the_parameter ("-PriorityModel")))
+              if (0 != (current_arg = arg_shifter.get_the_parameter ("-PriorityModel")))
                 {
                   if (arg_shifter.cur_arg_strncasecmp ("CLIENT") == 0)
                     priority_model_ = RTCORBA::CLIENT_PROPAGATED;
@@ -65,7 +65,7 @@ TAO_Notify_Tests_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter)
                   continue;
                 }
               // -Lanes lane-count -Lane prio statc_thr dyn_thr
-              if ((current_arg = arg_shifter.get_the_parameter ("-Lanes")))
+              if (0 != (current_arg = arg_shifter.get_the_parameter ("-Lanes")))
                 {
                   int lanecount = ACE_OS::atoi (current_arg);
                   lanes_.length (lanecount);
@@ -103,7 +103,7 @@ TAO_Notify_Tests_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter)
                   continue;
                 } /* if -Lanes */
 
-              if ((current_arg = arg_shifter.get_the_parameter ("-Bands")))
+              if (0 != (current_arg = arg_shifter.get_the_parameter ("-Bands")))
                 {
                   int bandcount = ACE_OS::atoi (current_arg);
                   bands_.length (bandcount);
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
index 44fe363c9af..795c1f895a4 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
@@ -35,7 +35,7 @@ RedGreen_Test::parse_args (int argc,
 
     while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter ("-burst_size")))
+      if (0 != (current_arg = arg_shifter.get_the_parameter ("-burst_size")))
         {
           this->burst_size_ = ACE_OS::atoi (current_arg);
           ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index f8c45095160..25bd9aefb74 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -313,37 +313,37 @@ Notify_Throughput::parse_args(int argc, char *argv[])
           this->collocated_ec_ = 1;
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-consumers")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-consumers")))
         {
           this->consumer_count_ = ACE_OS::atoi (current_arg);
           // The number of events to send/receive.
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-suppliers")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-suppliers")))
         {
           this->supplier_count_ = ACE_OS::atoi (current_arg);
           // The number of events to send/receive.
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-burst_size")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-burst_size")))
         {
           this->burst_size_ = ACE_OS::atoi (current_arg);
           // The number of events to send/receive.
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-burst_count")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-burst_count")))
         {
           this->burst_count_ = ACE_OS::atoi (current_arg);
           //
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-burst_pause")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-burst_pause")))
         {
           this->burst_pause_ = ACE_OS::atoi (current_arg);
           //
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-payload")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-payload")))
         {
           this->payload_size_ = ACE_OS::atoi (current_arg);
           ACE_NEW_RETURN (this->payload_,
@@ -352,13 +352,13 @@ Notify_Throughput::parse_args(int argc, char *argv[])
           //
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-EC")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-EC")))
         {
           this->ec_name_ = current_arg;
           //
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg =
+      else if (0 != (current_arg =
                 arg_shifter.get_the_parameter ("-ExpectedCount")))
         {
           this->perconsumer_count_ = ACE_OS::atoi (current_arg);