ChangeLogTag:Sat Oct 25 14:14:53 1997 Carlos O'Ryan <coryan@MILONGA>

147 files changed, 803 insertions, 303 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index c2522ce99c2..66d084c6556 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,165 @@
+Sat Oct 25 14:14:53 1997  Carlos O'Ryan  <coryan@MILONGA>
+
+	* TAO_IDL/tao_idl.dsw: 
+	* TAO_IDL/tao_idl.dsp: 
+	  Added a MSVC++ project file for the IDL compiler, needs several
+	  revisions byt the NT experts before shipping, but it has served
+	  me well.
+
+	* TAO_IDL/driver/drv_fork.cpp: 
+	* TAO_IDL/driver/drv_preproc.cpp: 
+	  We use ACE components to fork&exec subprocesses, get the default
+	  TMP directory and generate protable pathnames.
+	  In one case the mapping to NT is not clear: the use case is fork
+	  to get a "fresh" copy of the process and provide a unit of
+	  protection for the parent; this feature is only used if more
+	  than one IDL file is compiled at the same time.
+
+	* TAO_IDL/ast/ast_argument.cpp: 
+	* TAO_IDL/ast/ast_array.cpp: 
+	* TAO_IDL/ast/ast_attribute.cpp: 
+	* TAO_IDL/ast/ast_check.cpp: 
+	* TAO_IDL/ast/ast_concrete_type.cpp: 
+	* TAO_IDL/ast/ast_constant.cpp: 
+	* TAO_IDL/ast/ast_decl.cpp: 
+	* TAO_IDL/ast/ast_enum.cpp: 
+	* TAO_IDL/ast/ast_enum_val.cpp: 
+	* TAO_IDL/ast/ast_exception.cpp: 
+	* TAO_IDL/ast/ast_expression.cpp: 
+	* TAO_IDL/ast/ast_field.cpp: 
+	* TAO_IDL/ast/ast_generator.cpp: 
+	* TAO_IDL/ast/ast_interface.cpp: 
+	* TAO_IDL/ast/ast_interface_fwd.cpp: 
+	* TAO_IDL/ast/ast_module.cpp: 
+	* TAO_IDL/ast/ast_operation.cpp: 
+	* TAO_IDL/ast/ast_predefined_type.cpp: 
+	* TAO_IDL/ast/ast_recursive.cpp: 
+	* TAO_IDL/ast/ast_redef.cpp: 
+	* TAO_IDL/ast/ast_root.cpp: 
+	* TAO_IDL/ast/ast_sequence.cpp: 
+	* TAO_IDL/ast/ast_string.cpp: 
+	* TAO_IDL/ast/ast_structure.cpp: 
+	* TAO_IDL/ast/ast_type.cpp: 
+	* TAO_IDL/ast/ast_union.cpp: 
+	* TAO_IDL/ast/ast_union_branch.cpp: 
+	* TAO_IDL/ast/ast_union_label.cpp: 
+	* TAO_IDL/be/be_args.cpp: 
+	* TAO_IDL/be/be_constant.cpp: 
+	* TAO_IDL/be/be_generator.cpp: 
+	* TAO_IDL/be/be_init.cpp: 
+	* TAO_IDL/be/be_produce.cpp: 
+	* TAO_IDL/be_include/be.h: 
+	* TAO_IDL/be_include/be_generator.h: 
+	* TAO_IDL/driver/drv_args.cpp: 
+	* TAO_IDL/driver/drv_fork.cpp: 
+	* TAO_IDL/driver/drv_init.cpp: 
+	* TAO_IDL/driver/drv_main.cpp: 
+	* TAO_IDL/driver/drv_preproc.cpp: 
+	* TAO_IDL/driver/drv_private.cpp: 
+	* TAO_IDL/fe/fe_declarator.cpp: 
+	* TAO_IDL/fe/fe_extern.cpp: 
+	* TAO_IDL/fe/fe_init.cpp: 
+	* TAO_IDL/fe/fe_interface_header.cpp: 
+	* TAO_IDL/fe/fe_private.cpp: 
+	* TAO_IDL/fe/lex.yy.cpp: 
+	* TAO_IDL/fe/y.tab.cpp: 
+	* TAO_IDL/include/ast.h: 
+	* TAO_IDL/include/ast_argument.h: 
+	* TAO_IDL/include/ast_array.h: 
+	* TAO_IDL/include/ast_attribute.h: 
+	* TAO_IDL/include/ast_concrete_type.h: 
+	* TAO_IDL/include/ast_constant.h: 
+	* TAO_IDL/include/ast_decl.h: 
+	* TAO_IDL/include/ast_enum.h: 
+	* TAO_IDL/include/ast_enum_val.h: 
+	* TAO_IDL/include/ast_exception.h: 
+	* TAO_IDL/include/ast_expression.h: 
+	* TAO_IDL/include/ast_extern.h: 
+	* TAO_IDL/include/ast_field.h: 
+	* TAO_IDL/include/ast_generator.h: 
+	* TAO_IDL/include/ast_interface.h: 
+	* TAO_IDL/include/ast_interface_fwd.h: 
+	* TAO_IDL/include/ast_module.h: 
+	* TAO_IDL/include/ast_operation.h: 
+	* TAO_IDL/include/ast_predefined_type.h: 
+	* TAO_IDL/include/ast_root.h: 
+	* TAO_IDL/include/ast_sequence.h: 
+	* TAO_IDL/include/ast_string.h: 
+	* TAO_IDL/include/ast_structure.h: 
+	* TAO_IDL/include/ast_type.h: 
+	* TAO_IDL/include/ast_typedef.h: 
+	* TAO_IDL/include/ast_union.h: 
+	* TAO_IDL/include/ast_union_branch.h: 
+	* TAO_IDL/include/ast_union_label.h: 
+	* TAO_IDL/include/be_extern.h: 
+	* TAO_IDL/include/drv_extern.h: 
+	* TAO_IDL/include/drv_private.h: 
+	* TAO_IDL/include/fe_declarator.h: 
+	* TAO_IDL/include/fe_extern.h: 
+	* TAO_IDL/include/fe_interface_header.h: 
+	* TAO_IDL/include/fe_private.h: 
+	* TAO_IDL/include/global_extern.h: 
+	* TAO_IDL/include/idl.h: 
+	* TAO_IDL/include/idl_bool.h: 
+	* TAO_IDL/include/idl_defines.h: 
+	* TAO_IDL/include/idl_extern.h: 
+	* TAO_IDL/include/idl_fwd.h: 
+	* TAO_IDL/include/idl_global.h: 
+	* TAO_IDL/include/idl_narrow.h: 
+	* TAO_IDL/include/intlmacros.h: 
+	* TAO_IDL/include/nr_extern.h: 
+	* TAO_IDL/include/util.h: 
+	* TAO_IDL/include/utl_decllist.h: 
+	* TAO_IDL/include/utl_error.h: 
+	* TAO_IDL/include/utl_exceptlist.h: 
+	* TAO_IDL/include/utl_exprlist.h: 
+	* TAO_IDL/include/utl_identifier.h: 
+	* TAO_IDL/include/utl_idlist.h: 
+	* TAO_IDL/include/utl_indenter.h: 
+	* TAO_IDL/include/utl_labellist.h: 
+	* TAO_IDL/include/utl_list.h: 
+	* TAO_IDL/include/utl_namelist.h: 
+	* TAO_IDL/include/utl_scope.h: 
+	* TAO_IDL/include/utl_scoped_name.h: 
+	* TAO_IDL/include/utl_stack.h: 
+	* TAO_IDL/include/utl_string.h: 
+	* TAO_IDL/include/utl_strlist.h: 
+	* TAO_IDL/include/utl_tmpl/utl_decllist.h: 
+	* TAO_IDL/include/utl_tmpl/utl_exceptlist.h: 
+	* TAO_IDL/include/utl_tmpl/utl_exprlist.h: 
+	* TAO_IDL/include/utl_tmpl/utl_idlist.h: 
+	* TAO_IDL/include/utl_tmpl/utl_labellist.h: 
+	* TAO_IDL/include/utl_tmpl/utl_list.h: 
+	* TAO_IDL/include/utl_tmpl/utl_namelist.h: 
+	* TAO_IDL/include/utl_tmpl/utl_strlist.h: 
+	* TAO_IDL/narrow/narrow.cpp: 
+	* TAO_IDL/util/utl_decllist.cpp: 
+	* TAO_IDL/util/utl_error.cpp: 
+	* TAO_IDL/util/utl_exceptlist.cpp: 
+	* TAO_IDL/util/utl_exprlist.cpp: 
+	* TAO_IDL/util/utl_global.cpp: 
+	* TAO_IDL/util/utl_identifier.cpp: 
+	* TAO_IDL/util/utl_idlist.cpp: 
+	* TAO_IDL/util/utl_indenter.cpp: 
+	* TAO_IDL/util/utl_labellist.cpp: 
+	* TAO_IDL/util/utl_list.cpp: 
+	* TAO_IDL/util/utl_namelist.cpp: 
+	* TAO_IDL/util/utl_scope.cpp: 
+	* TAO_IDL/util/utl_stack.cpp: 
+	* TAO_IDL/util/utl_string.cpp: 
+	* TAO_IDL/util/utl_strlist.cpp: 
+	* TAO_IDL/util/utl_tmpl/utl_decllist.cpp: 
+	* TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp: 
+	* TAO_IDL/util/utl_tmpl/utl_exprlist.cpp: 
+	* TAO_IDL/util/utl_tmpl/utl_idlist.cpp: 
+	* TAO_IDL/util/utl_tmpl/utl_labellist.cpp: 
+	* TAO_IDL/util/utl_tmpl/utl_list.cpp: 
+	* TAO_IDL/util/utl_tmpl/utl_namelist.cpp: 
+	* TAO_IDL/util/utl_tmpl/utl_strlist.cpp: 
+	  Removed a *big* number of warnings, in an attempt to surface
+	  real problems. The main one was "#pragma ident" and some unused
+	  variables.
+
 Sat Oct 25 06:22:03 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
 
 	* TAO_IDL/fe/idl.yy: I got errors parsing the idl.yy thru
