*** empty log message ***

4 files changed, 56 insertions, 49 deletions

diff --git a/ChangeLog-97a b/ChangeLog-97a
index fc9c8c9b035..f78004e8b88 100644
--- a/ChangeLog-97a
+++ b/ChangeLog-97a
@@ -1,3 +1,9 @@
+Mon Jun 23 22:14:39 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* ace/Svc_Conf*: Changed the name of the YYSTYPE field
+ 	  ACE_Static_Node_ to static_node_ to be consistent with the other
+ 	  fields.
+
 Mon Jun 23 18:28:55 1997  David L. Levine  <levine@cs.wustl.edu>
 
 	* ace/ACE.cpp: added auto_basic_array_ptr specialization.
@@ -26,8 +32,8 @@ Mon Jun 23 09:18:39 1997  David L. Levine  <levine@cs.wustl.edu>
 	  /project/adaptive/ACE_wrappers.  Also, "make release" now
 	  adds release entry to latest ChangeLog.
 
-	* ace/Makefile: build shared library before static library.
-	  This appears to fix a problem with Sun C++ 4.{1,2} possibly
+	* ace/Makefile: build shared library before static library. 
+	  This appears to fix a problem with Sun C++ 4.{1,2} possibly 
 	  related to its template instantiation scheme.  If the
 	  static library is built first, then .shobj/Reactor.so
 	  and .shobj/Timer_Hash.so (and possibly others) fail to
@@ -37,16 +43,17 @@ Mon Jun 23 09:18:39 1997  David L. Levine  <levine@cs.wustl.edu>
 	  Satoshi Ueno <satoshi.ueno@gs.com> for reporting this, and
 	  to Satoshi for verifying the fix.
 
-	* ace/ACE.cpp (terminate_process): removed used of ACE_OSCALL_RETURN
-	  macro because its defined in OS.i, and so not available if
-	  inlining is disabled.
+	* ace/ACE.cpp (terminate_process): removed used of
+	  ACE_OSCALL_RETURN macro because its defined in OS.i, and so
+	  not available if inlining is disabled.
 
-	* ace/Auto_Ptr.{h,i}: made "p_" protected instead of private so that
-	  it can be accessed with the new class arrangement.  Also, made the
-	  auto_array_ptr operator-> const.
+	* ace/Auto_Ptr.{h,i}: made "p_" protected instead of private
+	  so that it can be accessed with the new class arrangement.
+	  Also, made the auto_array_ptr operator-> const.
 
-	* ace/Sched_Params.cpp (previous_priority, VxWorks only): removed
-	  ACE_UNUSED_ARG (policy) because policy is used in this function.
+	* ace/Sched_Params.cpp (previous_priority, VxWorks only):
+	  removed ACE_UNUSED_ARG (policy) because policy is used in
+	  this function. 
 
 	* netsvcs/lib/TS_Clerk_Handler.cpp (parse_args): wrapped TCHAR
 	  argument to sizeof in parenthesis.
diff --git a/ace/Svc_Conf.h b/ace/Svc_Conf.h
index a777b1ef880..cfbbfa7496d 100644
--- a/ace/Svc_Conf.h
+++ b/ace/Svc_Conf.h
@@ -72,7 +72,7 @@ typedef union
   int type_;
   ACE_Location_Node *location_node_;
   ACE_Parse_Node *parse_node_;
-  ACE_Static_Node *ACE_Static_Node_;
+  ACE_Static_Node *static_node_;
   ACE_Service_Record *svc_record_;
   char *ident_; 
 } YYSTYPE;
diff --git a/ace/Svc_Conf.y b/ace/Svc_Conf.y
index b75324a7c52..8ff5d5708be 100644
--- a/ace/Svc_Conf.y
+++ b/ace/Svc_Conf.y
@@ -27,7 +27,7 @@ ACE_Obstack *ace_obstack;
 %type <type_> type status
 %type <parse_node_> dynamic static suspend resume remove module_list stream
 %type <parse_node_> stream_modules module svc_config_entry 
