ChangeLogTag:Tue Sep 05 11:10:47 2000 Carlos O'Ryan <coryan@uci.edu>

7 files changed, 46 insertions, 139 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index dc77fcbfa93..8be9f7abe18 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,9 +1,19 @@
+Tue Sep 05 11:10:47 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * TAO_IDL/be/be_visitor_argument/request_info_result.cpp:
+        * TAO_IDL/be/be_visitor_interface/interceptors_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interceptors_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/interceptors_sh.cpp:
+        * TAO_IDL/be/be_visitor_interface/interceptors_ss.cpp:
+        * tao/Profile.cpp:
+          Fixed warnings about unused variables
+
 Tue Sep  5 11:26:56 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 
         * be/be_visitor_operation/operation_cs.cpp: Added a line in the
-	  generated code to reset the reply_received field in the
-	  Invocation class. This was added on <Fri Jul 21 17:54:55 2000
-	  <bala@cs.wustl.edu> but seem to have dissappeared in between.
+          generated code to reset the reply_received field in the
+          Invocation class. This was added on <Fri Jul 21 17:54:55 2000
+          <bala@cs.wustl.edu> but seem to have dissappeared in between.
 
 Tue Sep  5 10:51:53 2000  Chad Elliott  <elliott_c@ociweb.com>
 
@@ -17,24 +27,24 @@ Tue Sep  5 10:51:53 2000  Chad Elliott  <elliott_c@ociweb.com>
 
 Mon Sep  4 22:18:16 2000  Marina Spivak  <marina@cs.wustl.edu>
 
-	* tao/Stub.cpp:
+        * tao/Stub.cpp:
 
-	  Changed the use of <MProfile::get_next> to
-	  <MProfile::get_profile> in the TAO_Stub constructor.  <get_next>
-	  method has side effects, and was corrupting the state of the
-	  stub's <base_profiles_> member.  This fixes the following bug in
-	  the orb: if the invocation using the first profile in the IOR
-	  does not succeed for whatever reason, e.g., protocol not
-	  supported, the invocation will fail without going through other
-	  profiles.
+          Changed the use of <MProfile::get_next> to
+          <MProfile::get_profile> in the TAO_Stub constructor.  <get_next>
+          method has side effects, and was corrupting the state of the
+          stub's <base_profiles_> member.  This fixes the following bug in
+          the orb: if the invocation using the first profile in the IOR
+          does not succeed for whatever reason, e.g., protocol not
+          supported, the invocation will fail without going through other
+          profiles.
 
 Sun Sep 03 19:40:43 2000  Carlos O'Ryan  <coryan@uci.edu>
 
-	* TAO_IDL/TAO_IDL_BE_DLL.dsp:
-	* TAO_IDL/TAO_IDL_FE_DLL.dsp:
-	* TAO_IDL/tao_idl.dsp:
-	  Go the IDL compiler to compile under Win32/Release,
-	  unfortunately it crashes at run-time.
+        * TAO_IDL/TAO_IDL_BE_DLL.dsp:
+        * TAO_IDL/TAO_IDL_FE_DLL.dsp:
+        * TAO_IDL/tao_idl.dsp:
+          Go the IDL compiler to compile under Win32/Release,
+          unfortunately it crashes at run-time.
 
 Sun Sep  3 15:35:11 2000  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/request_info_result.cpp b/TAO/TAO_IDL/be/be_visitor_argument/request_info_result.cpp
