*** empty log message ***

35 files changed, 103 insertions, 19 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 19e60b53299..b6d7dff6d89 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,5 +1,20 @@
 Thu Apr 23 18:50:29 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
+        * TAO_IDL/ast_enum.h,
+	  TAO_IDL/ast_exception.h,
+	  TAO_IDL/ast_interface.h,
+	  TAO_IDL/ast_module.h,
+	  TAO_IDL/ast_operation.h,
+	  TAO_IDL/ast_root.h,
+	  TAO_IDL/ast_structure.h,
+	  TAO_IDL/ast_union.h,
+	  TAO_IDL/utl_scope.h: Changed 'friend int yyparse()' to 
+	  'friend int tao_yyparse()' to reflect new changes.
+
+        * The following changes will hopefully provide a framework
+	  for getting rid of all the nasty problems with statics
+	  in TAO!
+
 	* tao/ORB: Added a new static method called init_orb_globals()
  	  that initializes the globals when necessary.
 
diff --git a/TAO/TAO_IDL/fe/Makefile b/TAO/TAO_IDL/fe/Makefile
index 1aec28e49c3..a6c9dbcef37 100644
--- a/TAO/TAO_IDL/fe/Makefile
+++ b/TAO/TAO_IDL/fe/Makefile
@@ -63,8 +63,11 @@ LFLAGS	= -t
 y.tab.h y.tab.cpp: idl.yy
 	@-$(RM) -f $@
 	$(YACC) $(YFLAGS) idl.yy
-	sed -e "s/yy/tao_yy/g" \
+	@sed -e "s/yy/tao_yy/g" \
 	    -e "s/YY/TAO_YY/g" < y.tab.c > y.tab.cpp
+	@sed -e "s/yy/tao_yy/g" \
+	    -e "s/YY/TAO_YY/g" < y.tab.h > /tmp/$@
+	@mv /tmp/$@ y.tab.h
 	@patch < y.tab.cpp.diff
 	@-$(RM) -f y.tab.cpp.orig y.tab.c 
 
diff --git a/TAO/TAO_IDL/fe/fe_extern.cpp b/TAO/TAO_IDL/fe/fe_extern.cpp
index 03e52fbdc5f..ba16f3357dc 100644
--- a/TAO/TAO_IDL/fe/fe_extern.cpp
+++ b/TAO/TAO_IDL/fe/fe_extern.cpp
@@ -1,3 +1,6 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
+
 /*
 
 COPYRIGHT
@@ -79,13 +82,13 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  * yacc parser interface
  */
 
-extern int yyparse();
-extern FILE * yyin;
+extern int tao_yyparse();
+extern FILE * tao_yyin;
 
 int
 FE_yyparse()
 {
-  int result = yyparse();
+  int result = tao_yyparse();
   if (idl_global->err_count() == 0) {
     idl_global->root()->call_add();
   }
@@ -95,7 +98,7 @@ FE_yyparse()
 void
 FE_set_yyin(File * f)
 {
-  yyin = (FILE*)f;
+  tao_yyin = (FILE*)f;
 }
 
 /*
diff --git a/TAO/TAO_IDL/fe/y.tab.h b/TAO/TAO_IDL/fe/y.tab.h
index 8c197aab46b..88a7834e196 100644
--- a/TAO/TAO_IDL/fe/y.tab.h
+++ b/TAO/TAO_IDL/fe/y.tab.h
@@ -1,7 +1,7 @@
-
+// $Id$
 typedef union
 #ifdef __cplusplus
-	YYSTYPE
+	TAO_YYSTYPE
 #endif
  {
   AST_Decl		*dcval;		/* Decl value		*/
@@ -28,8 +28,8 @@ typedef union
   char			*strval;	/* char * value		*/
   Identifier		*idval;		/* Identifier		*/
   UTL_IdList		*idlist;	/* Identifier list	*/
-} YYSTYPE;
-extern YYSTYPE yylval;
+} TAO_YYSTYPE;
+extern TAO_YYSTYPE tao_yylval;
 # define IDENTIFIER 257
 # define IDL_CONST 258
 # define IDL_MODULE 259
