ChangeLogTag:Wed Dec 31 14:24:52 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

6 files changed, 23 insertions, 13 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 9302de864e3..b4ce08574b4 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Wed Dec 31 14:24:52 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+
+ 	* TAO_IDL/be/be_visitor_root/root.cpp:
+	* TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+	* tao/Object.cpp:
+	* tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp:
+	* tests/RTScheduling/Thread_Cancel/Thread_Task.cpp:
+
+	  Fixed unused variable warnings from CXX. 
+
 Wed Dec 31 13:44:20 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_argument/marshal_ss.cpp:
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
index 2b4c7aa444d..0a81b779411 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
@@ -1619,7 +1619,6 @@ be_visitor_root::visit_union_fwd (be_union_fwd *node)
         status = node->accept (&visitor);
         break;
       }
-      return 0; // nothing to be done
     default:
       return 0; // nothing to be done
   }
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
index 5fe55ba3fd2..6b11dc0c444 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
@@ -355,10 +355,9 @@ be_visitor_sequence_ch::gen_varout_typedefs (be_sequence *node,
       {
         AST_Type::SIZE_TYPE st = elem->size_type ();
         be_typedef *td = be_typedef::narrow_from_decl (elem);
-        AST_Decl::NodeType nt = elem->node_type ();
-
         if (td != 0)
           {
+            AST_Decl::NodeType nt = elem->node_type ();
             nt = td->base_node_type ();
           }
 
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 2868e27e5fa..456f8ca20cd 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -565,10 +565,13 @@ CORBA::Object::_validate_connection (
 
   inconsistent_policies = 0;
 
+  CORBA::Boolean retval = 0;
+
 #if (TAO_HAS_MINIMUM_CORBA == 1)
 
   ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
 
+  retval = false;
 #else
 
   // If the object is collocated then use non_existent to see whether
@@ -586,7 +589,7 @@ CORBA::Object::_validate_connection (
     {
       inconsistent_policies =
         tao_call.get_inconsistent_policies ();
-      return false;
+      retval = false;
     }
   ACE_CATCHANY
     {
@@ -595,10 +598,10 @@ CORBA::Object::_validate_connection (
   ACE_ENDTRY;
   ACE_CHECK_RETURN (false);
 
-  return true;
+  retval = true;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-  return 0;
+  return retval;
 }
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
index c38d5fd2e37..2611eb6664a 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
@@ -69,10 +69,10 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server
   server->normal (10 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Long one = 1, two = 1, result = 0;
-  result = server->calculate (one,
-                              two
-                              ACE_ENV_ARG_PARAMETER);
+  CORBA::Long one = 1, two = 1;
+  (void) server->calculate (one,
+                            two
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_TRY
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
index fcfd70c5dd7..0e1ca06efe6 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
+++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
@@ -143,11 +143,9 @@ Thread_Task::svc (void)
         --active_thread_count_;
         if (active_thread_count_ == 0)
           orb_->shutdown ();
-        return 0;
       }
 
-      return 1;
-
+      return 0;
     }
   ACE_CATCHANY
     {