index 7fb3245b16d..56b15868677 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/request_info_result.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/request_info_result.cpp
@@ -149,13 +149,6 @@ int be_visitor_args_request_info_result::visit_enum (be_enum *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
 
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
   os->indent ();
   *os << "this->result_val_ <<= this->result_;";
 
@@ -166,13 +159,6 @@ int be_visitor_args_request_info_result::visit_interface (be_interface *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
 
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
   os->indent ();
   *os << "this->result_val_ <<= this->result_;";
 
@@ -182,13 +168,6 @@ int be_visitor_args_request_info_result::visit_interface_fwd (be_interface_fwd *
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
 
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
   os->indent ();
   *os << "this->result_val_ <<= this->result_;";
 
@@ -201,13 +180,6 @@ int be_visitor_args_request_info_result::visit_valuetype (be_valuetype *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
 
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
   os->indent ();
   *os << "this->result_val_ <<= this->result_;";
 
@@ -219,13 +191,6 @@ int be_visitor_args_request_info_result::visit_valuetype_fwd (be_valuetype_fwd *
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
 
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
   os->indent ();
   *os << "this->result_val_ <<= this->result_;";
 
@@ -268,13 +233,6 @@ int be_visitor_args_request_info_result::visit_sequence (be_sequence *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
 
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
   os->indent ();
   *os << "this->result_val_ <<= this->result_;";
 
@@ -314,13 +272,6 @@ int be_visitor_args_request_info_result::visit_structure (be_structure *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
 
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
   os->indent ();
   *os << "this->result_val_ <<= this->result_;";
 
@@ -332,13 +283,6 @@ int be_visitor_args_request_info_result::visit_union (be_union *node)
 {
  TAO_OutStream *os = this->ctx_->stream (); // get output stream
 
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
   os->indent ();
   *os << "this->result_val_ <<= this->result_;";
 
@@ -350,13 +294,6 @@ int be_visitor_args_request_info_result::visit_typedef (be_typedef *node)
 {
  TAO_OutStream *os = this->ctx_->stream (); // get output stream
 
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
   os->indent ();
   *os << "this->result_val_ <<= this->result_;";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interceptors_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interceptors_ch.cpp
index 5c677d5ae3c..daa39b6c9ec 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interceptors_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interceptors_ch.cpp
@@ -47,19 +47,10 @@ int be_visitor_interface_interceptors_ch::visit_interface (be_interface *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  be_type *bt;
-  
-  // set the right type;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-  // output the class defn
-
   // generate code for the interface definition by traversing thru the
   // elements of its scope. We depend on the front-end to have made sure
   // that only legal syntactic elements appear in our scope.
-  
+
   os->indent ();
   *os << "\n#if (TAO_HAS_INTERCEPTORS == 1)" << be_nl;
 
@@ -74,10 +65,10 @@ int be_visitor_interface_interceptors_ch::visit_interface (be_interface *node)
       << "// of building these lists when they arent used is avoided." << be_nl;
 
       os->indent ();
-      
+
       if (this->visit_scope (node) == -1)
         {
-  
+
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%N:%l) be_visitor_interface_ch::"
                            "visit_interface - "
@@ -101,7 +92,7 @@ int be_visitor_interface_interceptors_ch::visit_interface (be_interface *node)
   delete visitor;
       */
   *os  << "#endif /* TAO_HAS_INTERCEPTORS */\n";
-  
+
   return 0;
 
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interceptors_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interceptors_cs.cpp
index cb64e83181a..4e54e4ee144 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interceptors_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interceptors_cs.cpp
@@ -47,22 +47,13 @@ int be_visitor_interface_interceptors_cs::visit_interface (be_interface *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  be_type *bt;
-  
-  // set the right type;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-  // output the class defn
-
   // generate code for the interface definition by traversing thru the
   // elements of its scope. We depend on the front-end to have made sure
   // that only legal syntactic elements appear in our scope.
-  
+
   os->indent ();
   *os << "\n#if (TAO_HAS_INTERCEPTORS == 1)" << be_nl;
-  
+
    // generate code for the interface definition by traversing thru the
       // elements of its scope. We depend on the front-end to have made sure
       // that only legal syntactic elements appear in our scope.
@@ -93,7 +84,7 @@ int be_visitor_interface_interceptors_cs::visit_interface (be_interface *node)
     delete visitor;*/
 
   *os  << "#endif /* TAO_HAS_INTERCEPTORS */\n";
-  
+
   return 0;
 
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interceptors_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interceptors_sh.cpp
index 52444715e90..0f1e5350e29 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interceptors_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interceptors_sh.cpp
@@ -47,19 +47,10 @@ int be_visitor_interface_interceptors_sh::visit_interface (be_interface *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  be_type *bt;
-  
-  // set the right type;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-  // output the class defn
-
   // generate code for the interface definition by traversing thru the
   // elements of its scope. We depend on the front-end to have made sure
   // that only legal syntactic elements appear in our scope.
-  
+
   os->indent ();
   *os << "\n#if (TAO_HAS_INTERCEPTORS == 1)" << be_nl;
 
@@ -74,17 +65,17 @@ int be_visitor_interface_interceptors_sh::visit_interface (be_interface *node)
       << "// of building these lists when they arent used is avoided." << be_nl;
 
       os->indent ();
-      
+
       if (this->visit_scope (node) == -1)
         {
-  
+
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%N:%l) be_visitor_interface_sh::"
                            "visit_interface - "
                            "codegen for scope failed\n"), -1);
         }
   *os  << "#endif /* TAO_HAS_INTERCEPTORS */\n";
-  
+
   return 0;
 
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interceptors_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interceptors_ss.cpp
index 320a6c05d4c..835cce56729 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interceptors_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interceptors_ss.cpp
@@ -47,22 +47,13 @@ int be_visitor_interface_interceptors_ss::visit_interface (be_interface *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  be_type *bt;
-  
-  // set the right type;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-  // output the class defn
-
   // generate code for the interface definition by traversing thru the
   // elements of its scope. We depend on the front-end to have made sure
   // that only legal syntactic elements appear in our scope.
-  
+
   os->indent ();
   *os << "\n#if (TAO_HAS_INTERCEPTORS == 1)" << be_nl;
-  
+
    // generate code for the interface definition by traversing thru the
       // elements of its scope. We depend on the front-end to have made sure
       // that only legal syntactic elements appear in our scope.
@@ -77,7 +68,7 @@ int be_visitor_interface_interceptors_ss::visit_interface (be_interface *node)
         }
 
   *os  << "#endif /* TAO_HAS_INTERCEPTORS */\n";
-  
+
   return 0;
 
 }
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index c284570e36b..89646a1ece4 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -28,7 +28,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list)
   if (policy_list == 0)
     {
       if (TAO_debug_level)
-        ACE_DEBUG ((LM_DEBUG, 
+        ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("TAO_Profile::policies: Null Policy List!\n")));
       return;
     }
@@ -89,18 +89,14 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list)
   tagged_component.component_data.length (length);
   buf = tagged_component.component_data.get_buffer ();
 
-  int i_length;
   for (const ACE_Message_Block *iterator = out_cdr.begin ();
        iterator != 0;
        iterator = iterator->cont ())
     {
+      CORBA::ULong i_length = iterator->length ();
+      ACE_OS::memcpy (buf, iterator->rd_ptr (), i_length);
 
-      i_length = iterator->length ();
-      ACE_OS::memcpy (buf, iterator->rd_ptr (), iterator->length ());
-
-      buf += iterator->length ();
-
-      i_length = iterator->length ();
+      buf += i_length;
     }
 
   // Eventually we add the TaggedComponent to the TAO_TaggedComponents
@@ -184,7 +180,7 @@ TAO_Profile::policies (void)
                   // policies that TAO doesn't support, so as specified
                   // by the RT-CORBA spec. ptc/99-05-03 we just ignore
                   // this un-understood policies.
-                  
+
                   if (TAO_debug_level >= 5)
                     ACE_DEBUG ((LM_DEBUG,
                                 ACE_TEXT ("The IOR contains Unsupported Policies.\n")));