Tue Nov 21 23:25:57 2000 Angelo Corsaro <corsaro@cs.wustl.edu>

3 files changed, 99 insertions, 85 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 336e6d8924f..4eaf3c68976 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,16 @@
+Tue Nov 21 23:25:57 2000  Angelo Corsaro  <corsaro@cs.wustl.edu>
+
+	* TAO_IDL/be/be_visitor_interface/interface_ss.cpp (visit_interface):
+
+	  Added global scope specifier in the proxy factory function. This
+	  should fix the problem with VxWorks compilers.
+
+	* TAO_IDL/be/be_visitor_interface/interface_cs.cpp (visit_interface):
+
+	  Added ACE_NESTED_CLASS in the code generated for the method
+	  setup_collocation to fix the problem that some compiler had with
+	  the current implementation.
+
 Tue Nov 21 21:32:30 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
 
 	* orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i:
@@ -7,26 +20,26 @@ Tue Nov 21 21:32:30 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
 	  this out.
 
 Tue Nov 21 17:52:47 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
-    
-	* tests/Nested_Event_Loop/server.dsp: 
-	* tests/Nested_Event_Loop/client.dsp: 
-	   
+
+	* tests/Nested_Event_Loop/server.dsp:
+	* tests/Nested_Event_Loop/client.dsp:
+
 	  Updated settings to link TAO_Strategies.
 
 Tue Nov 21 17:37:28 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
 
-	* tests/Nested_Event_Loop/Makefile: 
+	* tests/Nested_Event_Loop/Makefile:
 
 	  Updated to link TAO_Strategies.
-	
-	* tests/Nested_Event_Loop/client.cpp: 
-	* tests/Nested_Event_Loop/server.cpp: 
+
+	* tests/Nested_Event_Loop/client.cpp:
+	* tests/Nested_Event_Loop/server.cpp:
 
 	  Included tao/Stratgies/advanced_resource.h
-	
-	* tests/Nested_Event_Loop/svc.conf: 
+
+	* tests/Nested_Event_Loop/svc.conf:
 	  Passed -ORBReactorType select_mt as the argument.
-	
+
 Tue Nov 21 17:23:45 2000  Priyanka Gontla <pgontla@ece.uci.edu>
 
 	* tests/RTCORBA/Client_Protocol/server.dsp
@@ -37,7 +50,7 @@ Tue Nov 21 19:20:44 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 	* tao/DynamicInterface/Server_Request.cpp:
 
 	  Updated the raising of system exceptions by arguements(),
-	  set_result() and set_exception() to conform to changes in 
+	  set_result() and set_exception() to conform to changes in
 	  CORBA 2.4.
 
 Tue Nov 21 16:26:03 2000  Ossama Othman  <ossama@uci.edu>
@@ -52,7 +65,7 @@ Tue Nov 21 16:26:03 2000  Ossama Othman  <ossama@uci.edu>
 	  Removed these attributes.  They are no longer needed since the
 	  Service Configurator is now initialized in the CORBA::ORB_init()
 	  function.
-	
+
 	* tao/ORB_Core.cpp (init):
 
 	  Moved all Service Configurator related option parsing code to
@@ -106,7 +119,7 @@ Tue Nov 21 18:04:00 2000  Marina Spivak  <marina@cs.wustl.edu>
 	* tests/RTCORBA/README
 	* tests/RTCORBA/Banded_Connections/README:
 
-	  Added test description and expected output.	  
+	  Added test description and expected output.
 
 Tue Nov 21 15:56:10 2000  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index d3a229f6525..eaea8d269c9 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -146,7 +146,8 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
             {
               be_interface *inherited =
                 be_interface::narrow_from_decl (node->inherits ()[i]);
-              *os << "this->" << inherited->local_name ()<< "::setup_collocation" << " (collocated);" << be_nl;
+              *os << "ACE_NESTED_CLASS (" << inherited->full_name () << ", "
+                  << inherited->local_name ()<< ")::setup_collocation" << " (collocated);" << be_nl;
             }
         }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