diff --git a/TAO/TAO_IDL/ast/ast_argument.cpp b/TAO/TAO_IDL/ast/ast_argument.cpp
index cc9bfcba901..2c38a198fa8 100644
--- a/TAO/TAO_IDL/ast/ast_argument.cpp
+++ b/TAO/TAO_IDL/ast/ast_argument.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_argument.cc	1.46% %92/06/11% Sun Microsystems"
-
 /*
  * ast_argument.cc - Implementation of class AST_Argument.cc
  *
@@ -95,6 +93,7 @@ direction_to_string(AST_Argument::Direction d)
   case AST_Argument::dir_INOUT:
     return "inout";
   }
+  return NULL;
 }
 
 /*
diff --git a/TAO/TAO_IDL/ast/ast_array.cpp b/TAO/TAO_IDL/ast/ast_array.cpp
index 2d2da9f1764..63e5e836748 100644
--- a/TAO/TAO_IDL/ast/ast_array.cpp
+++ b/TAO/TAO_IDL/ast/ast_array.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_array.cc	1.46% %92/06/11% Sun Microsystems"
-
 /*
  * ast_array.cc - Implementation of class AST_Array
  *
diff --git a/TAO/TAO_IDL/ast/ast_attribute.cpp b/TAO/TAO_IDL/ast/ast_attribute.cpp
index d9a3bb0b49e..185f29fee6b 100644
--- a/TAO/TAO_IDL/ast/ast_attribute.cpp
+++ b/TAO/TAO_IDL/ast/ast_attribute.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_attribute.cc	1.46% %92/06/11% Sun Microsystems"
-
 /*
  * ast_attribute.cc - Implementation of class AST_Attribute.cc
  *
diff --git a/TAO/TAO_IDL/ast/ast_check.cpp b/TAO/TAO_IDL/ast/ast_check.cpp
index a4fdc4fdeb6..a8e3677cceb 100644
--- a/TAO/TAO_IDL/ast/ast_check.cpp
+++ b/TAO/TAO_IDL/ast/ast_check.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_check.cc	1.46% %92/06/11% Sun Microsystems"
-
 /*
  * ast_check.cc - Check AST nodes representing fwd declared interfaces
  *		  after parse of AST is completed.
diff --git a/TAO/TAO_IDL/ast/ast_concrete_type.cpp b/TAO/TAO_IDL/ast/ast_concrete_type.cpp
index 3ff924dfa4f..44f010e19df 100644
--- a/TAO/TAO_IDL/ast/ast_concrete_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_concrete_type.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_concrete_type.cc	1.46% %92/06/11% Sun Microsystems"
-
 /*
  * ast_concrete_type.cc - Implementation of class AST_ConcreteType
  *
diff --git a/TAO/TAO_IDL/ast/ast_constant.cpp b/TAO/TAO_IDL/ast/ast_constant.cpp
index d3262632273..8dcbb412367 100644
--- a/TAO/TAO_IDL/ast/ast_constant.cpp
+++ b/TAO/TAO_IDL/ast/ast_constant.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_constant.cc	1.46% %92/06/11% Sun Microsystems"
-
 /*
  * ast_constant.cc - Implementation of class AST_Constant
  *
@@ -116,6 +114,7 @@ exprtype_to_string(AST_Expression::ExprType et)
   case AST_Expression::EV_none:
     return "none";
   }
+  return NULL;
 }
 
 /*
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp
index 29a541a9423..b7d376a3576 100644
--- a/TAO/TAO_IDL/ast/ast_decl.cpp
+++ b/TAO/TAO_IDL/ast/ast_decl.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_decl.cc	1.46% %92/06/11% Sun Microsystems"
-
 /*
  * ast_decl.cc - Implementation of class AST_Decl
  *
diff --git a/TAO/TAO_IDL/ast/ast_enum.cpp b/TAO/TAO_IDL/ast/ast_enum.cpp
index 2728a474e41..e77fdece3cd 100644
--- a/TAO/TAO_IDL/ast/ast_enum.cpp
+++ b/TAO/TAO_IDL/ast/ast_enum.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_enum.cc	1.46% %92/06/11% Sun Microsystems"
-
 /*
  * ast_enum.cc - Implementation of class AST_Enum
  *
diff --git a/TAO/TAO_IDL/ast/ast_enum_val.cpp b/TAO/TAO_IDL/ast/ast_enum_val.cpp
index a60ad8a3f9c..e8b263d1b2b 100644
--- a/TAO/TAO_IDL/ast/ast_enum_val.cpp
+++ b/TAO/TAO_IDL/ast/ast_enum_val.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_enum_val.cc	1.46% %92/06/11% Sun Microsystems"
-
 /*
  * ast_enum_val.cc - Implementation of class AST_EnumVal
  *
diff --git a/TAO/TAO_IDL/ast/ast_exception.cpp b/TAO/TAO_IDL/ast/ast_exception.cpp
index 9811364e596..a465674521d 100644
--- a/TAO/TAO_IDL/ast/ast_exception.cpp
+++ b/TAO/TAO_IDL/ast/ast_exception.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_exception.cc	1.46% %92/06/11% Sun Microsystems"
-
 /*
  * ast_exception.cc - Implementation of class AST_Exception
  *
diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp
index 13698d8e1e0..7f86f014833 100644
--- a/TAO/TAO_IDL/ast/ast_expression.cpp
+++ b/TAO/TAO_IDL/ast/ast_expression.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_expression.cc	1.47% %92/06/11% Sun Microsystems"
-
 /*
  * ast_expression.cc - Implementation of class AST_Expression
  *
@@ -846,6 +844,7 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
   case AST_Expression::EV_wstring:
     return NULL;
   }
+  return NULL;
 }
 
 /*
@@ -1197,6 +1196,7 @@ AST_Expression::eval_internal(AST_Expression::EvalKind ek)
   case EC_none:
     return NULL;
   }
+  return NULL;
 }
 
 /*
@@ -1285,6 +1285,7 @@ AST_Expression::operator==(AST_Expression *vc)
   case EV_none:
     return I_FALSE;
   }
+  return NULL;
 }
 
 long
@@ -1337,6 +1338,7 @@ AST_Expression::compare(AST_Expression *vc)
   case EV_none:
     return I_FALSE;
   }
+  return NULL;
 }
 
 /*
diff --git a/TAO/TAO_IDL/ast/ast_field.cpp b/TAO/TAO_IDL/ast/ast_field.cpp
index f58e154114d..44912c1d03b 100644
--- a/TAO/TAO_IDL/ast/ast_field.cpp
+++ b/TAO/TAO_IDL/ast/ast_field.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_field.cc	1.46% %92/06/11% Sun Microsystems"
-
 /*
  * ast_field.cc - Implementation of class AST_Field
  *
diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp
index 518f5d887d8..56b8bc152fc 100644
--- a/TAO/TAO_IDL/ast/ast_generator.cpp
+++ b/TAO/TAO_IDL/ast/ast_generator.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_generator.cc	1.46% %92/06/11% Sun Microsystems"
-
 /*
  * ast_generator.cc - Implements the base AST node generator
  *
diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp
index 052dbe01abd..569173d7069 100644
--- a/TAO/TAO_IDL/ast/ast_interface.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_interface.cc	1.46% %92/06/11% Sun Microsystems"
-
 /*
  * ast_interface.cc - Implementation of class AST_Interface
  *
diff --git a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
index effd7526f01..1382fb91468 100644
--- a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_interface_fwd.cc	1.44% %92/06/11% Sun Microsystems"
-
 /*
  * ast_interface_fwd.cc - Implementation of class AST_InterfaceFwd
  *
diff --git a/TAO/TAO_IDL/ast/ast_module.cpp b/TAO/TAO_IDL/ast/ast_module.cpp
index 9d2dfdb89b7..582fa267668 100644
--- a/TAO/TAO_IDL/ast/ast_module.cpp
+++ b/TAO/TAO_IDL/ast/ast_module.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_module.cc	1.46% %92/06/11% Sun Microsystems"
-
 /*
  * ast_module.cc - Implementation of class AST_Module
  *
diff --git a/TAO/TAO_IDL/ast/ast_operation.cpp b/TAO/TAO_IDL/ast/ast_operation.cpp
index b2d0278a725..288c268d49e 100644
--- a/TAO/TAO_IDL/ast/ast_operation.cpp
+++ b/TAO/TAO_IDL/ast/ast_operation.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_operation.cc	1.46% %92/06/11% Sun Microsystems"
-
 /*
  * ast_operation.cc - Implementation of class AST_Operation
  *
diff --git a/TAO/TAO_IDL/ast/ast_predefined_type.cpp b/TAO/TAO_IDL/ast/ast_predefined_type.cpp
index 85d4d8da0c0..44804058f3f 100644
--- a/TAO/TAO_IDL/ast/ast_predefined_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_predefined_type.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_predefined_type.cc	1.47% %92/06/11% Sun Microsystems"
-
 /*
  * ast_predefined_type.cc - Implementation of class AST_PredefinedType
  *
diff --git a/TAO/TAO_IDL/ast/ast_recursive.cpp b/TAO/TAO_IDL/ast/ast_recursive.cpp
index 709e8f68588..6a904999b63 100644
--- a/TAO/TAO_IDL/ast/ast_recursive.cpp
+++ b/TAO/TAO_IDL/ast/ast_recursive.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)fe_recursive.cc	1.30% %92/06/10% Sun Microsystems"
-
 /*
  * ast_recursive.cc - Check whether a type is used recursively in a situation
  *		      where this use would be illegal.
diff --git a/TAO/TAO_IDL/ast/ast_redef.cpp b/TAO/TAO_IDL/ast/ast_redef.cpp
index 08724ba4bc6..6567e90ebbf 100644
--- a/TAO/TAO_IDL/ast/ast_redef.cpp
+++ b/TAO/TAO_IDL/ast/ast_redef.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_redef.cc	1.46% %92/06/10% Sun Microsystems"
-
 /*
  * ast_redef.cc - Implement utility function to decide when redefinition
  * 		  is allowed
diff --git a/TAO/TAO_IDL/ast/ast_root.cpp b/TAO/TAO_IDL/ast/ast_root.cpp
index 56e5425dbc4..2af71a474b5 100644
--- a/TAO/TAO_IDL/ast/ast_root.cpp
+++ b/TAO/TAO_IDL/ast/ast_root.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_root.cc	1.46% %92/06/11% Sun Microsystems"
-
 /*
  * ast_root.cc - Implementation of class AST_Root
  *
diff --git a/TAO/TAO_IDL/ast/ast_sequence.cpp b/TAO/TAO_IDL/ast/ast_sequence.cpp
index 31dd96d4f1a..fb170005dfd 100644
--- a/TAO/TAO_IDL/ast/ast_sequence.cpp
+++ b/TAO/TAO_IDL/ast/ast_sequence.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_sequence.cc	1.46% %92/06/11% Sun Microsystems"
-
 /*
  * ast_sequence.cc - Implementation of class AST_Sequence
  *
diff --git a/TAO/TAO_IDL/ast/ast_string.cpp b/TAO/TAO_IDL/ast/ast_string.cpp
index aecff649398..092955866a3 100644
--- a/TAO/TAO_IDL/ast/ast_string.cpp
+++ b/TAO/TAO_IDL/ast/ast_string.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_string.cc	1.46% %92/06/11% Sun Microsystems"
-
 /*
  * ast_string.cc - Implementation of class AST_String
  *
diff --git a/TAO/TAO_IDL/ast/ast_structure.cpp b/TAO/TAO_IDL/ast/ast_structure.cpp
index bfc224b3172..e821569c05d 100644
--- a/TAO/TAO_IDL/ast/ast_structure.cpp
+++ b/TAO/TAO_IDL/ast/ast_structure.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_structure.cc	1.46% %92/06/11% Sun Microsystems"
-
 /*
  * ast_structure.cc - Implementation of class AST_Structure
  *
diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp
index e7cede27803..fb9b83ae219 100644
--- a/TAO/TAO_IDL/ast/ast_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_type.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_type.cc	1.46% %92/06/11% Sun Microsystems"
-
 /*
  * ast_type.cc - Implementation of class AST_Type
  *
diff --git a/TAO/TAO_IDL/ast/ast_union.cpp b/TAO/TAO_IDL/ast/ast_union.cpp
index 62c1de3ca51..0eeea9dc71f 100644
--- a/TAO/TAO_IDL/ast/ast_union.cpp
+++ b/TAO/TAO_IDL/ast/ast_union.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_union.cc	1.46% %92/06/11% Sun Microsystems"
-
 /*
  * ast_union.cc - Implementation of class AST_Union
  *
diff --git a/TAO/TAO_IDL/ast/ast_union_branch.cpp b/TAO/TAO_IDL/ast/ast_union_branch.cpp
index 303ba5ff4a9..55220d7c29f 100644
--- a/TAO/TAO_IDL/ast/ast_union_branch.cpp
+++ b/TAO/TAO_IDL/ast/ast_union_branch.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_union_branch.cc	1.46% %92/06/11% Sun Microsystems"
-
 /*
  * ast_union_branch.cc - Implementation of class AST_UnionBranch
  *
diff --git a/TAO/TAO_IDL/ast/ast_union_label.cpp b/TAO/TAO_IDL/ast/ast_union_label.cpp
index 24743af1e10..18b080d323c 100644
--- a/TAO/TAO_IDL/ast/ast_union_label.cpp
+++ b/TAO/TAO_IDL/ast/ast_union_label.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)ast_union_label.cc	1.30% %92/06/11% Sun Microsystems"
-
 /*
  * ast_union_label.cc - Implementation of class AST_UnionLabel
  *
diff --git a/TAO/TAO_IDL/be/be_args.cpp b/TAO/TAO_IDL/be/be_args.cpp
index 956fff9867b..f4ee9159feb 100644
--- a/TAO/TAO_IDL/be/be_args.cpp
+++ b/TAO/TAO_IDL/be/be_args.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)be_args.cc	1.14% %92/06/10% Sun Microsystems"
-
 // be_args.cc - Collect command line arguments for the BE
 
 #include	"idl.h"
diff --git a/TAO/TAO_IDL/be/be_constant.cpp b/TAO/TAO_IDL/be/be_constant.cpp
index 9b017f836d6..8a31f0ef2ee 100644
--- a/TAO/TAO_IDL/be/be_constant.cpp
+++ b/TAO/TAO_IDL/be/be_constant.cpp
@@ -175,6 +175,7 @@ be_constant::exprtype_to_string (void)
     case AST_Expression::EV_none:
       return "none";
     }
+  return NULL;
 }
 
 // Narrowing
diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp
index 7bbab4c7e9a..801d0e9d612 100644
--- a/TAO/TAO_IDL/be/be_decl.cpp
+++ b/TAO/TAO_IDL/be/be_decl.cpp
@@ -157,7 +157,7 @@ be_decl::compute_fullname (void)
 
       this->fullname_ = new char [namelen+1];
       first = I_TRUE;
-      second - I_FALSE;
+      second = I_FALSE;
       i = new UTL_IdListActiveIterator (this->name ());
       while (!(i->is_done ())) 
         {
@@ -177,7 +177,7 @@ be_decl::compute_fullname (void)
             }
           i->next ();
         }
-      delete i;
+	  delete i;
     }
   return;
 }
@@ -333,7 +333,7 @@ be_decl::tc_name2long (const char *name, long *&larr, long &arrlen)
 {
   static char buf [MAXNAMELEN];
   long slen;
-  int i,j;
+  int i;
 
   slen = ACE_OS::strlen (name) + 1; // 1 for NULL terminating
 
@@ -366,7 +366,6 @@ int
 be_decl::gen_var_defn (void)
 {
   TAO_OutStream *ch; // output stream
-  long i;            // loop index
   TAO_NL  nl;        // end line
   char namebuf [MAXNAMELEN];  // names
 
@@ -559,7 +558,6 @@ int
 be_decl::gen_var_impl (void)
 {
   TAO_OutStream *ci; // output stream
-  long i;            // loop index
   TAO_NL  nl;        // end line
   char fname [MAXNAMELEN];  // to hold the full and
   char lname [MAXNAMELEN];  // local _var names
@@ -1260,7 +1258,6 @@ int
 be_decl::gen_out_defn (void)
 {
   TAO_OutStream *ch; // output stream
-  long i;            // loop index
   TAO_NL  nl;        // end line
   char namebuf [MAXNAMELEN];  // to hold the _out name
 
@@ -1378,7 +1375,6 @@ int
 be_decl::gen_out_impl (void)
 {
   TAO_OutStream *ci; // output stream
-  long i;            // loop index
   TAO_NL  nl;        // end line
   char fname [MAXNAMELEN];  // to hold the full and
   char lname [MAXNAMELEN];  // local _out names
diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp
index 9f09ac7f827..b93c92ea88a 100644
--- a/TAO/TAO_IDL/be/be_generator.cpp
+++ b/TAO/TAO_IDL/be/be_generator.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)be_generator.cc	1.19% %92/06/10% Sun Microsystems"
-
 // be_generator.cc
 //
 // Implementation of BE generator class
diff --git a/TAO/TAO_IDL/be/be_init.cpp b/TAO/TAO_IDL/be/be_init.cpp
index 7e92eeb8db5..47a72c9936d 100644
--- a/TAO/TAO_IDL/be/be_init.cpp
+++ b/TAO/TAO_IDL/be/be_init.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)BE_init.cc	1.16% %92/06/10% Sun Microsystems"
-
 // BE_init.cc - Initialization for dummy BE
 
 #include	"idl.h"
diff --git a/TAO/TAO_IDL/be/be_produce.cpp b/TAO/TAO_IDL/be/be_produce.cpp
index 83153771dca..15691d84164 100644
--- a/TAO/TAO_IDL/be/be_produce.cpp
+++ b/TAO/TAO_IDL/be/be_produce.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)BE_produce.cc	1.16% %92/06/10% Sun Microsystems"
-
 // BE_produce.cc - Produce the work of the BE - does nothing in the
 //		   dummy BE
 
diff --git a/TAO/TAO_IDL/be_include/be.h b/TAO/TAO_IDL/be_include/be.h
index e819a658648..e6499adc08f 100644
--- a/TAO/TAO_IDL/be_include/be.h
+++ b/TAO/TAO_IDL/be_include/be.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _BE_BE_HH
 #define _BE_BE_HH
 
-#pragma ident "%@(#)be.h	1.19% %92/06/10% Sun Microsystems"
-
 // be.h
 //
 
diff --git a/TAO/TAO_IDL/be_include/be_generator.h b/TAO/TAO_IDL/be_include/be_generator.h
index c22aa9947a3..2b8c91cabfa 100644
--- a/TAO/TAO_IDL/be_include/be_generator.h
+++ b/TAO/TAO_IDL/be_include/be_generator.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _BE_GENERATOR_BE_GENERATOR_HH
 #define _BE_GENERATOR_BE_GENERATOR_HH
 
-#pragma ident "%@(#)be_generator.h	1.20% %92/06/10% Sun Microsystems"
-
 // be_generator.hh
 //
 // Defines BE class for generator
diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp
index 959cadecb98..bd26d593f4b 100644
--- a/TAO/TAO_IDL/driver/drv_args.cpp
+++ b/TAO/TAO_IDL/driver/drv_args.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)drv_args.cc	1.16% %92/06/10% Sun Microsystems"
-
 // drv_args.c - Argument parsing for IDL compiler main driver
 
 #include	"idl.h"
diff --git a/TAO/TAO_IDL/driver/drv_fork.cpp b/TAO/TAO_IDL/driver/drv_fork.cpp
index 1fa85f456cc..a455e212f60 100644
--- a/TAO/TAO_IDL/driver/drv_fork.cpp
+++ b/TAO/TAO_IDL/driver/drv_fork.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)drv_fork.cc	1.7% %92/06/10% Sun Microsystems"
-
 /*
  * DRV_fork.cc - Fork a process for each file to be processed, wait for
  *		 status from the child process
@@ -74,6 +72,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 #include	"drv_private.h"
 
+#include "ace/Process_Manager.h"
+
 #ifdef		SOLARIS2
 
 #include	<unistd.h>		// POSIX standard types
@@ -97,6 +97,46 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 void
 DRV_fork()
 {
+#if !defined (CORYAN_USE_FORK)
+  // This will not work on NT, but I can hardly think of some way to
+  // make it work.
+  // The idea is to make it compile, and always use the compiler with
+  // just one file, that works because then there is no fork
+  // involved.
+  for (DRV_file_index = 0;
+       DRV_file_index < DRV_nfiles;
+       ++DRV_file_index)
+    {
+      ACE_Process_Options options;
+      options.creation_flags (ACE_Process_Options::NO_EXEC);
+
+      ACE_Process_Manager manager;
+      pid_t child_pid = manager.spawn (options);
+      if (child_pid == 0)
+	{
+	  /*
+	   * OK, do it to this file (in the child)
+	   */
+	  DRV_drive(DRV_files[DRV_file_index]);
+	  ACE_OS::exit(0);
+	}
+
+      if (child_pid == -1)
+	{
+	  cerr << GTDEVEL("IDL: spawn failed\n");
+	  ACE_OS::exit (99);
+	  /*NOTREACHED*/
+	}
+
+      // child_pid is the process id of something at this point.
+      if (manager.wait () == -1)
+	{
+	  cerr << GTDEVEL("IDL: wait failed\n");
+	  ACE_OS::exit (99);
+	  /*NOTREACHED*/
+	}
+    }
+#else /* CORYAN_USE_FORK */
   pid_t child_pid;
   pid_t wait_pid;
 #if defined(apollo) || defined(SUNOS4)