diff --git a/TAO/TAO_IDL/include/ast.h b/TAO/TAO_IDL/include/ast.h
index 5fdeef19e0c..fc05323e075 100644
--- a/TAO/TAO_IDL/include/ast.h
+++ b/TAO/TAO_IDL/include/ast.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_argument.h b/TAO/TAO_IDL/include/ast_argument.h
index c0cbb18cebb..1f65d0ca9ac 100644
--- a/TAO/TAO_IDL/include/ast_argument.h
+++ b/TAO/TAO_IDL/include/ast_argument.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_array.h b/TAO/TAO_IDL/include/ast_array.h
index 0d3fb69b9f1..86d2387000b 100644
--- a/TAO/TAO_IDL/include/ast_array.h
+++ b/TAO/TAO_IDL/include/ast_array.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_attribute.h b/TAO/TAO_IDL/include/ast_attribute.h
index a18706bd0f7..6abc58967d6 100644
--- a/TAO/TAO_IDL/include/ast_attribute.h
+++ b/TAO/TAO_IDL/include/ast_attribute.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_concrete_type.h b/TAO/TAO_IDL/include/ast_concrete_type.h
index 6c527afaca7..410c2eabe16 100644
--- a/TAO/TAO_IDL/include/ast_concrete_type.h
+++ b/TAO/TAO_IDL/include/ast_concrete_type.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_constant.h b/TAO/TAO_IDL/include/ast_constant.h
index 90db723d429..2f663c60a1e 100644
--- a/TAO/TAO_IDL/include/ast_constant.h
+++ b/TAO/TAO_IDL/include/ast_constant.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h
index 964cc917f8a..1177756ce85 100644
--- a/TAO/TAO_IDL/include/ast_decl.h
+++ b/TAO/TAO_IDL/include/ast_decl.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_enum.h b/TAO/TAO_IDL/include/ast_enum.h
index cf6941386c5..40189295737 100644
--- a/TAO/TAO_IDL/include/ast_enum.h
+++ b/TAO/TAO_IDL/include/ast_enum.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
@@ -105,7 +107,7 @@ private:
   unsigned long			pd_enum_counter;	// Value for next
 							// enumerator
   // Scope management
-  friend int yyparse();
+  friend int tao_yyparse();
   virtual AST_EnumVal		*fe_add_enum_val(AST_EnumVal	*v);
 
 };
diff --git a/TAO/TAO_IDL/include/ast_enum_val.h b/TAO/TAO_IDL/include/ast_enum_val.h
index 902b5ad04c4..6851474b641 100644
--- a/TAO/TAO_IDL/include/ast_enum_val.h
+++ b/TAO/TAO_IDL/include/ast_enum_val.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_exception.h b/TAO/TAO_IDL/include/ast_exception.h
index a1bf98fd8e9..f3a667bd8b7 100644
--- a/TAO/TAO_IDL/include/ast_exception.h
+++ b/TAO/TAO_IDL/include/ast_exception.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
@@ -102,7 +104,7 @@ public:
   virtual void			dump(ostream &o);
 
 private:
-  friend int yyparse();
+  friend int tao_yyparse();
   // Scope Management Protocol
 
   virtual AST_Field		*fe_add_field(AST_Field		*f);
diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h
index 6d284bd1a77..db3bd7abc41 100644
--- a/TAO/TAO_IDL/include/ast_expression.h
+++ b/TAO/TAO_IDL/include/ast_expression.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_extern.h b/TAO/TAO_IDL/include/ast_extern.h
index 74ea518bef5..f344e371b83 100644
--- a/TAO/TAO_IDL/include/ast_extern.h
+++ b/TAO/TAO_IDL/include/ast_extern.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_field.h b/TAO/TAO_IDL/include/ast_field.h
index 39e80f5c6ec..b3c6f04cd8c 100644
--- a/TAO/TAO_IDL/include/ast_field.h
+++ b/TAO/TAO_IDL/include/ast_field.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h
index 887ac7aa156..6733bbad3e8 100644
--- a/TAO/TAO_IDL/include/ast_generator.h
+++ b/TAO/TAO_IDL/include/ast_generator.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h
index 06f01ddecb1..c41eaf858fd 100644
--- a/TAO/TAO_IDL/include/ast_interface.h
+++ b/TAO/TAO_IDL/include/ast_interface.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
@@ -127,7 +129,7 @@ private:
   long				pd_n_inherits;	// How many of them?
 
   // Scope Management Protocol
-  friend int yyparse();
+  friend int tao_yyparse();
 
   virtual AST_Constant		*fe_add_constant(AST_Constant	*c);
   virtual AST_Exception		*fe_add_exception(AST_Exception	*e);
diff --git a/TAO/TAO_IDL/include/ast_interface_fwd.h b/TAO/TAO_IDL/include/ast_interface_fwd.h
index 8dddc51d916..72a8f8842aa 100644
--- a/TAO/TAO_IDL/include/ast_interface_fwd.h
+++ b/TAO/TAO_IDL/include/ast_interface_fwd.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h
index 81dbbf0e50d..073eb5baa2c 100644
--- a/TAO/TAO_IDL/include/ast_module.h
+++ b/TAO/TAO_IDL/include/ast_module.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
@@ -97,7 +99,7 @@ public:
 
 private:
   friend void fe_populate(AST_Module *m);
-  friend int yyparse();
+  friend int tao_yyparse();
 
   // Scope Management Protocol
 
diff --git a/TAO/TAO_IDL/include/ast_native.h b/TAO/TAO_IDL/include/ast_native.h
index 6cc41d146af..d170da542a9 100644
--- a/TAO/TAO_IDL/include/ast_native.h
+++ b/TAO/TAO_IDL/include/ast_native.h
@@ -1,4 +1,7 @@
-#ifndef _AST_NATIVE_H_
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
+
+#if !defined (_AST_NATIVE_H_)
 #define _AST_NATIVE_H_
 
 // Representation of "native" IDL type added by the POA spec