index 93bcd99f225..81348d6498d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -65,7 +65,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
   // Strategized Proxy Broker Implementation
   be_visitor *visitor = 0;
-  be_visitor_context ctx; 
+  be_visitor_context ctx;
 
   if (be_global->gen_thru_poa_collocation () ||
       be_global->gen_direct_collocation ())
@@ -73,59 +73,59 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       ctx =  (*this->ctx_);
       ctx.state (TAO_CodeGen::TAO_INTERFACE_STRATEGIZED_PROXY_BROKER_SS);
       visitor = tao_cg->make_visitor (&ctx);
-  
+
       if (!visitor || (node->accept (visitor) == -1))
-	{
-	  delete visitor;
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "be_visitor_interface_cs::"
-			     "visit_interface - "
-			     "codegen for Base Proxy Broker class failed\n"),
-			    -1);
-	}
+        {
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_interface_cs::"
+                             "visit_interface - "
+                             "codegen for Base Proxy Broker class failed\n"),
+                            -1);
+        }
       delete visitor;
-      
+
       // Proxy Broker  Factory Function.
       *os << be_nl
-	  << node->full_base_proxy_broker_name () << " *" << be_nl
-	  << node->flat_client_enclosing_scope () << node->base_proxy_broker_name () 
-	  << "_Factory_function (CORBA::Object_ptr obj)" << be_nl
-	  << "{" << be_idt_nl // idt = 1
-	  << "ACE_UNUSED_ARG (obj);" << be_nl
-	  << "return " 
-	  << node->server_enclosing_scope () << "the" 
-	  << node->strategized_proxy_broker_name ()
-	  << "();" << be_uidt_nl // idt = 0
-	  << "}" << be_nl << be_nl;
-  
+          << node->full_base_proxy_broker_name () << " *" << be_nl
+          << node->flat_client_enclosing_scope () << node->base_proxy_broker_name ()
+          << "_Factory_function (CORBA::Object_ptr obj)" << be_nl
+          << "{" << be_idt_nl // idt = 1
+          << "ACE_UNUSED_ARG (obj);" << be_nl
+          << "return "
+          << "::" << node->server_enclosing_scope () << "the"
+          << node->strategized_proxy_broker_name ()
+          << "();" << be_uidt_nl // idt = 0
+          << "}" << be_nl << be_nl;
+
       // Proxy Broker Function Pointer Initializer.
-      *os << "int" << be_nl 
-	  << node->flat_client_enclosing_scope () << node->base_proxy_broker_name () 
-	  << "_Factory_Initializer (long _dummy_)" << be_nl
-	  << "{" << be_idt_nl // idt = 1
-	  << "ACE_UNUSED_ARG (_dummy_);" << be_nl << be_nl
-	  << node->flat_client_enclosing_scope () << node->base_proxy_broker_name () 
-	  << "_Factory_function_pointer = " 
-	  << be_idt_nl  // idt = 2
-	  << node->flat_client_enclosing_scope () << node->base_proxy_broker_name () 
-	  << "_Factory_function;" 
-	  << be_uidt_nl // idt = 1
-	  << be_nl
-	  << "return 0;" << be_uidt_nl // idt = 0
-	  << "}" << be_nl << be_nl;
-
-      
-      *os << "static int " <<  node->flat_client_enclosing_scope () 
-	  << node->base_proxy_broker_name ()
-	  << "_Stub_Factory_Initializer_Scarecrow = " << be_idt_nl
-	  << node->flat_client_enclosing_scope () << node->base_proxy_broker_name () 
-	  << "_Factory_Initializer (ACE_reinterpret_cast (long, "
-	  << node->flat_client_enclosing_scope () << node->base_proxy_broker_name () 
-	  << "_Factory_Initializer));"
-	  << be_uidt_nl << be_nl;
+      *os << "int" << be_nl
+          << node->flat_client_enclosing_scope () << node->base_proxy_broker_name ()
+          << "_Factory_Initializer (long _dummy_)" << be_nl
+          << "{" << be_idt_nl // idt = 1
+          << "ACE_UNUSED_ARG (_dummy_);" << be_nl << be_nl
+          << node->flat_client_enclosing_scope () << node->base_proxy_broker_name ()
+          << "_Factory_function_pointer = "
+          << be_idt_nl  // idt = 2
+          << node->flat_client_enclosing_scope () << node->base_proxy_broker_name ()
+          << "_Factory_function;"
+          << be_uidt_nl // idt = 1
+          << be_nl
+          << "return 0;" << be_uidt_nl // idt = 0
+          << "}" << be_nl << be_nl;
+
+
+      *os << "static int " <<  node->flat_client_enclosing_scope ()
+          << node->base_proxy_broker_name ()
+          << "_Stub_Factory_Initializer_Scarecrow = " << be_idt_nl
+          << node->flat_client_enclosing_scope () << node->base_proxy_broker_name ()
+          << "_Factory_Initializer (ACE_reinterpret_cast (long, "
+          << node->flat_client_enclosing_scope () << node->base_proxy_broker_name ()
+          << "_Factory_Initializer));"
+          << be_uidt_nl << be_nl;
     }
 