@@ -133,6 +173,7 @@ DRV_fork()
       exit(0);
     }
   }
+#endif /* !CORYAN_USE_FORK */
   /*
    * Now the parent process can exit
    */
diff --git a/TAO/TAO_IDL/driver/drv_init.cpp b/TAO/TAO_IDL/driver/drv_init.cpp
index 700c7db2a43..df3504b08d8 100644
--- a/TAO/TAO_IDL/driver/drv_init.cpp
+++ b/TAO/TAO_IDL/driver/drv_init.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)DRV_init.cc	1.16% %92/06/10% Sun Microsystems"
-
 // DRV_init.cc - Initialization for IDL compiler driver program
 
 #include	"idl.h"
diff --git a/TAO/TAO_IDL/driver/drv_main.cpp b/TAO/TAO_IDL/driver/drv_main.cpp
index 0fa64e97186..9cd81643878 100644
--- a/TAO/TAO_IDL/driver/drv_main.cpp
+++ b/TAO/TAO_IDL/driver/drv_main.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)drv_main.cc	1.16% %92/06/10% Sun Microsystems"
-
 /*
 ** drv_main.cc - Main program for IDL compiler driver
 **
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index 5eb8625a114..ea3833543b7 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)drv_preproc.cc	1.16% %92/06/10% Sun Microsystems"
-
 /*
  * DRV_pre_proc.cc - pass an IDL file through the C preprocessor
  */
@@ -74,6 +72,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include	"drv_private.h"
 #include	"drv_link.h"
 
+#include "ace/Process_Manager.h"
+
 #include	<stdio.h>
 #include	<fcntl.h>
 
@@ -130,6 +130,7 @@ DRV_cpp_putarg(char *str)
 void
 DRV_cpp_init()
 {
+  // DRV_cpp_putarg("\\cygnus\\H-i386-cygwin32\\bin\\echo");
   DRV_cpp_putarg(idl_global->cpp_location());
   DRV_cpp_putarg("-E");
   DRV_cpp_putarg("-DIDL");
@@ -218,17 +219,28 @@ static char	tmp_ifile[128];
 void
 DRV_pre_proc(char *myfile)
 {
-#if defined(apollo) || defined(SUNOS4)
-  union wait wait_status;
-#else
-  int	wait_status;
-#endif	// defined(apollo) || defined(SUNOS4)
   long	readfromstdin = I_FALSE;
-  pid_t	child_pid;
   char	catbuf[512];
-  
-  strcpy(tmp_file, "/tmp/idlf_XXXXXX");
-  strcpy(tmp_ifile, "/tmp/idli_XXXXXX");
+
+  const char* tmpdir = getenv("TMP");
+  if (tmpdir != 0)
+    {
+      strcat(tmp_file, tmpdir);
+      strcat(tmp_ifile, tmpdir);
+    }
+  else
+    {
+      strcpy(tmp_file, ACE_DIRECTORY_SEPARATOR_STR_A);
+      strcpy(tmp_file, "tmp");
+      strcpy(tmp_ifile, ACE_DIRECTORY_SEPARATOR_STR_A);
+      strcpy(tmp_ifile, "tmp");
+    }
+
+  strcat(tmp_file, ACE_DIRECTORY_SEPARATOR_STR_A);
+  strcat(tmp_file, "idlf_XXXXXX");
+
+  strcpy(tmp_ifile, ACE_DIRECTORY_SEPARATOR_STR_A);
+  strcat(tmp_ifile, "idli_XXXXXX");
 
   (void) mktemp(tmp_file); strcat(tmp_file, ".cc");
   (void) mktemp(tmp_ifile); strcat(tmp_ifile, ".cc");
@@ -255,6 +267,66 @@ DRV_pre_proc(char *myfile)
         );
     idl_global->set_real_filename((*DRV_FE_new_UTL_String)(tmp_ifile));
   }
+#if !defined (CORYAN_USE_FORK)
+  // We use ACE instead of the (low level) fork facilities, this also
+  // work on NT.
+  ACE_Process manager;
+  ACE_Process_Options cpp_options;
+  DRV_cpp_putarg (tmp_ifile);
+  DRV_cpp_putarg (0); // Null terminate the arglist.
+  cpp_options.command_line (arglist);
+  ACE_HANDLE fd = ACE_OS::open(tmp_file, O_WRONLY | O_CREAT | O_TRUNC, 0777);
+  if (fd < 0) {
+    cerr << idl_global->prog_name()
+	 << GTDEVEL(": cannot open temp file ")
+	 << tmp_file << " for writing\n";
+    return;
+  }
+  cpp_options.set_handles (ACE_INVALID_HANDLE, fd);
+  cerr << "invoking preprocessor" << endl;
+  if (manager.spawn (cpp_options) == -1)
+    {
+      cerr << idl_global->prog_name() 
+	   << GTDEVEL(": spawn of ")
+	   << arglist[0]
+	   << GTDEVEL(" failed\n");
+      return;
+    }
+  cerr << "preprocessor running" << endl;
+
+  // Close the output file on the parent process.
+  if (ACE_OS::close (fd) == -1)
+    {
+      cerr << idl_global->prog_name ()
+	   << GTDEVEL(": cannot close temp file")
+	   << tmp_file << " on parent\n";
+      return;
+    }
+
+  // Remove the null termination and the input file from the arglist,
+  // the next file will the previous args.
+  argcount -= 2;
+
+  cerr << "waiting" << endl;
+  if (manager.wait () == -1)
+    {
+      cerr << idl_global->prog_name ()
+	   << GTDEVEL(": wait for child process failed\n");
+      return;
+    }
+  cerr << "joined preprocessor" << endl;
+  // TODO: Manage problems in the pre-processor, in the previous
+  // version the current process would exit if the pre-processor
+  // returned with error.
+
+#else
+#if defined(apollo) || defined(SUNOS4)
+  union wait wait_status;
+#else
+  int	wait_status;
+#endif	// defined(apollo) || defined(SUNOS4)
+  pid_t	child_pid;
+
   switch (child_pid = fork()) {
   case 0:	/* Child - call cpp */
     DRV_cpp_putarg(tmp_ifile);
@@ -333,6 +405,8 @@ DRV_pre_proc(char *myfile)
     }
 #endif  // defined(WIFEXITED) && defined(WEXITSTATUS)
   }
