Sun May 27 14:03:18 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

7 files changed, 40 insertions, 28 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2ec4bfb7576..9ecb1481c05 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,9 +1,21 @@
+Sun May 27 14:03:18 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * examples/RTCORBA/Activity/Activity.cpp:
+        * examples/RTCORBA/Activity/Builder.cpp:
+        * examples/RTCORBA/Activity/POA_Holder.cpp:
+        * examples/RTCORBA/Activity/Periodic_Task.cpp:
+        * examples/RTScheduling/DT_Creator.cpp:
+        * examples/RTScheduling/POA_Holder.cpp:
+
+          Addressed the "assignment within conditional expression" warning
+          on the WinXP_VC71_WarningLevel4 build.
+
 Sat May 26 03:09:27 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
 
         * tao/ORB_Core.cpp:
 
           Addressed the "assignment within conditional expression" warning
-          on the WinXP_VC71_WarningLevel4 build. 
+          on the WinXP_VC71_WarningLevel4 build.
 
 Sat May 26 00:30:18 UTC 2007  Scott Harris  <harris_s@ociweb.com>
 
diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp
index 45f3787ef29..a788379e7b5 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.cpp
+++ b/TAO/examples/RTCORBA/Activity/Activity.cpp
@@ -351,7 +351,7 @@ Activity::create_started_flag_file (int argc, char *argv[])
 
   while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Started_Flag"))))
+      if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Started_Flag"))))
         {
           FILE *file = ACE_OS::fopen (current_arg, ACE_TEXT("w"));
 
diff --git a/TAO/examples/RTCORBA/Activity/Builder.cpp b/TAO/examples/RTCORBA/Activity/Builder.cpp
index 1f4433aca95..5075c7cd5ad 100644
--- a/TAO/examples/RTCORBA/Activity/Builder.cpp
+++ b/TAO/examples/RTCORBA/Activity/Builder.cpp
@@ -38,19 +38,19 @@ Builder::init (int argc, char *argv[])
 
   while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter ("-TaskCount")))
+      if (0 != (current_arg = arg_shifter.get_the_parameter ("-TaskCount")))
         {
           task_count_ = ACE_OS::atoi (current_arg);
           ACE_NEW_RETURN (task_list_, Periodic_Task*[task_count_], -1);
           arg_shifter.consume_arg ();
         }
-      if ((current_arg = arg_shifter.get_the_parameter ("-JobCount")))
+      if (0 != (current_arg = arg_shifter.get_the_parameter ("-JobCount")))
         {
           job_count_ = ACE_OS::atoi (current_arg);
           ACE_NEW_RETURN (job_list_, Job_i*[job_count_], -1);
           arg_shifter.consume_arg ();
         }
-      if ((current_arg = arg_shifter.get_the_parameter ("-POACount")))
+      if (0 != (current_arg = arg_shifter.get_the_parameter ("-POACount")))
         {
           poa_count_ = ACE_OS::atoi (current_arg);
           ACE_NEW_RETURN (poa_list_, POA_Holder*[poa_count_], -1);
diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
index 7da6b98be48..9383f075547 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
@@ -19,7 +19,7 @@ POA_Holder::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;
@@ -30,7 +30,7 @@ POA_Holder::init (ACE_Arg_Shifter& arg_shifter)
           server_priority_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-Lanes")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-Lanes")))
         {
           int lanecount = ACE_OS::atoi (current_arg);
           lanes_.length (lanecount);
@@ -65,7 +65,7 @@ POA_Holder::init (ACE_Arg_Shifter& arg_shifter)
                 break;
             } /* while -- lane values */
         } /* if -Lanes */