-  
+
   // Proxy Impl Implementations.
   if (be_global->gen_thru_poa_collocation ())
     {
@@ -133,16 +133,16 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       ctx = *this->ctx_;
       ctx.state (TAO_CodeGen::TAO_INTERFACE_THRU_POA_PROXY_IMPL_SS);
       visitor = tao_cg->make_visitor (&ctx);
-      
+
       if (!visitor || (node->accept (visitor) == -1))
-	{
-	  delete visitor;
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "be_visitor_interface_cs::"
-			     "visit_interface - "
-			     "codegen for Base Proxy Broker class failed\n"),
-			    -1);
-	}
+        {
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_interface_cs::"
+                             "visit_interface - "
+                             "codegen for Base Proxy Broker class failed\n"),
+                            -1);
+        }
       delete visitor;
     }
   if (be_global->gen_direct_collocation ())
@@ -151,16 +151,16 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       ctx = *this->ctx_;
       ctx.state (TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SS);
       visitor = tao_cg->make_visitor (&ctx);
-      
+
       if (!visitor || (node->accept (visitor) == -1))
-	{
-	  delete visitor;
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "be_visitor_interface_cs::"
-			     "visit_interface - "
-			     "codegen for Base Proxy Broker class failed\n"),
-			    -1);
-	}
+        {
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_interface_cs::"
+                             "visit_interface - "
+                             "codegen for Base Proxy Broker class failed\n"),
+                            -1);
+        }
       delete visitor;
     }
 
@@ -383,8 +383,8 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << "{" << be_idt_nl // idt = 1
       << "TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);" << be_nl
       << "ACE_CHECK_RETURN (0);" << be_nl << be_nl;
-  
-  *os << "CORBA::Object_ptr tmp = CORBA::Object::_nil ();" << be_nl 
+
+  *os << "CORBA::Object_ptr tmp = CORBA::Object::_nil ();" << be_nl
       << be_nl
       << "if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())"
       << be_idt_nl // idt = 2
@@ -398,12 +398,12 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << "return " << "::" << node->full_name () << "::_unchecked_narrow (obj.in ());"
       << be_uidt_nl // idt = 0
       << "}" << be_nl;
-    
+
   // the _create_collocated_objref method.  If the idl compiler does
   // not generate the type of collocated stub but the orb is asking
   // for it, simply return null so a remote stub will be used.
   // generate the collocated class impl
- 
+
   /*
   if (be_global->gen_thru_poa_collocation ())
     {
@@ -429,7 +429,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
         }
       delete visitor;
     }
-  
+
   if (be_global->gen_direct_collocation ())
     {
       be_visitor_context ctx (*this->ctx_);