*** empty log message ***

5 files changed, 79 insertions, 33 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 84c44f2de0b..495a7a47759 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,28 +1,36 @@
+Fri Jan  9 16:00:21 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
+
+	* TAO_IDL/be/be_interface.cpp: Removed a Release statement that
+	was getting generated in the _narrow method
+
+	* TAO_IDL/be/{be_state_argument, be_state_operation}.cpp: All
+	typedefed strings are handled as if they are strings.
+
 Fri Jan 09 12:29:55 1998    <coryan@CHA-CHA>
 
-	* tao/default_server.cpp: 
+	* tao/default_server.cpp:
 	  Fixed missing initialization for object_lookup_strategy_
 
 Fri Jan  9 12:17:02 1998  Carlos O'Ryan  <coryan@swarm.cs.wustl.edu>
 
-	* orbsvcs/Event_Service/Dispatching_Modules.cpp: 
-	* orbsvcs/Event_Service/Event_Channel.cpp: 
-	* orbsvcs/Event_Service/GPlot_File.cpp: 
-	* orbsvcs/Event_Service/Memory_Pools.cpp: 
-	* orbsvcs/Event_Service/Task_Manager.cpp: 
-	* orbsvcs/Scheduling_Service/Scheduler.cpp: 
-	* orbsvcs/Scheduling_Service/Scheduler_Generic.cpp: 
+	* orbsvcs/Event_Service/Dispatching_Modules.cpp:
+	* orbsvcs/Event_Service/Event_Channel.cpp:
+	* orbsvcs/Event_Service/GPlot_File.cpp:
+	* orbsvcs/Event_Service/Memory_Pools.cpp:
+	* orbsvcs/Event_Service/Task_Manager.cpp:
+	* orbsvcs/Scheduling_Service/Scheduler.cpp:
+	* orbsvcs/Scheduling_Service/Scheduler_Generic.cpp:
 	  Added missing instantiation for platforms with
-	  ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA (IRIX) 
+	  ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA (IRIX)
 
-	* orbsvcs/Event_Service/CORBA_Utils_T.h: 
+	* orbsvcs/Event_Service/CORBA_Utils_T.h:
 	  Added missing member to ACE_ES_Array_Iterator.
 
-	* orbsvcs/Scheduling_Service/Scheduler.h: 
+	* orbsvcs/Scheduling_Service/Scheduler.h:
 	  Use ACE_SYNCH_MUTEX instead of ACE_HAS_THREADS and
 	  ACE_Null_Mutex vs ACE_Thread_Mutex.
 
-	* orbsvcs/orbsvcs/Makefile: 
+	* orbsvcs/orbsvcs/Makefile:
 	  The IDL generated files are .PRECIOUS
 
 Thu Jan  8 21:58:18 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index b55b41f03cd..0007f056ec2 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -357,8 +357,10 @@ int be_interface::gen_client_stubs (void)
   *cs << "return " << this->name () << "::_nil ();\n";
   cs->decr_indent ();
   *cs << nl;
+#if 0 // also the cause of all evil
   *cs << "obj->Release (); " <<
     "// need this since QueryIntf bumped our refcount" << nl;
+#endif
   *cs << "new_obj = new " << name () << " (istub); " <<
     "// construct obj ref using the stub object" << nl;
   *cs << "return new_obj;\n";
