ChangeLogTag:Tue Jan 6 14:46:27 1998 Carlos O'Ryan <coryan@cs.wustl.edu>

2 files changed, 17 insertions, 3 deletions

diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index 86b761652da..8472566fa8f 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -691,7 +691,7 @@ int be_interface::gen_server_header (void)
 
   sh->indent ();
   *sh << "virtual const char* _interface_repository_id"
-      << " (CORBA::Environment& _tao_environment) const;\n";
+      << " (void) const;\n";
 
   be_visitor_collocated_sh visitor;
   this->accept (&visitor);
@@ -843,7 +843,7 @@ int be_interface::gen_server_skeletons (void)
 
   ss->indent ();
   *ss << "const char* " << this->full_skel_name ()
-      << "::_interface_repository_id (CORBA::Environment &) const"
+      << "::_interface_repository_id (void) const"
       << nl;
   *ss << "{\n";
   ss->incr_indent ();
diff --git a/TAO/TAO_IDL/be/be_visitor_interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface.cpp
index a0d0d1e7eea..acc33ead1fb 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface.cpp
@@ -33,6 +33,10 @@ int be_visitor_collocated_sh::visit_interface (be_interface *node)
   *os << "_tao_collocated (" << node->full_skel_name () << "_ptr "
       << " servant);\n";
 
+  os->indent ();
+  *os << node->full_skel_name ()
+      << "_ptr _get_servant (void) const;\n";
+
   if (node->nmembers () > 0)
     {
       UTL_ScopeActiveIterator *si;
@@ -125,7 +129,7 @@ int be_visitor_collocated_ss::visit_interface (be_interface *node)
 
   this->current_interface_ = node;
 
-  *ss << current_interface_->full_coll_name () << "::"
+  *ss << this->current_interface_->full_coll_name () << "::"
       << "_tao_collocated (" << node->full_skel_name () << "_ptr "
       << " servant)\n";
   ss->incr_indent ();
@@ -137,6 +141,16 @@ int be_visitor_collocated_ss::visit_interface (be_interface *node)
   ss->decr_indent ();
   *ss << "}\n\n";
 
+  ss->indent ();
+  *ss << this->current_interface_->full_skel_name () << "_ptr "
+      << this->current_interface_->full_coll_name () << "::"
+      << "_get_servant (void) const\n"
+      << "{\n";
+  ss->incr_indent ();
+  *ss << "return this->servant_;\n";
+  ss->decr_indent ();
+  *ss << "}\n\n";
+
   if (node->nmembers () > 0)
     {
       UTL_ScopeActiveIterator *si;