+#endif /* CORYAN_USE_FORK */
+
   FILE * yyin = fopen(tmp_file, "r");
   if (yyin == NULL) {
     cerr << idl_global->prog_name()
@@ -342,6 +416,7 @@ DRV_pre_proc(char *myfile)
     exit(99);
   }
   (*DRV_FE_set_yyin)((File *) yyin);
+  // TODO: This is not protable, cat(1) is a UNIX tool.
   if (idl_global->compile_flags() & IDL_CF_ONLY_PREPROC) {
     sprintf(catbuf, "cat < %s", tmp_file);
     system(catbuf);
@@ -353,6 +428,7 @@ DRV_pre_proc(char *myfile)
 	 << "\n";
     exit(99);
   }
+#if 0
   if (unlink(tmp_file) != 0) {
     cerr << idl_global->prog_name()
 	 << GTDEVEL(": Could not remove cpp output file ")
@@ -360,6 +436,7 @@ DRV_pre_proc(char *myfile)
 	 << "\n";
     exit(99);
   }
+#endif /* 0 */
   if (idl_global->compile_flags() & IDL_CF_ONLY_PREPROC)
     exit(0);
 }
diff --git a/TAO/TAO_IDL/driver/drv_private.cpp b/TAO/TAO_IDL/driver/drv_private.cpp
index 50d6b61e436..6160112e818 100644
--- a/TAO/TAO_IDL/driver/drv_private.cpp
+++ b/TAO/TAO_IDL/driver/drv_private.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)drv_private.cc	1.50% %92/09/30% Sun Microsystems"
-
 // drv_global.cc - Global variables for IDL compiler driver program
 
 #include	"idl.h"
diff --git a/TAO/TAO_IDL/fe/fe_declarator.cpp b/TAO/TAO_IDL/fe/fe_declarator.cpp
index 9a0de3c7553..1c802e338e9 100644
--- a/TAO/TAO_IDL/fe/fe_declarator.cpp
+++ b/TAO/TAO_IDL/fe/fe_declarator.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)fe_declarator.cc	1.30% %92/06/10% Sun Microsystems"
-
 /*
  * fe_declarator.cc - Implementation of FE private declaration
  *		      statement class
diff --git a/TAO/TAO_IDL/fe/fe_extern.cpp b/TAO/TAO_IDL/fe/fe_extern.cpp
index 4dd395684bc..03e52fbdc5f 100644
--- a/TAO/TAO_IDL/fe/fe_extern.cpp
+++ b/TAO/TAO_IDL/fe/fe_extern.cpp
@@ -80,7 +80,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  */
 
 extern int yyparse();
-extern File * yyin;
+extern FILE * yyin;
 
 int
 FE_yyparse()
@@ -95,7 +95,7 @@ FE_yyparse()
 void
 FE_set_yyin(File * f)
 {
-  yyin = f;
+  yyin = (FILE*)f;
 }
 
 /*
diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp
index b6ba87da25d..16f6b4372d8 100644
--- a/TAO/TAO_IDL/fe/fe_init.cpp
+++ b/TAO/TAO_IDL/fe/fe_init.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)fe_init.cc	1.21% %92/06/10% Sun Microsystems"
-
 /*
  * fe_init.cc - Initialize the FE
  *
diff --git a/TAO/TAO_IDL/fe/fe_interface_header.cpp b/TAO/TAO_IDL/fe/fe_interface_header.cpp
index c4dd47b867c..b493bde1969 100644
--- a/TAO/TAO_IDL/fe/fe_interface_header.cpp
+++ b/TAO/TAO_IDL/fe/fe_interface_header.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)fe_interface_header.cc	1.30% %92/06/10% Sun Microsystems"
-
 /*
  * fe_interface_header.cc - Implements the FE private class FE_InterfaceHeader
  *
diff --git a/TAO/TAO_IDL/fe/fe_private.cpp b/TAO/TAO_IDL/fe/fe_private.cpp
index 9644a94ae2a..30fe3c3cfc0 100644
--- a/TAO/TAO_IDL/fe/fe_private.cpp
+++ b/TAO/TAO_IDL/fe/fe_private.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)fe_global.cc	1.22% %92/06/10% Sun Microsystems"
-
 /*
  * fe_private.cc - Declare global data which are private to the FE
  *		   part
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp
index 03e51de41e5..5b91a08a9ce 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/TAO/TAO_IDL/fe/y.tab.cpp
@@ -99,7 +99,7 @@ typedef union
 #include <memory.h>
 #endif
 
-#include <values.h>
+// #include <values.h>
 
 #ifdef __cplusplus
 
@@ -831,8 +831,6 @@ char * yyreds[] =
  * Copyright (c) 1993 by Sun Microsystems, Inc.
  */
 
-#pragma ident	"@(#)yaccpar	6.12	93/06/07 SMI"
-
 /*
 ** Skeleton parser driver for yacc output
 */
diff --git a/TAO/TAO_IDL/include/ast.h b/TAO/TAO_IDL/include/ast.h
index a4c7280e6e9..e3672b2625f 100644
--- a/TAO/TAO_IDL/include/ast.h
+++ b/TAO/TAO_IDL/include/ast.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_AST_HH
 #define _AST_AST_HH
 
-#pragma ident "%@(#)ast.h	1.41% %92/06/10% Sun Microsystems"
-
 // ast.h
 //
 // Defines the classes which constitute the agreement between the CFE
diff --git a/TAO/TAO_IDL/include/ast_argument.h b/TAO/TAO_IDL/include/ast_argument.h
index 46311a2606c..f8a7079f33f 100644
--- a/TAO/TAO_IDL/include/ast_argument.h
+++ b/TAO/TAO_IDL/include/ast_argument.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_ARGUMENT_AST_ARGUMENT_HH
 #define _AST_ARGUMENT_AST_ARGUMENT_HH
 
-#pragma ident "%@(#)AST_Argument.h	1.37% %92/06/10% Sun Microsystems"
-
 // Representation of argument to operation:
 //
 // An argument is a field with a direction attached
diff --git a/TAO/TAO_IDL/include/ast_array.h b/TAO/TAO_IDL/include/ast_array.h
index 6dd890e7209..90992887dae 100644
--- a/TAO/TAO_IDL/include/ast_array.h
+++ b/TAO/TAO_IDL/include/ast_array.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_ARRAY_AST_ARRAY_HH
 #define _AST_ARRAY_AST_ARRAY_HH
 
-#pragma ident "%@(#)AST_Array.h	1.37% %92/06/10% Sun Microsystems"
-
 // Representation of array declaration:
 //
 // An array is a combination of a list of dimensions and a base type
diff --git a/TAO/TAO_IDL/include/ast_attribute.h b/TAO/TAO_IDL/include/ast_attribute.h
index b3037eacf7b..de906024b3c 100644
--- a/TAO/TAO_IDL/include/ast_attribute.h
+++ b/TAO/TAO_IDL/include/ast_attribute.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_ATTRIBUTE_AST_ATTRIBUTE_HH
 #define _AST_ATTRIBUTE_AST_ATTRIBUTE_HH
 
-#pragma ident "%@(#)AST_Attribute.h	1.37% %92/06/10% Sun Microsystems"
-
 // Representation of attribute declaration:
 //
 // An attribute is a field with a readonly property
diff --git a/TAO/TAO_IDL/include/ast_concrete_type.h b/TAO/TAO_IDL/include/ast_concrete_type.h
index 65514646d0f..6c527afaca7 100644
--- a/TAO/TAO_IDL/include/ast_concrete_type.h
+++ b/TAO/TAO_IDL/include/ast_concrete_type.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_CONCRETE_TYPE_AST_CONCRETE_TYPE_HH
 #define _AST_CONCRETE_TYPE_AST_CONCRETE_TYPE_HH
 
-#pragma ident "%@(#)AST_ConcreteType.h	1.37% %92/06/10% Sun Microsystems"
-
 // Class for all concrete types
 //
 // This is useful to group together IDL types other than objects
diff --git a/TAO/TAO_IDL/include/ast_constant.h b/TAO/TAO_IDL/include/ast_constant.h
index b35ed025827..90db723d429 100644
--- a/TAO/TAO_IDL/include/ast_constant.h
+++ b/TAO/TAO_IDL/include/ast_constant.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_CONSTANT_AST_CONSTANT_HH
 #define _AST_CONSTANT_AST_CONSTANT_HH
 
-#pragma ident "%@(#)AST_Constant.h	1.37% %92/06/10% Sun Microsystems"
-
 // Representation of constant declaration:
 //
 // NOTE: Part of the job of the constructor is to convert
diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h
index 74ca5b88079..04393295d65 100644
--- a/TAO/TAO_IDL/include/ast_decl.h
+++ b/TAO/TAO_IDL/include/ast_decl.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_DECL_AST_DECL_HH
 #define _AST_DECL_AST_DECL_HH
 
-#pragma ident "%@(#)AST_Decl.h	1.38% %92/06/10% Sun Microsystems"
-
 // Rock bottom of AST class hierarchy
 //
 // This class is inherited by all classes which represent named entities
diff --git a/TAO/TAO_IDL/include/ast_enum.h b/TAO/TAO_IDL/include/ast_enum.h
index f948ccc82e2..cf6941386c5 100644
--- a/TAO/TAO_IDL/include/ast_enum.h
+++ b/TAO/TAO_IDL/include/ast_enum.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_ENUM_AST_ENUM_HH
 #define _AST_ENUM_AST_ENUM_HH
 
