ChangeLogTag:Mon Aug 25 19:58:39 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

3 files changed, 33 insertions, 22 deletions

diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index 0c1648547be..d059066196b 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,12 @@
+Mon Aug 25 19:58:39 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* TAO_IDL/be/be_interface.cpp(gen_collocated_skel_body): Added a
+	  new line to prevent warnings with gcc 3.3.1
+	
+	* TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp: DO not
+	  generate variable names for forwarded object references. This
+	  prevents warnings with gcc 3.3.1.
+
 Mon Aug 25 19:15:32 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/BD_String_SArgument_T.cpp:
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index e5c34840baf..52a06dac7b5 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -659,7 +659,7 @@ TAO_IDL_Gen_OpTable_Worker::emit (be_interface *derived_interface,
   // ancestors.
   be_interface *bi = be_interface::narrow_from_decl (base_interface);
   return bi->gen_optable_entries (derived_interface,
-                                  this->skeleton_name_, 
+                                  this->skeleton_name_,
                                   os);
 }
 
@@ -934,7 +934,7 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
 
               if (be_global->gen_thru_poa_collocation ())
                 {
-                  *os << " &" 
+                  *os << " &"
                       << derived_interface->full_thru_poa_proxy_impl_name ()
                       << "::" << d->local_name ();
                 }
@@ -947,7 +947,7 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
 
               if (be_global->gen_direct_collocation ())
                 {
-                  *os << " &" 
+                  *os << " &"
                       << derived_interface->full_direct_proxy_impl_name ()
                       << "::" << d->local_name ();
                 }
@@ -976,7 +976,7 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
 
               if (be_global->gen_thru_poa_collocation ())
                 {
-                  *os << " &" 
+                  *os << " &"
                       << derived_interface->full_thru_poa_proxy_impl_name ()
                       << "::_get_" << d->local_name ();
                 }
@@ -989,7 +989,7 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
 
               if (be_global->gen_direct_collocation ())
                 {
-                  *os << " &" 
+                  *os << " &"
                       << derived_interface->full_direct_proxy_impl_name ()
                       << "::_get_" << d->local_name ();
                 }
@@ -1008,10 +1008,10 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
                   *os << "{\"_set_" << d->original_local_name ()
                       << "\", &" << full_skeleton_name
                       << "::_set_" << d->local_name () << "_skel,";
-                      
+
                   if (be_global->gen_thru_poa_collocation ())
                     {
-                      *os << " &" 
+                      *os << " &"
                           << derived_interface->full_thru_poa_proxy_impl_name ()
                           << "::_set_" << d->local_name ();
                     }
@@ -1024,7 +1024,7 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
 
                   if (be_global->gen_direct_collocation ())
                     {
-                      *os << " &" 
+                      *os << " &"
                           << derived_interface->full_direct_proxy_impl_name ()
                           << "::_set_" << d->local_name ();
                     }
@@ -1069,7 +1069,7 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
 
               if (be_global->gen_thru_poa_collocation ())
                 {
-                  *os << " &" 
+                  *os << " &"
                       << derived_interface->full_thru_poa_proxy_impl_name ();
                   *os << "::" << d->local_name ();
                 }
@@ -1082,7 +1082,7 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
 
               if (be_global->gen_direct_collocation ())
                 {
-                  *os << " &" 
+                  *os << " &"
                       << derived_interface->full_direct_proxy_impl_name ();
                   *os << "::" << d->local_name ();
                 }
@@ -1112,7 +1112,7 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
 
               if (be_global->gen_thru_poa_collocation ())
                 {
-                  *os << " &" 
+                  *os << " &"
                       << derived_interface->full_thru_poa_proxy_impl_name ()
                       << "::_get_" << d->local_name ();
                 }
@@ -1125,7 +1125,7 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
 
               if (be_global->gen_direct_collocation ())
                 {
-                  *os << " &" 
+                  *os << " &"
                       << derived_interface->full_direct_proxy_impl_name ()
                       << "::_get_" << d->local_name ();
                 }
@@ -1147,7 +1147,7 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
 
                   if (be_global->gen_thru_poa_collocation ())
                     {
-                      *os << " &" 
+                      *os << " &"
                           << derived_interface->full_thru_poa_proxy_impl_name ()
                           << "::_set_" << d->local_name ();
                     }
@@ -1160,7 +1160,7 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
 
                   if (be_global->gen_direct_collocation ())
                     {
-                      *os << " &" 
+                      *os << " &"
                           << derived_interface->full_direct_proxy_impl_name ()
                           << "::_set_" << d->local_name ();
                     }
@@ -1201,8 +1201,8 @@ be_interface::gen_collocated_skel_body (be_interface *derived,
 
   // Generate the static method corresponding to this method.
   *os << be_nl << be_nl
-      << "ACE_INLINE void" << be_nl 
-      << (direct ? derived->full_direct_proxy_impl_name () 
+      << "ACE_INLINE void" << be_nl
+      << (direct ? derived->full_direct_proxy_impl_name ()
                  : derived->full_thru_poa_proxy_impl_name ())
       << prefix << "::" << d->local_name () << " (" << be_idt << be_idt_nl
       << "CORBA::Object_ptr obj, " << be_nl
@@ -1225,7 +1225,9 @@ be_interface::gen_collocated_skel_body (be_interface *derived,
       << "num_args" << be_nl
       << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
-      << "}";
+      << "}"<< be_nl;
+
+
 }
 
 void
@@ -2078,7 +2080,7 @@ be_interface::gen_colloc_op_decl_helper (be_interface *derived,
               << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
           // Generate the static method corresponding to this method.
-          *os << "static void" << be_nl 
+          *os << "static void" << be_nl
               << d->local_name () << " (" << be_idt << be_idt_nl
               << "CORBA::Object_ptr obj, " << be_nl
               << "CORBA::Object_out obj_forward," << be_nl
@@ -2141,7 +2143,7 @@ be_interface::gen_colloc_op_decl_helper (be_interface *derived,
 
   return 0;
 }
- 
+
 int
 be_interface::gen_colloc_op_defn_helper (be_interface *derived,
                                          be_interface *ancestor,
@@ -2268,7 +2270,7 @@ be_interface::gen_colloc_op_defn_helper (be_interface *derived,
 
   return 0;
 }
- 
+
 int
 be_interface::copy_ctor_helper (be_interface *derived,
                                 be_interface *base,
@@ -2389,7 +2391,7 @@ be_interface::gen_throw_spec (UTL_ExceptList *list,
           << ei.item ()->name ();
     }
 
-  *os << be_uidt_nl 
+  *os << be_uidt_nl
       << throw_spec_close << be_uidt;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
index a4f97e3cce2..3f9b47ea895 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
@@ -60,7 +60,7 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation (
 
   *os << node->local_name () << " (" << be_idt << be_idt_nl
       << "CORBA::Object_ptr obj," << be_nl
-      << "CORBA::Object_out forward," << be_nl
+      << "CORBA::Object_out," << be_nl
       << "TAO::Argument **";
 
   if (!node->void_return_type () || node->nmembers () > 0)