4 files changed, 31 insertions, 46 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 266d8c2789a..d26d23db260 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,11 @@
+Sat Jan 10 19:21:18 1998    <coryan@MILONGA>
+
+	* TAO_IDL/tao_idl.dsp: 
+	* TAO_IDL/be/be_interface.cpp: 
+	* TAO_IDL/be_include/be_interface.h: 
+	* tao/orb_core.cpp: 
+	  Fixed some problems in the latest merges.
+
 Sat Jan 10 18:06:24 1998    <coryan@MILONGA>
 
 	* Merged changes from tag main_to_poa_merge_7 and
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index 9c35cafa048..d66cbfdec84 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -869,49 +869,7 @@ int be_interface::gen_server_skeletons (void)
   this->accept (&visitor);
   *ss << "\n";
 
-  // generate the constructors and destructor
-  *ci << "ACE_INLINE" << nl;
-  *ci << this->name () << "::" << this->local_name () <<
-    " (void) // default constructor" << nl;
-  *ci << "{}" << nl << nl;
-
-  *ci << "ACE_INLINE" << nl;
-  *ci << this->name () << "::" << this->local_name () <<
-    " (STUB_Object *objref) // constructor" << nl;
-  *ci << "\t: CORBA_Object (objref)" << nl;
-  *ci << "{}" << nl << nl;
-
-  *ci << "ACE_INLINE" << nl;
-  *ci << this->name () << "::~" << this->local_name () <<
-    " (void) // destructor" << nl;
-  *ci << "{}\n\n";
-
-  // generate the ifdefined macro for  the _var type
-  ci->gen_ifdef_macro (this->flatname (), "_var");
-
-  if (this->gen_var_impl () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_interface: _var impl code gen failed\n"));
-      return -1;
-    }
-  ci->gen_endif ();
-
-  // generate the ifdefined macro for  the _out type
-  ci->gen_ifdef_macro (this->flatname (), "_out");
-
-  if (this->gen_out_impl () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_interface: _out impl code gen failed\n"));
-      return -1;
-    }
-  ci->gen_endif ();
-
-  if (be_scope::gen_client_inline () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_interface: code gen failed for scope\n"));
-      return -1;
-    }
-  return 0;
+   return 0;
 }
 
 // Generates the server-side inline
diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h
index 99e2c280b1f..bce3983413e 100644
--- a/TAO/TAO_IDL/be_include/be_interface.h
+++ b/TAO/TAO_IDL/be_include/be_interface.h
@@ -115,13 +115,16 @@ public:
                                           TAO_OutStream *os);
   // template method using breadth first traversal of inheritance graph
 
-  virtual int write_as_return (TAO_OutStream *stream,
-			       be_type *type);
-  // write the mapping as a return value on the stream.
+  char *relative_skel_name (const char *);
+  // relative skeleton name
 
   // Visiting
   virtual int accept (be_visitor *visitor);
 
+  virtual int write_as_return (TAO_OutStream *stream,
+			       be_type *type);
+  // write the mapping as a return value on the stream.
+
   // Narrowing
   DEF_NARROW_METHODS3 (be_interface, AST_Interface, be_scope, be_type);
   DEF_NARROW_FROM_DECL (be_interface);
diff --git a/TAO/TAO_IDL/tao_idl.dsp b/TAO/TAO_IDL/tao_idl.dsp
index c07a5fb7f22..b101fcdcf55 100644
--- a/TAO/TAO_IDL/tao_idl.dsp
+++ b/TAO/TAO_IDL/tao_idl.dsp
@@ -152,6 +152,10 @@ SOURCE=.\ast\ast_module.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\ast\ast_native.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\ast\ast_operation.cpp
 # End Source File
 # Begin Source File
@@ -280,6 +284,10 @@ SOURCE=.\be\be_module.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\be\be_native.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\be\be_operation.cpp
 # End Source File
 # Begin Source File
@@ -580,6 +588,10 @@ SOURCE=.\include\ast_module.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\include\ast_native.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\include\ast_operation.h
 # End Source File
 # Begin Source File
@@ -700,6 +712,10 @@ SOURCE=.\be_include\be_module.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\be_include\be_native.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\be_include\be_operation.h
 # End Source File
 # Begin Source File