-#pragma ident "%@(#)AST_Enum.h	1.37% %92/06/10% Sun Microsystems"
-
 // Representation of enum:
 
 /*
diff --git a/TAO/TAO_IDL/include/ast_enum_val.h b/TAO/TAO_IDL/include/ast_enum_val.h
index 415856e98d8..902b5ad04c4 100644
--- a/TAO/TAO_IDL/include/ast_enum_val.h
+++ b/TAO/TAO_IDL/include/ast_enum_val.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_ENUM_VAL_AST_ENUM_VAL_HH
 #define _AST_ENUM_VAL_AST_ENUM_VAL_HH
 
-#pragma ident "%@(#)AST_EnumVal.h	1.37% %92/06/10% Sun Microsystems"
-
 // Representation of enumerator in enum:
 //
 // An enumerator is a constant of type unsigned long
diff --git a/TAO/TAO_IDL/include/ast_exception.h b/TAO/TAO_IDL/include/ast_exception.h
index 61b24b6f1d4..a1bf98fd8e9 100644
--- a/TAO/TAO_IDL/include/ast_exception.h
+++ b/TAO/TAO_IDL/include/ast_exception.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_EXCEPTION_AST_EXCEPTION_HH
 #define _AST_EXCEPTION_AST_EXCEPTION_HH
 
-#pragma ident "%@(#)AST_Exception.h	1.37% %92/06/10% Sun Microsystems"
-
 // Representation of exception
 //
 // NOTE: An exception is not a type according to the CORBAS 1.1
diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h
index 10c9ce2705a..6d284bd1a77 100644
--- a/TAO/TAO_IDL/include/ast_expression.h
+++ b/TAO/TAO_IDL/include/ast_expression.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_EXPRESSION_AST_EXPRESSION_HH
 #define _AST_EXPRESSION_AST_EXPRESSION_HH
 
-#pragma ident "%@(#)AST_Expression.h	1.39% %92/06/10% Sun Microsystems"
-
 // Representation of expression values
 
 /*
diff --git a/TAO/TAO_IDL/include/ast_extern.h b/TAO/TAO_IDL/include/ast_extern.h
index ff0c00208d8..74ea518bef5 100644
--- a/TAO/TAO_IDL/include/ast_extern.h
+++ b/TAO/TAO_IDL/include/ast_extern.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_EXTERN_AST_EXTERN_HH
 #define _AST_EXTERN_AST_EXTERN_HH
 
-#pragma ident "%@(#)ast_extern.h	1.40% %92/06/10% Sun Microsystems"
-
 // ast_extern.hh
 //
 // Declares all global functions for the AST
diff --git a/TAO/TAO_IDL/include/ast_field.h b/TAO/TAO_IDL/include/ast_field.h
index 97f96a99299..39e80f5c6ec 100644
--- a/TAO/TAO_IDL/include/ast_field.h
+++ b/TAO/TAO_IDL/include/ast_field.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_FIELD_AST_FIELD_HH
 #define _AST_FIELD_AST_FIELD_HH
 
-#pragma ident "%@(#)AST_Field.h	1.37% %92/06/10% Sun Microsystems"
-
 // Representation of a generic field
 //
 // Used as member in structures, exceptions and unions, and as a base
diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h
index 88395133a3d..c9154fc366d 100644
--- a/TAO/TAO_IDL/include/ast_generator.h
+++ b/TAO/TAO_IDL/include/ast_generator.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_GENERATOR_AST_GENERATOR_HH
 #define _AST_GENERATOR_AST_GENERATOR_HH
 
-#pragma ident "%@(#)AST_Generator.h	1.22% %92/06/10% Sun Microsystems"
-
 // ast_generator.h
 //
 // Defines base class for generators
diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h
index 6fef5aace6f..fe8c96e8b3b 100644
--- a/TAO/TAO_IDL/include/ast_interface.h
+++ b/TAO/TAO_IDL/include/ast_interface.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_INTERFACE_AST_INTERFACE_HH
 #define _AST_INTERFACE_AST_INTERFACE_HH
 
-#pragma ident "%@(#)AST_Interface.h	1.37% %92/06/10% Sun Microsystems"
-
 // Representation of interface:
 //
 // NOTE: add(AST_EnumValue *) is defined here because enums can
diff --git a/TAO/TAO_IDL/include/ast_interface_fwd.h b/TAO/TAO_IDL/include/ast_interface_fwd.h
index 5c89410a8bd..8dddc51d916 100644
--- a/TAO/TAO_IDL/include/ast_interface_fwd.h
+++ b/TAO/TAO_IDL/include/ast_interface_fwd.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_INTERFACE_FWD_AST_INTERFACE_FWD_HH
 #define _AST_INTERFACE_FWD_AST_INTERFACE_FWD_HH
 
-#pragma ident "%@(#)AST_InterfaceFwd.h	1.37% %92/06/10% Sun Microsystems"
-
 // Representation of a forward interface declaration
 
 /*
diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h
index 09829b1cc23..305d47dd4fa 100644
--- a/TAO/TAO_IDL/include/ast_module.h
+++ b/TAO/TAO_IDL/include/ast_module.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_MODULE_AST_MODULE_HH
 #define _AST_MODULE_AST_MODULE_HH
 
-#pragma ident "%@(#)AST_Module.h	1.37% %92/06/10% Sun Microsystems"
-
 // Representation of module
 //
 // NOTE: add(AST_EnumValue *) is defined here because enums can
diff --git a/TAO/TAO_IDL/include/ast_operation.h b/TAO/TAO_IDL/include/ast_operation.h
index cdb198afa75..dc197a7bf17 100644
--- a/TAO/TAO_IDL/include/ast_operation.h
+++ b/TAO/TAO_IDL/include/ast_operation.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_OPERATION_AST_OPERATION_HH
 #define _AST_OPERATION_AST_OPERATION_HH
 
-#pragma ident "%@(#)AST_Operation.h	1.37% %92/06/10% Sun Microsystems"
-
 // Representation of operation declaration:
 
 /*
diff --git a/TAO/TAO_IDL/include/ast_predefined_type.h b/TAO/TAO_IDL/include/ast_predefined_type.h
index 684f3565e4e..671acf58513 100644
--- a/TAO/TAO_IDL/include/ast_predefined_type.h
+++ b/TAO/TAO_IDL/include/ast_predefined_type.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_PREDEFINED_TYPE_AST_PREDEFINED_TYPE_HH
 #define _AST_PREDEFINED_TYPE_AST_PREDEFINED_TYPE_HH
 
-#pragma ident "%@(#)AST_PredefinedType.h	1.37% %92/06/10% Sun Microsystems"
-
 // Representation of predefined types:
 //
 // Instances of this class are inserted into the global context by
diff --git a/TAO/TAO_IDL/include/ast_root.h b/TAO/TAO_IDL/include/ast_root.h
index 808ae39ada8..765043aac97 100644
--- a/TAO/TAO_IDL/include/ast_root.h
+++ b/TAO/TAO_IDL/include/ast_root.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_ROOT_AST_ROOT_HH
 #define _AST_ROOT_AST_ROOT_HH
 
-#pragma ident "%@(#)AST_Root.h	1.1% %92/06/23% Sun Microsystems"
-
 // Representation of root of AST
 
 /*
diff --git a/TAO/TAO_IDL/include/ast_sequence.h b/TAO/TAO_IDL/include/ast_sequence.h
index 68d291d6813..d3864e9f982 100644
--- a/TAO/TAO_IDL/include/ast_sequence.h
+++ b/TAO/TAO_IDL/include/ast_sequence.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_SEQUENCE_AST_SEQUENCE_HH
 #define _AST_SEQUENCE_AST_SEQUENCE_HH
 
-#pragma ident "%@(#)AST_Sequence.h	1.37% %92/06/10% Sun Microsystems"
-
 // Representation of sequence declaration:
 //
 // A sequence is a combination of a maximum size and a base type
diff --git a/TAO/TAO_IDL/include/ast_string.h b/TAO/TAO_IDL/include/ast_string.h
index cca2e58c651..4bdfbb7734e 100644
--- a/TAO/TAO_IDL/include/ast_string.h
+++ b/TAO/TAO_IDL/include/ast_string.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_STRING_AST_STRING_HH
 #define _AST_STRING_AST_STRING_HH
 
-#pragma ident "%@(#)AST_String.h	1.37% %92/06/10% Sun Microsystems"
-
 // Representation of string declaration
 //
 // A string type is represented by a maximum size
diff --git a/TAO/TAO_IDL/include/ast_structure.h b/TAO/TAO_IDL/include/ast_structure.h
index a9c3163ed4f..f20eb0eb3a8 100644
--- a/TAO/TAO_IDL/include/ast_structure.h
+++ b/TAO/TAO_IDL/include/ast_structure.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_STRUCTURE_AST_STRUCTURE_HH
 #define _AST_STRUCTURE_AST_STRUCTURE_HH
 
-#pragma ident "%@(#)AST_Structure.h	1.37% %92/06/10% Sun Microsystems"
-
 // Representation of structure:
 //
 // NOTE: add(AST_ConcreteType *) is defined here because a structure
diff --git a/TAO/TAO_IDL/include/ast_type.h b/TAO/TAO_IDL/include/ast_type.h
index 67c455efdbc..ca9a5e0498c 100644
--- a/TAO/TAO_IDL/include/ast_type.h
+++ b/TAO/TAO_IDL/include/ast_type.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_TYPE_AST_TYPE_HH
 #define _AST_TYPE_AST_TYPE_HH
 
-#pragma ident "%@(#)AST_Type.h	1.37% %92/06/10% Sun Microsystems"
-
 // Class for all IDL types
 //
 // This is useful wherever any IDL type defining construct can appear
diff --git a/TAO/TAO_IDL/include/ast_typedef.h b/TAO/TAO_IDL/include/ast_typedef.h
index 2cbd5e1bb39..1abb09aa935 100644
--- a/TAO/TAO_IDL/include/ast_typedef.h
+++ b/TAO/TAO_IDL/include/ast_typedef.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_TYPEDEF_AST_TYPEDEF_HH
 #define _AST_TYPEDEF_AST_TYPEDEF_HH
 
-#pragma ident "%@(#)AST_Typedef.h	1.37% %92/06/10% Sun Microsystems"
-
 // Representation of typedef declaration
 //
 // A typedef declaration is a renaming of a base type
diff --git a/TAO/TAO_IDL/include/ast_union.h b/TAO/TAO_IDL/include/ast_union.h
index f70d6812113..eab7ec51985 100644
--- a/TAO/TAO_IDL/include/ast_union.h
+++ b/TAO/TAO_IDL/include/ast_union.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_UNION_AST_UNION_HH
 #define _AST_UNION_AST_UNION_HH
 
-#pragma ident "%@(#)AST_Union.h	1.37% %92/06/10% Sun Microsystems"
-
 // Representation of union declaration:
 //
 // NOTE: add(AST_ConcreteType *) is defined here because a union
diff --git a/TAO/TAO_IDL/include/ast_union_branch.h b/TAO/TAO_IDL/include/ast_union_branch.h
index b6f00b569b3..e2de5aa8b7e 100644
--- a/TAO/TAO_IDL/include/ast_union_branch.h
+++ b/TAO/TAO_IDL/include/ast_union_branch.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_UNION_BRANCH_AST_UNION_BRAN_HH
 #define _AST_UNION_BRANCH_AST_UNION_BRAN_HH
 
-#pragma ident "%@(#)AST_UnionBranch.h	1.37% %92/06/10% Sun Microsystems"
-
 // Representation of union branch declaration:
 //
 // A branch of a union is a field with a label
diff --git a/TAO/TAO_IDL/include/ast_union_label.h b/TAO/TAO_IDL/include/ast_union_label.h
index c184afee774..587ddb1c911 100644
--- a/TAO/TAO_IDL/include/ast_union_label.h
+++ b/TAO/TAO_IDL/include/ast_union_label.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_UNION_LABEL_AST_UNION_LABEL_HH
 #define _AST_UNION_LABEL_AST_UNION_LABEL_HH
 
-#pragma ident "%@(#)AST_UnionLabel.h	1.25% %92/06/10% Sun Microsystems"
-
 // AST_UnionLabel.h
 //
 // Defines labels for unions
diff --git a/TAO/TAO_IDL/include/be_extern.h b/TAO/TAO_IDL/include/be_extern.h
index 169d68c1f2c..c8e5f0530fe 100644
--- a/TAO/TAO_IDL/include/be_extern.h
+++ b/TAO/TAO_IDL/include/be_extern.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _BE_EXTERN_BE_EXTERN_HH
 #define _BE_EXTERN_BE_EXTERN_HH
 
-#pragma ident "%@(#)be_extern.h	1.17% %92/06/10% Sun Microsystems"
-
 // be_extern.h - Defines the BE part of the BE<->FE protocol
 
 // Functions:
diff --git a/TAO/TAO_IDL/include/drv_extern.h b/TAO/TAO_IDL/include/drv_extern.h
index 31a54434a5b..8f5d6651f91 100644
--- a/TAO/TAO_IDL/include/drv_extern.h
+++ b/TAO/TAO_IDL/include/drv_extern.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _DRV_EXTERN_DRV_EXTERN_HH
 #define _DRV_EXTERN_DRV_EXTERN_HH
 
-#pragma ident "%@(#)drv_extern.h	1.17% %92/06/10% Sun Microsystems"
-
 // drv_extern.h - External functions for the IDL compiler driver program
 
 // Functions
diff --git a/TAO/TAO_IDL/include/drv_private.h b/TAO/TAO_IDL/include/drv_private.h
index d68ca7f2f65..caa74747db7 100644
--- a/TAO/TAO_IDL/include/drv_private.h
+++ b/TAO/TAO_IDL/include/drv_private.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _DRV_PRIVATE_DRV_PRIVATE_HH
 #define _DRV_PRIVATE_DRV_PRIVATE_HH
 
-#pragma ident "%@(#)drv_private.hh	1.17% %92/06/10% Sun Microsystems"
-
 // drv_private.hh - Define data and functions which are private to
 //		    the DRV but which must be accessible througout the DRV
 
diff --git a/TAO/TAO_IDL/include/fe_declarator.h b/TAO/TAO_IDL/include/fe_declarator.h
index 44cd0b4c7af..dee81ffe035 100644
--- a/TAO/TAO_IDL/include/fe_declarator.h
+++ b/TAO/TAO_IDL/include/fe_declarator.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _FE_DECLARATOR_FE_DECLARATOR_HH
 #define _FE_DECLARATOR_FE_DECLARATOR_HH
 
-#pragma ident "%@(#)FE_Declarator.h	1.30% %92/06/10% Sun Microsystems"
-
 // FE_Declarator.h
 //
 // FE internal class for storing interim declaration statements
diff --git a/TAO/TAO_IDL/include/fe_extern.h b/TAO/TAO_IDL/include/fe_extern.h
index 0dacefd503f..816081f1323 100644
--- a/TAO/TAO_IDL/include/fe_extern.h
+++ b/TAO/TAO_IDL/include/fe_extern.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _FE_EXTERN_FE_EXTERN_HH
 #define _FE_EXTERN_FE_EXTERN_HH
 
-#pragma ident "%@(#)fe_extern.h	1.40% %92/06/10% Sun Microsystems"
-
 // fe_extern.hh
 //
 // Declares all global functions for the FE
diff --git a/TAO/TAO_IDL/include/fe_interface_header.h b/TAO/TAO_IDL/include/fe_interface_header.h
index 495bcb9567e..b75164780a8 100644
--- a/TAO/TAO_IDL/include/fe_interface_header.h
+++ b/TAO/TAO_IDL/include/fe_interface_header.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _FE_INTERFACE_HEADER_FE_INTERFACE_HH
 #define _FE_INTERFACE_HEADER_FE_INTERFACE_HH
 
-#pragma ident "%@(#)FE_InterfaceHeader.h	1.32% %92/06/10% Sun Microsystems"
-
 // FE_InterfaceHeader
 //
 // Internal class for FE to describe interface headers
diff --git a/TAO/TAO_IDL/include/fe_private.h b/TAO/TAO_IDL/include/fe_private.h
index 4d3c2fcfc20..d90e19907bd 100644
--- a/TAO/TAO_IDL/include/fe_private.h
+++ b/TAO/TAO_IDL/include/fe_private.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _FE_FE_HH
 #define _FE_FE_HH
 
-#pragma ident "%@(#)fe.h	1.47% %92/06/10% Sun Microsystems"
-
 // fe_private.hh - Defines data which is private to the FE but
 //		   which must be accessible throughout the FE
 
diff --git a/TAO/TAO_IDL/include/global_extern.h b/TAO/TAO_IDL/include/global_extern.h
index 84e90840604..3ff7bf93dfd 100644
--- a/TAO/TAO_IDL/include/global_extern.h
+++ b/TAO/TAO_IDL/include/global_extern.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _GLOBAL_EXTERN_GLOBAL_EXTERN_HH
 #define _GLOBAL_EXTERN_GLOBAL_EXTERN_HH
 
-#pragma ident "%@(#)global_extern.hh	1.18% %92/06/10% Sun Microsystems"
-
 // global_extern.hh - Global data for the IDL compiler
 
 extern	IDL_GlobalData	*idl_global;	// Contains all "global" data
diff --git a/TAO/TAO_IDL/include/idl.h b/TAO/TAO_IDL/include/idl.h
index ec8e632cb57..b911e263a04 100644
--- a/TAO/TAO_IDL/include/idl.h
+++ b/TAO/TAO_IDL/include/idl.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _IDL_IDL_HH
 #define _IDL_IDL_HH
 
-#pragma ident "%@(#)idl.hh	1.18% %92/06/10% Sun Microsystems"
-
 // idl.hh
 //
 // Main include file for IDL compiler. Includes the rest of the
diff --git a/TAO/TAO_IDL/include/idl_bool.h b/TAO/TAO_IDL/include/idl_bool.h
index dfd4ae357a2..dd53d968732 100644
--- a/TAO/TAO_IDL/include/idl_bool.h
+++ b/TAO/TAO_IDL/include/idl_bool.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _IDL_BOOL_IDL_BOOL_HH
 #define _IDL_BOOL_IDL_BOOL_HH
 
-#pragma ident "%@(#)idl_bool.hh	1.43% %92/06/10% Sun Microsystems"
-
 /*
  * idl_bool.hh - Boolean definitions for IDL CFE
  *
diff --git a/TAO/TAO_IDL/include/idl_defines.h b/TAO/TAO_IDL/include/idl_defines.h
index 48a63857661..b4a4857d3f2 100644
--- a/TAO/TAO_IDL/include/idl_defines.h
+++ b/TAO/TAO_IDL/include/idl_defines.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _IDL_DEFINES_IDL_DEFINES_HH
 #define _IDL_DEFINES_IDL_DEFINES_HH
 
-#pragma ident "%@(#)idl_defines.hh	1.15% %92/06/10% Sun Microsystems"
-
 /*
  * idl_defines.hh - Defines global compiler flags
  */