diff --git a/TAO/TAO_IDL/include/ast_operation.h b/TAO/TAO_IDL/include/ast_operation.h
index dc197a7bf17..3dcf8a252ef 100644
--- a/TAO/TAO_IDL/include/ast_operation.h
+++ b/TAO/TAO_IDL/include/ast_operation.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
@@ -124,7 +126,7 @@ private:
   UTL_ExceptList		*pd_exceptions;		// Exceptions raised
 
   // Scope Management Protocol
-  friend int yyparse();
+  friend int tao_yyparse();
 
   virtual AST_Argument		*fe_add_argument(AST_Argument	*a);
   virtual UTL_StrList		*fe_add_context(UTL_StrList 	*c);	
diff --git a/TAO/TAO_IDL/include/ast_predefined_type.h b/TAO/TAO_IDL/include/ast_predefined_type.h
index 1be12f4c4bc..7c7ebd953f4 100644
--- a/TAO/TAO_IDL/include/ast_predefined_type.h
+++ b/TAO/TAO_IDL/include/ast_predefined_type.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_root.h b/TAO/TAO_IDL/include/ast_root.h
index 765043aac97..e81c87f1fda 100644
--- a/TAO/TAO_IDL/include/ast_root.h
+++ b/TAO/TAO_IDL/include/ast_root.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
@@ -93,7 +95,7 @@ public:
 
 private:
   friend class FE_Declarator;
-  friend int yyparse();
+  friend int tao_yyparse();
   // Add protocol
 
   virtual AST_Sequence		*fe_add_sequence(AST_Sequence		*s);
diff --git a/TAO/TAO_IDL/include/ast_sequence.h b/TAO/TAO_IDL/include/ast_sequence.h
index d3864e9f982..73849d0f02b 100644
--- a/TAO/TAO_IDL/include/ast_sequence.h
+++ b/TAO/TAO_IDL/include/ast_sequence.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_string.h b/TAO/TAO_IDL/include/ast_string.h
index 4bdfbb7734e..9e5874c304c 100644
--- a/TAO/TAO_IDL/include/ast_string.h
+++ b/TAO/TAO_IDL/include/ast_string.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_structure.h b/TAO/TAO_IDL/include/ast_structure.h
index f20eb0eb3a8..baa1944bbe6 100644
--- a/TAO/TAO_IDL/include/ast_structure.h
+++ b/TAO/TAO_IDL/include/ast_structure.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
@@ -103,7 +105,7 @@ public:
   virtual void		dump(ostream &o);
 
 private:
-  friend int yyparse();
+  friend int tao_yyparse();
   // Scope Management Protocol
 
   virtual AST_Union	*fe_add_union(AST_Union		*u);
diff --git a/TAO/TAO_IDL/include/ast_type.h b/TAO/TAO_IDL/include/ast_type.h
index ca9a5e0498c..04a36d8235d 100644
--- a/TAO/TAO_IDL/include/ast_type.h
+++ b/TAO/TAO_IDL/include/ast_type.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_typedef.h b/TAO/TAO_IDL/include/ast_typedef.h
index 1abb09aa935..c2e13051b54 100644
--- a/TAO/TAO_IDL/include/ast_typedef.h
+++ b/TAO/TAO_IDL/include/ast_typedef.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_union.h b/TAO/TAO_IDL/include/ast_union.h
index eab7ec51985..062e540e9a8 100644
--- a/TAO/TAO_IDL/include/ast_union.h
+++ b/TAO/TAO_IDL/include/ast_union.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
@@ -127,7 +129,7 @@ private:
   AST_UnionBranch		*lookup_enum(AST_UnionBranch *b);
 
 private:
-  friend int yyparse();
+  friend int tao_yyparse();
   // Scope Management Protocol
 
   virtual AST_Union		*fe_add_union(AST_Union			*u);
diff --git a/TAO/TAO_IDL/include/ast_union_branch.h b/TAO/TAO_IDL/include/ast_union_branch.h
index e2de5aa8b7e..2bfe414452e 100644
--- a/TAO/TAO_IDL/include/ast_union_branch.h
+++ b/TAO/TAO_IDL/include/ast_union_branch.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_union_label.h b/TAO/TAO_IDL/include/ast_union_label.h
index 587ddb1c911..7dd124784a4 100644
--- a/TAO/TAO_IDL/include/ast_union_label.h
+++ b/TAO/TAO_IDL/include/ast_union_label.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
diff --git a/TAO/TAO_IDL/include/be_extern.h b/TAO/TAO_IDL/include/be_extern.h
index c8e5f0530fe..253599b76f1 100644
--- a/TAO/TAO_IDL/include/be_extern.h
+++ b/TAO/TAO_IDL/include/be_extern.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h
index ff105101964..ce94d12574f 100644
--- a/TAO/TAO_IDL/include/utl_scope.h
+++ b/TAO/TAO_IDL/include/utl_scope.h
@@ -1,3 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
 /*
 
 COPYRIGHT
@@ -228,7 +230,7 @@ private:
   friend class			UTL_ScopeActiveIterator;
 
 private:
-  friend int yyparse();
+  friend int tao_yyparse();
   friend class AST_Enum;
 
   // Scope Management Protocol