diff --git a/TAO/TAO_IDL/be/be_state_argument.cpp b/TAO/TAO_IDL/be/be_state_argument.cpp
index dd0340424fa..efefcc61f4c 100644
--- a/TAO/TAO_IDL/be/be_state_argument.cpp
+++ b/TAO/TAO_IDL/be/be_state_argument.cpp
@@ -1119,13 +1119,15 @@ be_state_argument::gen_code (be_type *bt, be_decl *d, be_type *type)
               {
               case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
                 {
+#if 0
                   // XXXASG- check for memory leak here - TODO
                     // declare a variable
                   if (bt->node_type () == AST_Decl::NT_typedef)
                     *os << bt->name ();
                   else
                     *os << "char *";
-                  *os << " " << arg->local_name () << ";" << nl;
+#endif
+                  *os << "char *" << arg->local_name () << ";" << nl;
 #if 0
                     // now define a NamedValue_ptr
                   *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
@@ -1176,23 +1178,27 @@ be_state_argument::gen_code (be_type *bt, be_decl *d, be_type *type)
                 break;
               case TAO_CodeGen::TAO_ARGUMENT_CH:
                 {
+#if 0
                   *os << "const ";
                   if (bt->node_type () == AST_Decl::NT_typedef)
                     *os << bt->nested_type_name (bif);
                   else
                     *os << "char *";
-                  *os << " " << arg->local_name () << ", ";
+#endif
+                  *os << "const char *" << arg->local_name () << ", ";
                 }
                 break;
               case TAO_CodeGen::TAO_ARGUMENT_SH:
               case TAO_CodeGen::TAO_ARGUMENT_CS:
                 {
+#if 0
                   *os << "const ";
                   if (bt->node_type () == AST_Decl::NT_typedef)
                     *os << bt->name ();
                   else
                     *os << "char *";
-                  *os << " " << arg->local_name () << ", ";
+#endif
+                  *os << "const char *" << arg->local_name () << ", ";
                 }
                 break;
               default:
@@ -1207,6 +1213,7 @@ be_state_argument::gen_code (be_type *bt, be_decl *d, be_type *type)
               {
               case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
                 {
+#if 0
                     // declare a variable
                   if (bt->node_type () == AST_Decl::NT_typedef)
                     {
@@ -1218,6 +1225,9 @@ be_state_argument::gen_code (be_type *bt, be_decl *d, be_type *type)
                       *os << "char **" << arg->local_name () <<
                         " = new char *;" << nl;
                     }
+#endif
+                  *os << "char **" << arg->local_name () << " = new char *;" <<
+                    nl;
 #if 0
                     // now define a NamedValue_ptr
                   *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
@@ -1267,21 +1277,25 @@ be_state_argument::gen_code (be_type *bt, be_decl *d, be_type *type)
                 break;
               case TAO_CodeGen::TAO_ARGUMENT_CH:
                 {
+#if 0
                   if (bt->node_type () == AST_Decl::NT_typedef)
                     *os << bt->nested_type_name (bif, " &");
                   else
                     *os << "char *&";
-                  *os << " " << arg->local_name () << ", ";
+#endif
+                  *os << "char *&" << arg->local_name () << ", ";
                 }
                 break;
               case TAO_CodeGen::TAO_ARGUMENT_SH:
               case TAO_CodeGen::TAO_ARGUMENT_CS:
                 {
+#if 0
                   if (bt->node_type () == AST_Decl::NT_typedef)
                     *os << bt->name ();
                   else
                     *os << "char *&";
-                  *os << " " << arg->local_name () << ", ";
+#endif
+                  *os << "char *&" << arg->local_name () << ", ";
                 }
                 break;
               default:
@@ -1296,6 +1310,7 @@ be_state_argument::gen_code (be_type *bt, be_decl *d, be_type *type)
               {
               case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
                 {
+#if 0
                     // declare a variable
                   if (bt->node_type () == AST_Decl::NT_typedef)
                     {
@@ -1312,8 +1327,11 @@ be_state_argument::gen_code (be_type *bt, be_decl *d, be_type *type)
                     *os << bt->name () << "_out";
                   else
                     *os << "CORBA::String_out";
-                  *os << " " << arg->local_name () << "_out (*" <<
-                    arg->local_name () << ");" << nl;
+#endif
+                  *os << "char **" << arg->local_name () <<
+                    " = new char *;" << nl;
+                  *os << "CORBA::String_out " << arg->local_name () <<
+                    "_out (*" << arg->local_name () << ");" << nl;
 #if 0
                   // now define a NamedValue_ptr
                   *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
@@ -1333,12 +1351,14 @@ be_state_argument::gen_code (be_type *bt, be_decl *d, be_type *type)
                 break;
               case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
                 {
+#if 0
                   // declare a string variable
                   if (bt->node_type () == AST_Decl::NT_typedef)
                     *os << bt->name ();
                   else
                     *os << "char *";
-                  *os << " _tao_base_" << arg->local_name () << ";" << nl;
+#endif
+                  *os << "char *_tao_base_" << arg->local_name () << ";" << nl;
                 }
                 break;
               case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
@@ -1375,21 +1395,25 @@ be_state_argument::gen_code (be_type *bt, be_decl *d, be_type *type)
                 break;
               case TAO_CodeGen::TAO_ARGUMENT_CH:
                 {
+#if 0
                   if (bt->node_type () == AST_Decl::NT_typedef)
                     *os << bt->nested_type_name (bif, "_out");
                   else
                     *os << "CORBA::String_out";
-                  *os << " " << arg->local_name () << ", ";
+#endif
+                  *os << "CORBA::String_out " << arg->local_name () << ", ";
                 }
                 break;
               case TAO_CodeGen::TAO_ARGUMENT_CS:
               case TAO_CodeGen::TAO_ARGUMENT_SH:
                 {
+#if 0
                   if (bt->node_type () == AST_Decl::NT_typedef)
                     *os << bt->name () << "_out";
                   else
                     *os << "CORBA::String_out";
-                  *os << " " << arg->local_name () << ", ";
+#endif
+                  *os << "CORBA::String_out " << arg->local_name () << ", ";
                 }
                 break;
               default:
diff --git a/TAO/TAO_IDL/be/be_state_operation.cpp b/TAO/TAO_IDL/be/be_state_operation.cpp
index 895334e6cf8..2279d3f5085 100644
--- a/TAO/TAO_IDL/be/be_state_operation.cpp
+++ b/TAO/TAO_IDL/be/be_state_operation.cpp
@@ -321,6 +321,7 @@ be_state_operation::gen_code (be_type *bt, be_decl *d, be_type *type)
           {
           case TAO_CodeGen::TAO_OPERATION_RETURN_TYPE_CS:
             {
+#if 0
               if (bt->node_type () == AST_Decl::NT_typedef)
                 {
                   *os << bt->name ();
@@ -329,10 +330,13 @@ be_state_operation::gen_code (be_type *bt, be_decl *d, be_type *type)
                 {
                   *os << "char *";
                 }
+#endif
+              *os << "char *";
             }
           break;
           case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS:
             {
+#if 0
               if (bt->node_type () == AST_Decl::NT_typedef)
                 {
                   *os << bt->name () << " retval = 0;" << nl;
@@ -341,6 +345,8 @@ be_state_operation::gen_code (be_type *bt, be_decl *d, be_type *type)
                 {
                   *os << "char *retval = 0;" << nl;
                 }
+#endif
+              *os << "char *retval = 0;" << nl;
             }
           break;
           case TAO_CodeGen::TAO_OPERATION_RETVAL_EXCEPTION_CS:
@@ -355,6 +361,7 @@ be_state_operation::gen_code (be_type *bt, be_decl *d, be_type *type)
           break;
           case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS:
             {
+#if 0
               if (bt->node_type () == AST_Decl::NT_typedef)
                 {
                   *os << bt->name () << " *retval = new " << bt->name () << ";" << nl;
@@ -363,6 +370,8 @@ be_state_operation::gen_code (be_type *bt, be_decl *d, be_type *type)
                 {
                   *os << "char **retval = new char*;" << nl;
                 }
+#endif
+              *os << "char **retval = new char*;" << nl;
             }
             break;
           case TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS:
@@ -378,6 +387,7 @@ be_state_operation::gen_code (be_type *bt, be_decl *d, be_type *type)
             break;
           case TAO_CodeGen::TAO_OPERATION_CH:
             {
+#if 0
               if (bt->node_type () == AST_Decl::NT_typedef)
                 {
                   // to keep MSVC++ happy
@@ -387,6 +397,8 @@ be_state_operation::gen_code (be_type *bt, be_decl *d, be_type *type)
                 {
                   *os << "char *";
                 }
+#endif
+              *os << "char *";
             }
             break;
           default:
diff --git a/TAO/TAO_IDL/be/be_structure.cpp b/TAO/TAO_IDL/be/be_structure.cpp
index 6fc79b6d36a..dc96bde62d8 100644
--- a/TAO/TAO_IDL/be/be_structure.cpp
+++ b/TAO/TAO_IDL/be/be_structure.cpp
@@ -318,7 +318,7 @@ be_structure::gen_var_defn (void)
     }
 
   // generate an additional member function that returns the underlying pointer
-  *ch << local_name () << " *ptr(void) const;\n";
+  *ch << local_name () << " *ptr (void) const;\n";
 
   *ch << "\n";
   ch->decr_indent ();
@@ -544,18 +544,18 @@ be_structure::gen_var_impl (void)
       ci->decr_indent ();
       *ci << "}\n\n";
 
-      // the additional ptr () member function
-      ci->indent ();
-      *ci << "ACE_INLINE " << name () << " *" << nl;
-      *ci << fname << "::ptr (void) const" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return this->ptr_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
     }
 
+  // the additional ptr () member function
+  ci->indent ();
+  *ci << "ACE_INLINE " << name () << " *" << nl;
+  *ci << fname << "::ptr (void) const" << nl;
+  *ci << "{\n";
+  ci->incr_indent ();
+  *ci << "return this->ptr_;\n";
+  ci->decr_indent ();
+  *ci << "}\n\n";
+
   return 0;
 }