-%type <ACE_Static_Node_> stream_ops
+%type <static_node_> stream_ops
 %type <svc_record_> svc_location
 %type <location_node_> svc_initializer
 
@@ -94,9 +94,9 @@ stream
     {
       $$ = new ACE_Stream_Node ($2, $3);
     }
-  | ACE_USTREAM ACE_IDENT { $<ACE_Static_Node_>$ = new ACE_Static_Node ($2); } stream_modules
+  | ACE_USTREAM ACE_IDENT { $<static_node_>$ = new ACE_Static_Node ($2); } stream_modules
     {
-      $$ = new ACE_Dummy_Node ($<ACE_Static_Node_>3, $4);
+      $$ = new ACE_Dummy_Node ($<static_node_>3, $4);
     }
   ;
 
@@ -113,7 +113,7 @@ stream_modules
   : ACE_LBRACE 
     { 
       // Initialize left context...
-      $<ACE_Static_Node_>$ = $<ACE_Static_Node_>0; 
+      $<static_node_>$ = $<static_node_>0; 
     } 
    module_list ACE_RBRACE
     {
@@ -130,52 +130,52 @@ module_list
 module 
   : dynamic 
     {
-      ACE_ARGV args ($<ACE_Static_Node_>1->parameters ());
-      ACE_Module_Type *mt = get_module ($<ACE_Static_Node_>-1, $<ACE_Static_Node_>1);
+      ACE_ARGV args ($<static_node_>1->parameters ());
+      ACE_Module_Type *mt = get_module ($<static_node_>-1, $<static_node_>1);
 
-      if (::strcmp ($<ACE_Static_Node_>1->name (), 
+      if (::strcmp ($<static_node_>1->name (), 
 		    ((MT_Module *) mt->object ())->name ()) != 0)
 	ACE_ERROR ((LM_ERROR, "warning, service name %s is different from Module name %s\n",
-		   $<ACE_Static_Node_>1->name (), ((MT_Module *) mt->object ())->name ()));
+		   $<static_node_>1->name (), ((MT_Module *) mt->object ())->name ()));
 
       if (mt->init (args.argc (), args.argv ()) == -1
-	  || ((ACE_Stream_Type *) ($<ACE_Static_Node_>-1)->record ()->type ())->push (mt) == -1)
+	  || ((ACE_Stream_Type *) ($<static_node_>-1)->record ()->type ())->push (mt) == -1)
 	{
 	  ACE_ERROR ((LM_ERROR, "dynamic initialization failed for Module %s\n",
-		     $<ACE_Static_Node_>1->name ()));
+		     $<static_node_>1->name ()));
 	  yyerrno++;
 	}
     }
   | static  
     { 
-      ACE_Module_Type *mt = get_module ($<ACE_Static_Node_>-1, $<ACE_Static_Node_>1->name ());
-      if (::strcmp ($<ACE_Static_Node_>1->name (), 
+      ACE_Module_Type *mt = get_module ($<static_node_>-1, $<static_node_>1->name ());
+      if (::strcmp ($<static_node_>1->name (), 
 		    ((MT_Module *) mt->object ())->name ()) != 0)
 	ACE_ERROR ((LM_ERROR, "warning, service name %s is different from Module name %s\n",
-		   $<ACE_Static_Node_>1->name (), ((MT_Module *) mt->object ())->name ()));
-      if (((ACE_Stream_Type *) ($<ACE_Static_Node_>-1)->record ()->type ())->push (mt) == -1)
+		   $<static_node_>1->name (), ((MT_Module *) mt->object ())->name ()));
+      if (((ACE_Stream_Type *) ($<static_node_>-1)->record ()->type ())->push (mt) == -1)
 	yyerrno++;
     }
   | suspend 
     { 
-      ACE_Module_Type *mt = get_module ($<ACE_Static_Node_>-1, $<ACE_Static_Node_>1->name ());
+      ACE_Module_Type *mt = get_module ($<static_node_>-1, $<static_node_>1->name ());
       if (mt != 0)
 	mt->suspend ();
     }
   | resume  
     {
-      ACE_Module_Type *mt = get_module ($<ACE_Static_Node_>-1, $<ACE_Static_Node_>1->name ());
+      ACE_Module_Type *mt = get_module ($<static_node_>-1, $<static_node_>1->name ());
       if (mt != 0)
 	mt->resume ();
     }
   | remove  
     { 
-      ACE_Module_Type *mt = get_module ($<ACE_Static_Node_>-1, $<ACE_Static_Node_>1->name ());
+      ACE_Module_Type *mt = get_module ($<static_node_>-1, $<static_node_>1->name ());
       if (mt != 0 
-	  && ((ACE_Stream_Type *) ($<ACE_Static_Node_>-1)->record ()->type ())->remove (mt) == -1)
+	  && ((ACE_Stream_Type *) ($<static_node_>-1)->record ()->type ())->remove (mt) == -1)
 	{
 	  ACE_ERROR ((LM_ERROR, "cannot remove Module_Type %s from STREAM_Type %s\n",
-		     $<ACE_Static_Node_>1->name (), ($<ACE_Static_Node_>-1)->name ()));
+		     $<static_node_>1->name (), ($<static_node_>-1)->name ()));
 	  yyerrno++;
 	}
     }
diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp
index be5d4dd2eb5..cc90e27ad8a 100644
--- a/ace/Svc_Conf_y.cpp
+++ b/ace/Svc_Conf_y.cpp
@@ -695,17 +695,17 @@ break;
 case 15:
 #line 94 "Svc_Conf.y"
 {
-      ace_yyval.parse_node_ = new ACE_Stream_Node (ace_yyvsp[-1].ACE_Static_Node_, ace_yyvsp[0].parse_node_);
+      ace_yyval.parse_node_ = new ACE_Stream_Node (ace_yyvsp[-1].static_node_, ace_yyvsp[0].parse_node_);
     }
 break;
 case 16:
 #line 97 "Svc_Conf.y"
-{ ace_yyval.ACE_Static_Node_ = new ACE_Static_Node (ace_yyvsp[0].ident_); }
+{ ace_yyval.static_node_ = new ACE_Static_Node (ace_yyvsp[0].ident_); }
 break;
 case 17:
 #line 98 "Svc_Conf.y"
 {
-      ace_yyval.parse_node_ = new ACE_Dummy_Node (ace_yyvsp[-1].ACE_Static_Node_, ace_yyvsp[0].parse_node_);
+      ace_yyval.parse_node_ = new ACE_Dummy_Node (ace_yyvsp[-1].static_node_, ace_yyvsp[0].parse_node_);
     }
 break;
 case 18:
@@ -722,7 +722,7 @@ case 20:
 #line 114 "Svc_Conf.y"
 { 
       /* Initialize left context...*/
-      ace_yyval.ACE_Static_Node_ = ace_yyvsp[-1].ACE_Static_Node_; 
+      ace_yyval.static_node_ = ace_yyvsp[-1].static_node_; 
     }
 break;
 case 21:
@@ -746,19 +746,19 @@ break;
 case 25:
 #line 132 "Svc_Conf.y"
 {
-      ACE_ARGV args (ace_yyvsp[0].ACE_Static_Node_->parameters ());
-      ACE_Module_Type *mt = get_module (ace_yyvsp[-2].ACE_Static_Node_, ace_yyvsp[0].ACE_Static_Node_);
+      ACE_ARGV args (ace_yyvsp[0].static_node_->parameters ());
+      ACE_Module_Type *mt = get_module (ace_yyvsp[-2].static_node_, ace_yyvsp[0].static_node_);
 
-      if (::strcmp (ace_yyvsp[0].ACE_Static_Node_->name (), 
+      if (::strcmp (ace_yyvsp[0].static_node_->name (), 
 		    ((MT_Module *) mt->object ())->name ()) != 0)
 	ACE_ERROR ((LM_ERROR, "warning, service name %s is different from Module name %s\n",
-		   ace_yyvsp[0].ACE_Static_Node_->name (), ((MT_Module *) mt->object ())->name ()));
+		   ace_yyvsp[0].static_node_->name (), ((MT_Module *) mt->object ())->name ()));
 
       if (mt->init (args.argc (), args.argv ()) == -1
-	  || ((ACE_Stream_Type *) (ace_yyvsp[-2].ACE_Static_Node_)->record ()->type ())->push (mt) == -1)
+	  || ((ACE_Stream_Type *) (ace_yyvsp[-2].static_node_)->record ()->type ())->push (mt) == -1)
 	{
 	  ACE_ERROR ((LM_ERROR, "dynamic initialization failed for Module %s\n",
-		     ace_yyvsp[0].ACE_Static_Node_->name ()));
+		     ace_yyvsp[0].static_node_->name ()));
 	  ace_yyerrno++;
 	}
     }