diff --git a/TAO/TAO_IDL/include/idl_extern.h b/TAO/TAO_IDL/include/idl_extern.h
index f1d059fe6a7..efa7f328950 100644
--- a/TAO/TAO_IDL/include/idl_extern.h
+++ b/TAO/TAO_IDL/include/idl_extern.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _IDL_EXTERN_IDL_EXTERN_HH
 #define _IDL_EXTERN_IDL_EXTERN_HH
 
-#pragma ident "%@(#)idl_extern.hh	1.18% %92/06/10% Sun Microsystems"
-
 // idl_extern.hh
 //
 // Global variables and functions for IDL compiler
diff --git a/TAO/TAO_IDL/include/idl_fwd.h b/TAO/TAO_IDL/include/idl_fwd.h
index 5fe63be9396..e0719c1a171 100644
--- a/TAO/TAO_IDL/include/idl_fwd.h
+++ b/TAO/TAO_IDL/include/idl_fwd.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _IDL_FWD_IDL_FWD_HH
 #define _IDL_FWD_IDL_FWD_HH
 
-#pragma ident "%@(#)idl_fwd.hh	1.18% %92/06/10% Sun Microsystems"
-
 // idl_fwd.hh
 //
 // Forward declaration of all class names in CFE-BEs contract
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index b52be28722b..131b895030f 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _IDL_IDL_GLOBAL_HH
 #define _IDL_IDL_GLOBAL_HH
 
-#pragma ident "%@(#)idl_global.hh	1.1% %92/06/23% Sun Microsystems"
-
 // idl_global.hh
 //
 // Defines a class containing all global data for the compiler.
diff --git a/TAO/TAO_IDL/include/idl_narrow.h b/TAO/TAO_IDL/include/idl_narrow.h
index 9b42babae6b..c2d9e3a8370 100644
--- a/TAO/TAO_IDL/include/idl_narrow.h
+++ b/TAO/TAO_IDL/include/idl_narrow.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef	_IDL_NARROW_IDL_NARROW_HH
 #define	_IDL_NARROW_IDL_NARROW_HH
 
-#pragma ident "%@(#)idl_narrow.hh	1.1% %92/06/12% Sun Microsystems"
-
 // idl_narrow.hh
 //
 // Implement IDL narrowing mechanism. Not intended to be read by humans..
diff --git a/TAO/TAO_IDL/include/intlmacros.h b/TAO/TAO_IDL/include/intlmacros.h
index 93221da3018..5a2da162932 100644
--- a/TAO/TAO_IDL/include/intlmacros.h
+++ b/TAO/TAO_IDL/include/intlmacros.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef	_IDL_INTLMACROS_HH
 #define _IDL_INTLMACROS_HH
 
-#pragma ident "%@(#)intlmacros.hh 1.18% %92/06/10% Sun Microsystems"
-
 // intlmacros.hh
 //
 // Define macros which conditionalize string internationalization
diff --git a/TAO/TAO_IDL/include/nr_extern.h b/TAO/TAO_IDL/include/nr_extern.h
index 6b0eda1ffd4..2da18cd4c80 100644
--- a/TAO/TAO_IDL/include/nr_extern.h
+++ b/TAO/TAO_IDL/include/nr_extern.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _NR_EXTERN_NR_EXTERN_HH
 #define _NR_EXTERN_NR_EXTERN_HH
 
-#pragma ident "%@(#)nr_extern.hh	1.1% %92/06/15% Sun Microsystems"
-
 // nr_extern.hh - Defines entry points provided by narrowing
 
 // Convert between an UTL_Scope and an AST_Decl
diff --git a/TAO/TAO_IDL/include/util.h b/TAO/TAO_IDL/include/util.h
index a6e27bef1a6..6b218006c8e 100644
--- a/TAO/TAO_IDL/include/util.h
+++ b/TAO/TAO_IDL/include/util.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _UTIL_UTIL_HH
 #define _UTIL_UTIL_HH
 
-#pragma ident "%@(#)util.hh	1.20% %92/06/10% Sun Microsystems"
-
 // util.hh - Includes commonly used things defined in the util directory
 
 #include	"utl_stack.h"		// class fe_stack
diff --git a/TAO/TAO_IDL/include/utl_decllist.h b/TAO/TAO_IDL/include/utl_decllist.h
index 728047a9090..9a0a37298bb 100644
--- a/TAO/TAO_IDL/include/utl_decllist.h
+++ b/TAO/TAO_IDL/include/utl_decllist.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _UTL_DECLLIST_UTL_DECLLIST_HH
 #define _UTL_DECLLIST_UTL_DECLLIST_HH
 
-#pragma ident "%@(#)utl_decllist.hh	1.27% %92/06/10% Sun Microsystems"
-
 // utl_decllist.hh
 //
 // List of FE_Declarator nodes
diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h
index b6bf1f9cc15..0873ae758a1 100644
--- a/TAO/TAO_IDL/include/utl_err.h
+++ b/TAO/TAO_IDL/include/utl_err.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _UTL_ERROR_UTL_ERROR_HH
 #define _UTL_ERROR_UTL_ERROR_HH
 
-#pragma ident "%@(#)utl_error.hh	1.41% %92/06/10% Sun Microsystems"
-
 // utl_error.hh
 //
 // Defines error codes and error handling class for UTL
diff --git a/TAO/TAO_IDL/include/utl_error.h b/TAO/TAO_IDL/include/utl_error.h
index b6bf1f9cc15..0873ae758a1 100644
--- a/TAO/TAO_IDL/include/utl_error.h
+++ b/TAO/TAO_IDL/include/utl_error.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _UTL_ERROR_UTL_ERROR_HH
 #define _UTL_ERROR_UTL_ERROR_HH
 
-#pragma ident "%@(#)utl_error.hh	1.41% %92/06/10% Sun Microsystems"
-
 // utl_error.hh
 //
 // Defines error codes and error handling class for UTL
diff --git a/TAO/TAO_IDL/include/utl_exceptlist.h b/TAO/TAO_IDL/include/utl_exceptlist.h
index 2901bc09e42..c3c14ccf714 100644
--- a/TAO/TAO_IDL/include/utl_exceptlist.h
+++ b/TAO/TAO_IDL/include/utl_exceptlist.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _UTL_EXCEPTLIST_UTL_EXCEPTLIST_HH
 #define _UTL_EXCEPTLIST_UTL_EXCEPTLIST_HH
 
-#pragma ident "%@(#)utl_exceptlist.hh	1.33% %92/06/10% Sun Microsystems"
-
 // utl_exceptlist.hh
 //
 // List of AST_Exception nodes
diff --git a/TAO/TAO_IDL/include/utl_exprlist.h b/TAO/TAO_IDL/include/utl_exprlist.h
index e8042393e26..3e4f7c7079e 100644
--- a/TAO/TAO_IDL/include/utl_exprlist.h
+++ b/TAO/TAO_IDL/include/utl_exprlist.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _UTL_EXPRLIST_UTL_EXPRLIST_HH
 #define _UTL_EXPRLIST_UTL_EXPRLIST_HH
 
-#pragma ident "%@(#)utl_exprlist.hh	1.23% %92/06/10% Sun Microsystems"
-
 // utl_exprlist.hh
 //
 // List of strings
diff --git a/TAO/TAO_IDL/include/utl_identifier.h b/TAO/TAO_IDL/include/utl_identifier.h
index 2fa8710c5f0..0fa3775a9c8 100644
--- a/TAO/TAO_IDL/include/utl_identifier.h
+++ b/TAO/TAO_IDL/include/utl_identifier.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef	_UTL_IDENTIFIER_UTL_IDENTIFIER_HH
 #define	_UTL_IDENTIFIER_UTL_IDENTIFIER_HH
 
-#pragma ident "%@(#)UTL_Identifier.hh	1.1% %93/12/06% Sun Microsystems"
-
 // utl_identifier.hh
 //
 // Identifier
diff --git a/TAO/TAO_IDL/include/utl_idlist.h b/TAO/TAO_IDL/include/utl_idlist.h
index a583d0d42b6..7fc04eeb2a8 100644
--- a/TAO/TAO_IDL/include/utl_idlist.h
+++ b/TAO/TAO_IDL/include/utl_idlist.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef	_UTL_IDLIST_UTL_IDLIST_HH
 #define	_UTL_IDLIST_UTL_IDLIST_HH
 
-#pragma ident "%@(#)UTL_IdList.hh	1.1% %93/12/06% Sun Microsystems"
-
 // utl_idlist.hh
 //
 // List of Identifiers
diff --git a/TAO/TAO_IDL/include/utl_indenter.h b/TAO/TAO_IDL/include/utl_indenter.h
index 2cc1fdb7706..17a1a509e1e 100644
--- a/TAO/TAO_IDL/include/utl_indenter.h
+++ b/TAO/TAO_IDL/include/utl_indenter.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _UTL_INDENTER_UTL_INDENTER_HH
 #define _UTL_INDENTER_UTL_INDENTER_HH
 
-#pragma ident "%@(#)utl_indenter.hh	1.10% %92/06/10% Sun Microsystems"
-
 // UTL indenter:
 //
 // Utility class for control of indentation level during dumping
diff --git a/TAO/TAO_IDL/include/utl_labellist.h b/TAO/TAO_IDL/include/utl_labellist.h
index 12891df9e00..e78a04ec372 100644
--- a/TAO/TAO_IDL/include/utl_labellist.h
+++ b/TAO/TAO_IDL/include/utl_labellist.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _UTL_LABELLIST_UTL_LABELLIST_HH
 #define _UTL_LABELLIST_UTL_LABELLIST_HH
 