-      else if ((current_arg = arg_shifter.get_the_parameter ("-Bands")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-Bands")))
         {
           int bandcount = ACE_OS::atoi (current_arg);
           bands_.length (bandcount);
diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
index 01e3ac4691a..9948001c72e 100644
--- a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
+++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
@@ -31,32 +31,32 @@ Periodic_Task::init_task (ACE_Arg_Shifter& arg_shifter)
 
   while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter ("-JobName")))
+      if (0 != (current_arg = arg_shifter.get_the_parameter ("-JobName")))
         {
           name_ = current_arg;
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-Priority")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-Priority")))
         {
           task_priority_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-Period")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-Period")))
         {
           period_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-ExecTime")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-ExecTime")))
         {
           exec_time_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-Phase")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-Phase")))
         {
           phase_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-Iter")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-Iter")))
         {
           iter_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
@@ -67,7 +67,7 @@ Periodic_Task::init_task (ACE_Arg_Shifter& arg_shifter)
           if (task_stats_->init () == -1)
             return -1;
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-Load")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-Load")))
         {
           load_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
diff --git a/TAO/examples/RTScheduling/DT_Creator.cpp b/TAO/examples/RTScheduling/DT_Creator.cpp
index 44e08a0c106..7d47d03a47a 100644
--- a/TAO/examples/RTScheduling/DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/DT_Creator.cpp
@@ -32,25 +32,25 @@ DT_Creator::dt_task_init (ACE_Arg_Shifter& arg_shifter)
       arg_shifter.consume_arg ();
     }
 
-  if ((current_arg = arg_shifter.get_the_parameter ("-Start_Time")))
+  if (0 != (current_arg = arg_shifter.get_the_parameter ("-Start_Time")))
     {
       start_time = ACE_OS::atoi (current_arg);
       arg_shifter.consume_arg ();
     }
 
-  if ((current_arg = arg_shifter.get_the_parameter ("-Iter")))
+  if (0 != (current_arg = arg_shifter.get_the_parameter ("-Iter")))
     {
       iter = ACE_OS::atoi (current_arg);
       arg_shifter.consume_arg ();
     }
 
-  if ((current_arg = arg_shifter.get_the_parameter ("-Load")))
+  if (0 != (current_arg = arg_shifter.get_the_parameter ("-Load")))
     {
       load = ACE_OS::atoi (current_arg);
       arg_shifter.consume_arg ();
     }
 
-  if ((current_arg = arg_shifter.get_the_parameter ("-JobName")))
+  if (0 != (current_arg = arg_shifter.get_the_parameter ("-JobName")))
     {
       job_name = (char *)current_arg;
       dist = 1;
@@ -90,25 +90,25 @@ DT_Creator::init (int argc, char *argv [])
   int job_count = 0;
   while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter ("-GuidSeed")))
+      if (0 != (current_arg = arg_shifter.get_the_parameter ("-GuidSeed")))
         {
           guid_counter = (long) ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-DT_Count")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-DT_Count")))
         {
           dt_count_ = ACE_OS::atoi (current_arg);
           ACE_NEW_RETURN (dt_list_, Thread_Task*[dt_count_], -1);
           active_dt_count_ = dt_count_;
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-POA_Count")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-POA_Count")))
         {
           poa_count_ = ACE_OS::atoi (current_arg);
           ACE_NEW_RETURN (poa_list_, POA_Holder*[poa_count_], -1);
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-JOB_Count")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-JOB_Count")))
         {
           job_count_ = ACE_OS::atoi (current_arg);
           active_job_count_ = job_count_;
@@ -152,12 +152,12 @@ DT_Creator::init (int argc, char *argv [])
               job_count++;
             }
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-OutFile")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-OutFile")))
         {
           file_name_ = CORBA::string_dup (current_arg);
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-LogFile")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-LogFile")))
         {
           log_file_name_ = CORBA::string_dup (current_arg);
           arg_shifter.consume_arg ();
diff --git a/TAO/examples/RTScheduling/POA_Holder.cpp b/TAO/examples/RTScheduling/POA_Holder.cpp
index e0572d8f57c..6f45df5aab5 100644
--- a/TAO/examples/RTScheduling/POA_Holder.cpp
+++ b/TAO/examples/RTScheduling/POA_Holder.cpp
@@ -27,7 +27,7 @@ POA_Holder::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;
@@ -38,7 +38,7 @@ POA_Holder::init (ACE_Arg_Shifter& arg_shifter)
           server_priority_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-Lanes")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-Lanes")))
         {
           int lanecount = ACE_OS::atoi (current_arg);
           lanes_.length (lanecount);
@@ -94,7 +94,7 @@ POA_Holder::init (ACE_Arg_Shifter& arg_shifter)
           "Thread Pool Initialized\n"));
 
   }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-Bands")))
+      else if (0 != (current_arg = arg_shifter.get_the_parameter ("-Bands")))
         {
     ACE_DEBUG ((LM_DEBUG,
           "Initializing Bands\n"));