@@ -766,19 +766,19 @@ break;
 case 26:
 #line 150 "Svc_Conf.y"
 { 
-      ACE_Module_Type *mt = get_module (ace_yyvsp[-2].ACE_Static_Node_, ace_yyvsp[0].ACE_Static_Node_->name ());
-      if (::strcmp (ace_yyvsp[0].ACE_Static_Node_->name (), 
+      ACE_Module_Type *mt = get_module (ace_yyvsp[-2].static_node_, ace_yyvsp[0].static_node_->name ());
+      if (::strcmp (ace_yyvsp[0].static_node_->name (), 
 		    ((MT_Module *) mt->object ())->name ()) != 0)
 	ACE_ERROR ((LM_ERROR, "warning, service name %s is different from Module name %s\n",
-		   ace_yyvsp[0].ACE_Static_Node_->name (), ((MT_Module *) mt->object ())->name ()));
-      if (((ACE_Stream_Type *) (ace_yyvsp[-2].ACE_Static_Node_)->record ()->type ())->push (mt) == -1)
+		   ace_yyvsp[0].static_node_->name (), ((MT_Module *) mt->object ())->name ()));
+      if (((ACE_Stream_Type *) (ace_yyvsp[-2].static_node_)->record ()->type ())->push (mt) == -1)
 	ace_yyerrno++;
     }
 break;
 case 27:
 #line 160 "Svc_Conf.y"
 { 
-      ACE_Module_Type *mt = get_module (ace_yyvsp[-2].ACE_Static_Node_, ace_yyvsp[0].ACE_Static_Node_->name ());
+      ACE_Module_Type *mt = get_module (ace_yyvsp[-2].static_node_, ace_yyvsp[0].static_node_->name ());
       if (mt != 0)
 	mt->suspend ();
     }
@@ -786,7 +786,7 @@ break;
 case 28:
 #line 166 "Svc_Conf.y"
 {
-      ACE_Module_Type *mt = get_module (ace_yyvsp[-2].ACE_Static_Node_, ace_yyvsp[0].ACE_Static_Node_->name ());
+      ACE_Module_Type *mt = get_module (ace_yyvsp[-2].static_node_, ace_yyvsp[0].static_node_->name ());
       if (mt != 0)
 	mt->resume ();
     }
@@ -794,12 +794,12 @@ break;
 case 29:
 #line 172 "Svc_Conf.y"
 { 
-      ACE_Module_Type *mt = get_module (ace_yyvsp[-2].ACE_Static_Node_, ace_yyvsp[0].ACE_Static_Node_->name ());
+      ACE_Module_Type *mt = get_module (ace_yyvsp[-2].static_node_, ace_yyvsp[0].static_node_->name ());
       if (mt != 0 
-	  && ((ACE_Stream_Type *) (ace_yyvsp[-2].ACE_Static_Node_)->record ()->type ())->remove (mt) == -1)
+	  && ((ACE_Stream_Type *) (ace_yyvsp[-2].static_node_)->record ()->type ())->remove (mt) == -1)
 	{
 	  ACE_ERROR ((LM_ERROR, "cannot remove Module_Type %s from STREAM_Type %s\n",
-		     ace_yyvsp[0].ACE_Static_Node_->name (), (ace_yyvsp[-2].ACE_Static_Node_)->name ()));
+		     ace_yyvsp[0].static_node_->name (), (ace_yyvsp[-2].static_node_)->name ()));
 	  ace_yyerrno++;
 	}
     }