-#pragma ident "%@(#)utl_labellist.hh	1.27% %92/06/10% Sun Microsystems"
-
 // utl_labellist.hh
 //
 // List of AST_UnionBranch nodes
diff --git a/TAO/TAO_IDL/include/utl_list.h b/TAO/TAO_IDL/include/utl_list.h
index ed45d09010f..017b9be1a18 100644
--- a/TAO/TAO_IDL/include/utl_list.h
+++ b/TAO/TAO_IDL/include/utl_list.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _UTL_LIST_UTL_LIST_HH
 #define _UTL_LIST_UTL_LIST_HH
 
-#pragma ident "%@(#)utl_list.hh	1.33% %92/06/10% Sun Microsystems"
-
 // utl_list.hh
 //
 // General single-linked lists
diff --git a/TAO/TAO_IDL/include/utl_namelist.h b/TAO/TAO_IDL/include/utl_namelist.h
index d4af135b646..d7f0d8eb526 100644
--- a/TAO/TAO_IDL/include/utl_namelist.h
+++ b/TAO/TAO_IDL/include/utl_namelist.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _UTL_NAMELIST_UTL_NAMELIST_HH
 #define _UTL_NAMELIST_UTL_NAMELIST_HH
 
-#pragma ident "%@(#)utl_namelist.hh	1.33% %92/06/10% Sun Microsystems"
-
 // utl_namelist.hh
 //
 // List of UTL_ScopedName nodes
diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h
index 0e902ed3872..1db1c6fdd1b 100644
--- a/TAO/TAO_IDL/include/utl_scope.h
+++ b/TAO/TAO_IDL/include/utl_scope.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _UTL_SCOPE_UTL_SCOPE_HH
 #define _UTL_SCOPE_UTL_SCOPE_HH
 
-#pragma ident "%@(#)utl_scope.hh	1.37% %92/06/10% Sun Microsystems"
-
 // UTL_Scope - Provide scoping mechanism
 //
 // This is the base class for name scoping. Each entity which can
diff --git a/TAO/TAO_IDL/include/utl_scoped_name.h b/TAO/TAO_IDL/include/utl_scoped_name.h
index e00f967a6e2..5ca4d9c247f 100644
--- a/TAO/TAO_IDL/include/utl_scoped_name.h
+++ b/TAO/TAO_IDL/include/utl_scoped_name.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_SCOPED_NAME_AST_SCOPED_NAME_HH
 #define _AST_SCOPED_NAME_AST_SCOPED_NAME_HH
 
-#pragma ident "%@(#)utl_scoped_name.h	1.32% %92/06/10% Sun Microsystems"
-
 // Define UTL_ScopedName as a list of strings
 
 /*
diff --git a/TAO/TAO_IDL/include/utl_stack.h b/TAO/TAO_IDL/include/utl_stack.h
index 0ecb23575a8..7e343c17fc4 100644
--- a/TAO/TAO_IDL/include/utl_stack.h
+++ b/TAO/TAO_IDL/include/utl_stack.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _UTL_STACK_UTL_STACK_HH
 #define _UTL_STACK_UTL_STACK_HH
 
-#pragma ident "%@(#)utl_stack.hh	1.36% %92/06/10% Sun Microsystems"
-
 // utl_stack.hh - Defines the UTL_ScopeStack class - a stack of scopes
 //
 // UTL_ScopeStack implements scope nesting
diff --git a/TAO/TAO_IDL/include/utl_string.h b/TAO/TAO_IDL/include/utl_string.h
index 6bb415e5b12..35f4fae171f 100644
--- a/TAO/TAO_IDL/include/utl_string.h
+++ b/TAO/TAO_IDL/include/utl_string.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _STRING_STRING_HH
 #define _STRING_STRING_HH
 
-#pragma ident "%@(#)utl_string.h	1.21% %92/06/10% Sun Microsystems"
-
 // utl_string.hh - contains a quick and dirty TEMPORARY string implementation
 
 /*
diff --git a/TAO/TAO_IDL/include/utl_strlist.h b/TAO/TAO_IDL/include/utl_strlist.h
index 5c85ee82a71..2dac6ce3de6 100644
--- a/TAO/TAO_IDL/include/utl_strlist.h
+++ b/TAO/TAO_IDL/include/utl_strlist.h
@@ -65,8 +65,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _UTL_STRLIST_UTL_STRLIST_HH
 #define _UTL_STRLIST_UTL_STRLIST_HH
 
-#pragma ident "%@(#)UTL_StrList.h	1.33% %92/06/10% Sun Microsystems"
-
 // utl_strlist.hh
 //
 // List of String nodes
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_decllist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_decllist.h
index 425ae6e085c..8c911cf2819 100644
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_decllist.h
+++ b/TAO/TAO_IDL/include/utl_tmpl/utl_decllist.h
@@ -53,8 +53,6 @@
 #ifndef _UTL_DECLLIST_UTL_DECLLIST_HH
 #define _UTL_DECLLIST_UTL_DECLLIST_HH
 
-#pragma ident "%@(#)utl_decllist.hh	1.27% %92/06/10% Sun Microsystems"
-
 // utl_decllist.hh
 //
 // List of FE_Declarator nodes
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h
index ee732beaa65..3f50992b5a3 100644
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h
+++ b/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h
@@ -53,8 +53,6 @@
 #ifndef _UTL_EXCEPTLIST_UTL_EXCEPTLIST_HH
 #define _UTL_EXCEPTLIST_UTL_EXCEPTLIST_HH
 
-#pragma ident "%@(#)utl_exceptlist.hh	1.33% %92/06/10% Sun Microsystems"
-
 // utl_exceptlist.hh
 //
 // List of AST_Exception nodes
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_exprlist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_exprlist.h
index d6b548c77ca..e5fb718a4ff 100644
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_exprlist.h
+++ b/TAO/TAO_IDL/include/utl_tmpl/utl_exprlist.h
@@ -53,8 +53,6 @@
 #ifndef _UTL_EXPRLIST_UTL_EXPRLIST_HH
 #define _UTL_EXPRLIST_UTL_EXPRLIST_HH
 
-#pragma ident "%@(#)utl_exprlist.hh	1.23% %92/06/10% Sun Microsystems"
-
 // utl_exprlist.hh
 //
 // List of strings
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_idlist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_idlist.h
index f464bb93abb..1947beace3c 100644
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_idlist.h
+++ b/TAO/TAO_IDL/include/utl_tmpl/utl_idlist.h
@@ -53,8 +53,6 @@
 #ifndef	_UTL_IDLIST_UTL_IDLIST_HH
 #define	_UTL_IDLIST_UTL_IDLIST_HH
 
-#pragma ident "%@(#)UTL_IdList.hh	1.1% %93/12/06% Sun Microsystems"
-
 // utl_idlist.hh
 //
 // List of Identifiers
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_labellist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_labellist.h
index 279a465b8c5..634feba840b 100644
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_labellist.h
+++ b/TAO/TAO_IDL/include/utl_tmpl/utl_labellist.h
@@ -53,8 +53,6 @@
 #ifndef _UTL_LABELLIST_UTL_LABELLIST_HH
 #define _UTL_LABELLIST_UTL_LABELLIST_HH
 
-#pragma ident "%@(#)utl_labellist.hh	1.27% %92/06/10% Sun Microsystems"
-
 // utl_labellist.hh
 //
 // List of AST_UnionBranch nodes
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_list.h b/TAO/TAO_IDL/include/utl_tmpl/utl_list.h
index 76905e8ada0..420b360c6a4 100644
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_list.h
+++ b/TAO/TAO_IDL/include/utl_tmpl/utl_list.h
@@ -53,8 +53,6 @@
 #ifndef _UTL_LIST_UTL_LIST_HH
 #define _UTL_LIST_UTL_LIST_HH
 
-#pragma ident "%@(#)utl_list.hh	1.33% %92/06/10% Sun Microsystems"
-
 // utl_list.hh
 //
 // General single-linked lists
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_namelist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_namelist.h
index 5005841c358..8306b3d107a 100644
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_namelist.h
+++ b/TAO/TAO_IDL/include/utl_tmpl/utl_namelist.h
@@ -53,8 +53,6 @@
 #ifndef _UTL_NAMELIST_UTL_NAMELIST_HH
 #define _UTL_NAMELIST_UTL_NAMELIST_HH
 
-#pragma ident "%@(#)utl_namelist.hh	1.33% %92/06/10% Sun Microsystems"
-
 // utl_namelist.hh
 //
 // List of UTL_ScopedName nodes
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_strlist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_strlist.h
index bbac5d8bb7f..6e549d76a61 100644
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_strlist.h
+++ b/TAO/TAO_IDL/include/utl_tmpl/utl_strlist.h
@@ -53,8 +53,6 @@
 #ifndef _UTL_STRLIST_UTL_STRLIST_HH
 #define _UTL_STRLIST_UTL_STRLIST_HH
 
-#pragma ident "%@(#)UTL_StrList.h	1.33% %92/06/10% Sun Microsystems"
-
 // utl_strlist.hh
 //
 // List of String nodes
diff --git a/TAO/TAO_IDL/narrow/narrow.cpp b/TAO/TAO_IDL/narrow/narrow.cpp
index 9f50e9f05f4..7b5d9b391cd 100644
--- a/TAO/TAO_IDL/narrow/narrow.cpp
+++ b/TAO/TAO_IDL/narrow/narrow.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)nr_narrowk.cc	1.1% %92/06/15% Sun Microsystems"
-
 #include	"idl.h"
 #include	"idl_extern.h"
 
diff --git a/TAO/TAO_IDL/tao_idl.dsp b/TAO/TAO_IDL/tao_idl.dsp
new file mode 100644
index 00000000000..f828dcd3db4
--- /dev/null
+++ b/TAO/TAO_IDL/tao_idl.dsp
@@ -0,0 +1,457 @@
+# Microsoft Developer Studio Project File - Name="tao_idl" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=tao_idl - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "tao_idl.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "tao_idl.mak" CFG="tao_idl - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "tao_idl - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "tao_idl - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "tao_idl - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+

+!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug"

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "include" /I "be_include" /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D IDL_CFE_VERSION=\"1.3.0\" /YX /FD /D CPP_LOCATION="\"\\Program Files\\DevStudio\\Vc\\bin\\Cl\"" /c

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../ace"

+# SUBTRACT LINK32 /pdb:none

+

+!ENDIF 

+

+# Begin Target

+

+# Name "tao_idl - Win32 Release"

+# Name "tao_idl - Win32 Debug"

+# Begin Source File

+

+SOURCE=.\ast\ast_argument.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_array.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_attribute.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_check.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_concrete_type.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_constant.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_decl.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_enum.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_enum_val.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_exception.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_expression.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_field.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_generator.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_interface.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_interface_fwd.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_module.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_operation.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_predefined_type.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_recursive.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_redef.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_root.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_sequence.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_string.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_structure.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_type.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_typedef.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_union.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_union_branch.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ast\ast_union_label.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_args.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_argument.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_array.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_attribute.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_codegen.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_constant.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_decl.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_enum.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_enum_val.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_exception.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_expression.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_factory.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_field.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_generator.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_helper.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_init.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_interface.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_interface_fwd.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_module.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_operation.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_predefined_type.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_produce.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_root.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_scope.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_sequence.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_state.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_string.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_structure.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_sunsoft.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_type.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_typedef.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_union.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_union_branch.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\be\be_union_label.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\driver\drv_args.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\driver\drv_fork.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\driver\drv_init.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\driver\drv_link.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\driver\drv_main.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\driver\drv_preproc.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\driver\drv_private.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\fe\fe_declarator.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\fe\fe_extern.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\fe\fe_init.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\fe\fe_interface_header.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\fe\fe_private.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\fe\lex.yy.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\narrow\narrow.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\util\utl_decllist.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\util\utl_error.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\util\utl_exceptlist.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\util\utl_exprlist.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\util\utl_global.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\util\utl_identifier.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\util\utl_idlist.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\util\utl_indenter.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\util\utl_labellist.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\util\utl_list.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\util\utl_namelist.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\util\utl_scope.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\util\utl_stack.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\util\utl_string.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\util\utl_strlist.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\fe\y.tab.cpp

+# End Source File

+# End Target

+# End Project

diff --git a/TAO/TAO_IDL/tao_idl.dsw b/TAO/TAO_IDL/tao_idl.dsw
new file mode 100644
index 00000000000..6951f0b2106
--- /dev/null
+++ b/TAO/TAO_IDL/tao_idl.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 5.00

+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

+

+###############################################################################

+

+Project: "tao_idl"=.\tao_idl.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Global:

+

+Package=<5>

+{{{

+}}}

+

+Package=<3>

+{{{

+}}}

+

+###############################################################################

+

diff --git a/TAO/TAO_IDL/util/utl_decllist.cpp b/TAO/TAO_IDL/util/utl_decllist.cpp
index 39ffe61b9e0..0c666d34b72 100644
--- a/TAO/TAO_IDL/util/utl_decllist.cpp
+++ b/TAO/TAO_IDL/util/utl_decllist.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)utl_decllist.cc	1.27% %92/06/10% Sun Microsystems"
-
 // utl_decllist.cc
 //
 // Implementation of a list of declarators
diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp
index 97fa27e713f..870c9370c93 100644
--- a/TAO/TAO_IDL/util/utl_err.cpp
+++ b/TAO/TAO_IDL/util/utl_err.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)utl_error.cc	1.18% %92/06/10% Sun Microsystems"
-
 // utl_error.cc - Implementation of error reporting object for IDL
 //		  compiler program
 
@@ -146,6 +144,7 @@ error_string(UTL_Error::ErrorCode c)
   case UTL_Error::EIDL_BACK_END:
     return GTDEVEL("back end: ");
   }
+  return NULL;
 }
 
 // Print out an error message header on cerr
@@ -193,6 +192,7 @@ exprtype_to_string(AST_Expression::ExprType t)
   case AST_Expression::EV_none:
     return "none";
   }
+  return NULL;
 }
 
 /*
diff --git a/TAO/TAO_IDL/util/utl_error.cpp b/TAO/TAO_IDL/util/utl_error.cpp
index 97fa27e713f..870c9370c93 100644
--- a/TAO/TAO_IDL/util/utl_error.cpp
+++ b/TAO/TAO_IDL/util/utl_error.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)utl_error.cc	1.18% %92/06/10% Sun Microsystems"
-
 // utl_error.cc - Implementation of error reporting object for IDL
 //		  compiler program
 
@@ -146,6 +144,7 @@ error_string(UTL_Error::ErrorCode c)
   case UTL_Error::EIDL_BACK_END:
     return GTDEVEL("back end: ");
   }
+  return NULL;
 }
 
 // Print out an error message header on cerr
@@ -193,6 +192,7 @@ exprtype_to_string(AST_Expression::ExprType t)
   case AST_Expression::EV_none:
     return "none";
   }
+  return NULL;
 }
 
 /*
diff --git a/TAO/TAO_IDL/util/utl_exceptlist.cpp b/TAO/TAO_IDL/util/utl_exceptlist.cpp
index 3c07d880883..630085708a6 100644
--- a/TAO/TAO_IDL/util/utl_exceptlist.cpp
+++ b/TAO/TAO_IDL/util/utl_exceptlist.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)utl_exceptlist.cc	1.33% %92/06/10% Sun Microsystems"
-
 // utl_exceptlist.cc
 //
 // Implementation of a list of exceptions
diff --git a/TAO/TAO_IDL/util/utl_exprlist.cpp b/TAO/TAO_IDL/util/utl_exprlist.cpp
index cefe2750a09..f94c1864d8f 100644
--- a/TAO/TAO_IDL/util/utl_exprlist.cpp
+++ b/TAO/TAO_IDL/util/utl_exprlist.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)utl_exprlist.cc	1.33% %92/06/10% Sun Microsystems"
-
 // utl_exprlist.cc
 //
 // Implementation of a list of strings
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index f53e6f12c94..43abd1e2e02 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)utl_global.cc	1.19% %92/06/10% Sun Microsystems"
-
 // utl_global.cc - Implementation of class IDL_GlobalData
 //
 
diff --git a/TAO/TAO_IDL/util/utl_identifier.cpp b/TAO/TAO_IDL/util/utl_identifier.cpp
index 00a3a950601..458fcc20c5c 100644
--- a/TAO/TAO_IDL/util/utl_identifier.cpp
+++ b/TAO/TAO_IDL/util/utl_identifier.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)utl_identifier.cc	1.34% %92/06/10% Sun Microsystems"
-
 // utl_identifier - Implementation of identifiers
 
 #include	"idl.h"
diff --git a/TAO/TAO_IDL/util/utl_idlist.cpp b/TAO/TAO_IDL/util/utl_idlist.cpp
index c7474dd287e..bf143f06d5f 100644
--- a/TAO/TAO_IDL/util/utl_idlist.cpp
+++ b/TAO/TAO_IDL/util/utl_idlist.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)utl_idlist.cc	1.34% %92/06/10% Sun Microsystems"
-
 // utl_idlist.cc
 //
 // Implementation of a list of utl_string nodes
diff --git a/TAO/TAO_IDL/util/utl_indenter.cpp b/TAO/TAO_IDL/util/utl_indenter.cpp
index 66a2d52888f..0ebbdf7899d 100644
--- a/TAO/TAO_IDL/util/utl_indenter.cpp
+++ b/TAO/TAO_IDL/util/utl_indenter.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)utl_indenter.cc	1.9% %92/06/10% Sun Microsystems"
-
 // utl_indenter.cc - Implementation of indenter for dumping IDL AST
 //
 
diff --git a/TAO/TAO_IDL/util/utl_labellist.cpp b/TAO/TAO_IDL/util/utl_labellist.cpp
index dc7450734f8..a88f95d4c17 100644
--- a/TAO/TAO_IDL/util/utl_labellist.cpp
+++ b/TAO/TAO_IDL/util/utl_labellist.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)utl_labellist.cc	1.27% %92/06/10% Sun Microsystems"
-
 // utl_labellist.cc
 //
 // Implementation of a list of scoped names
diff --git a/TAO/TAO_IDL/util/utl_list.cpp b/TAO/TAO_IDL/util/utl_list.cpp
index 7c2873607a3..b6eb1dd16f4 100644
--- a/TAO/TAO_IDL/util/utl_list.cpp
+++ b/TAO/TAO_IDL/util/utl_list.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)utl_list.cc	1.34% %92/06/10% Sun Microsystems"
-
 // utl_list.cc
 //
 // Implementation of generic single-linked lists
diff --git a/TAO/TAO_IDL/util/utl_namelist.cpp b/TAO/TAO_IDL/util/utl_namelist.cpp
index ea1f8ca543a..6a7ee74819c 100644
--- a/TAO/TAO_IDL/util/utl_namelist.cpp
+++ b/TAO/TAO_IDL/util/utl_namelist.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)utl_namelist.cc	1.33% %92/06/10% Sun Microsystems"
-
 // utl_namelist.cc
 //
 // Implementation of a list of scoped names
diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp
index 8d238e614bb..f157e7ef60f 100644
--- a/TAO/TAO_IDL/util/utl_scope.cpp
+++ b/TAO/TAO_IDL/util/utl_scope.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)utl_scope.cc	1.46% %92/06/10% Sun Microsystems"
-
 /*
  * utl_scope.cc - Implementation of class UTL_Scope
  */
diff --git a/TAO/TAO_IDL/util/utl_stack.cpp b/TAO/TAO_IDL/util/utl_stack.cpp
index 4de64451b36..370b66cbe6a 100644
--- a/TAO/TAO_IDL/util/utl_stack.cpp
+++ b/TAO/TAO_IDL/util/utl_stack.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)utl_stack.cc	1.36% %92/06/10% Sun Microsystems"
-
 /*
  * utl_stack.cc - Implementation of class UTL_ScopeStack
  */
diff --git a/TAO/TAO_IDL/util/utl_string.cpp b/TAO/TAO_IDL/util/utl_string.cpp
index 88a465674a9..441232a1d91 100644
--- a/TAO/TAO_IDL/util/utl_string.cpp
+++ b/TAO/TAO_IDL/util/utl_string.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)utl_string.cc	1.20% %92/06/10% Sun Microsystems"
-
 // utl_string.cc - Implementation of quick and dirty TEMPORARY String
 //		   for IDL compiler
 
diff --git a/TAO/TAO_IDL/util/utl_strlist.cpp b/TAO/TAO_IDL/util/utl_strlist.cpp
index 4d3237e0a70..3ca63c59490 100644
--- a/TAO/TAO_IDL/util/utl_strlist.cpp
+++ b/TAO/TAO_IDL/util/utl_strlist.cpp
@@ -62,8 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
  */
 
-#pragma ident "%@(#)utl_strlist.cc	1.34% %92/06/10% Sun Microsystems"
-
 // utl_strlist.cc
 //
 // Implementation of a list of utl_string nodes
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_decllist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_decllist.cpp
index 5efa9e50a1b..2652f24a7c7 100644
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_decllist.cpp
+++ b/TAO/TAO_IDL/util/utl_tmpl/utl_decllist.cpp
@@ -50,8 +50,6 @@
  *======================================================================
  */
 
-#pragma ident "%@(#)utl_decllist.cc	1.27% %92/06/10% Sun Microsystems"
-
 // utl_decllist.cc
 //
 // Implementation of a list of declarators
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp
index 6a6e4ac2b47..323c316756a 100644
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp
+++ b/TAO/TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp
@@ -50,8 +50,6 @@
  *======================================================================
  */
 
-#pragma ident "%@(#)utl_exceptlist.cc	1.33% %92/06/10% Sun Microsystems"
-
 // utl_exceptlist.cc
 //
 // Implementation of a list of exceptions
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_exprlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_exprlist.cpp
index 3ae1e259cce..333f2506774 100644
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_exprlist.cpp
+++ b/TAO/TAO_IDL/util/utl_tmpl/utl_exprlist.cpp
@@ -50,8 +50,6 @@
  *======================================================================
  */
 
-#pragma ident "%@(#)utl_exprlist.cc	1.33% %92/06/10% Sun Microsystems"
-
 // utl_exprlist.cc
 //
 // Implementation of a list of strings
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp
index d1e7bb49d8f..e4f0b0a8291 100644
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp
+++ b/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp
@@ -50,8 +50,6 @@
  *======================================================================
  */
 
-#pragma ident "%@(#)utl_idlist.cc	1.34% %92/06/10% Sun Microsystems"
-
 // utl_idlist.cc
 //
 // Implementation of a list of utl_string nodes
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_labellist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_labellist.cpp
index 6fa8a0b9fb3..9d285e036f5 100644
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_labellist.cpp
+++ b/TAO/TAO_IDL/util/utl_tmpl/utl_labellist.cpp
@@ -50,8 +50,6 @@
  *======================================================================
  */
 
-#pragma ident "%@(#)utl_labellist.cc	1.27% %92/06/10% Sun Microsystems"
-
 // utl_labellist.cc
 //
 // Implementation of a list of scoped names
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp
index 233add32d63..61effde260e 100644
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp
+++ b/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp
@@ -50,8 +50,6 @@
  *======================================================================
  */
 
-#pragma ident "%@(#)utl_list.cc	1.34% %92/06/10% Sun Microsystems"
-
 // utl_list.cc
 //
 // Implementation of generic single-linked lists
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_namelist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_namelist.cpp
index f2fc6dfe7e2..0a5f97d3147 100644
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_namelist.cpp
+++ b/TAO/TAO_IDL/util/utl_tmpl/utl_namelist.cpp
@@ -50,8 +50,6 @@
  *======================================================================
  */
 
-#pragma ident "%@(#)utl_namelist.cc	1.33% %92/06/10% Sun Microsystems"
-
 // utl_namelist.cc
 //
 // Implementation of a list of scoped names
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp
index 9c2d1cf29fb..3311b089d79 100644
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp
+++ b/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp
@@ -50,8 +50,6 @@
  *======================================================================
  */
 
-#pragma ident "%@(#)utl_strlist.cc	1.34% %92/06/10% Sun Microsystems"
-
 // utl_strlist.cc
 //
 // Implementation of a list of utl_string nodes
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 4d5cc5b286a..39754c90656 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -42,7 +42,8 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__IIOP_BUILD" /D "ACE_BUILD_SVC_DLL" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__IIOP_BUILD" /D "ACE_BUILD_SVC_DLL" /FD /c

+# SUBTRACT CPP /YX /Yc /Yu

 # ADD BASE MTL /nologo /D "NDEBUG" /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

@@ -52,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\ace"

 # SUBTRACT LINK32 /incremental:yes

 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

@@ -69,7 +70,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__IIOP_BUILD" /D "ACE_BUILD_SVC_DLL" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__IIOP_BUILD" /D "ACE_BUILD_SVC_DLL" /FD /c

+# SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -79,7 +81,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386

-# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"TAOd.dll" /libpath:"..\..\ace"

+# ADD LINK32 acesd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"TAOd.dll" /libpath:"..\..\ace"

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

 

 !ENDIF