diff -rc src/tool/omniidl2/omniORB2_be/o2be.h newsrc/tool/omniidl2/omniORB2_be/o2be.h
*** src/tool/omniidl2/omniORB2_be/o2be.h	Thu Jan  7 09:32:17 1999
--- newsrc/tool/omniidl2/omniORB2_be/o2be.h	Mon Feb  8 09:45:56 1999
***************
*** 1058,1063 ****
--- 1058,1065 ----
    void produce_skel(std::fstream& s);
    void produce_dynskel(std::fstream& s);
  
+   void produce_decls_at_global_scope_in_hdr(std::fstream& s);
+ 
    void produce_binary_operators_in_hdr(std::fstream& s);
    void produce_binary_operators_in_dynskel(std::fstream& s);
  
diff -rc src/tool/omniidl2/omniORB2_be/o2be_interface.cc newsrc/tool/omniidl2/omniORB2_be/o2be_interface.cc
*** src/tool/omniidl2/omniORB2_be/o2be_interface.cc	Thu Jan  7 09:47:07 1999
--- newsrc/tool/omniidl2/omniORB2_be/o2be_interface.cc	Mon Feb  8 10:05:05 1999
***************
*** 2693,2699 ****
  
  
  void
! o2be_interface::produce_binary_operators_in_hdr(std::fstream &s)
  {
    {
      UTL_ScopeActiveIterator i(this,UTL_Scope::IK_decls);
--- 2693,2729 ----
  
  
  void
! o2be_interface::produce_decls_at_global_scope_in_hdr(std::fstream& s)
! {
!   UTL_ScopeActiveIterator i(this, UTL_Scope::IK_decls);
! 
!   while( !i.is_done() ) {
!     AST_Decl* d = i.item();
! 
!     switch( d->node_type() ) {
!     case AST_Decl::NT_union:
!       o2be_union::narrow_from_decl(d)
! 	->produce_decls_at_global_scope_in_hdr(s);
!       break;
!     case AST_Decl::NT_struct:
!       o2be_structure::narrow_from_decl(d)
! 	->produce_decls_at_global_scope_in_hdr(s);
!       break;
!     case AST_Decl::NT_interface:
!       o2be_interface::narrow_from_decl(d)
! 	->produce_decls_at_global_scope_in_hdr(s);
!       break;
!     default:
!       break;
!     }
! 
!     i.next();
!   }
! }
! 
! 
! void
! o2be_interface::produce_binary_operators_in_hdr(std::fstream& s)
  {
    {
      UTL_ScopeActiveIterator i(this,UTL_Scope::IK_decls);
***************
*** 2742,2748 ****
  }
  
  void
! o2be_interface::produce_binary_operators_in_dynskel(std::fstream &s)
  {
    {
      UTL_ScopeActiveIterator i(this,UTL_Scope::IK_decls);
--- 2772,2778 ----
  }
  
  void
! o2be_interface::produce_binary_operators_in_dynskel(std::fstream& s)
  {
    {
      UTL_ScopeActiveIterator i(this,UTL_Scope::IK_decls);
diff -rc src/tool/omniidl2/omniORB2_be/o2be_module.cc newsrc/tool/omniidl2/omniORB2_be/o2be_module.cc
*** src/tool/omniidl2/omniORB2_be/o2be_module.cc	Thu Jan  7 09:45:59 1999
--- newsrc/tool/omniidl2/omniORB2_be/o2be_module.cc	Mon Feb  8 10:05:33 1999
***************
*** 256,283 ****
  {
    if( !(in_main_file()) )  return;
  
!   UTL_ScopeActiveIterator  i(this,UTL_Scope::IK_decls);
!   AST_Decl*                decl;
  
    while( !i.is_done() ) {
  
!     decl = i.item();
      i.next();
  
      if ((decl->in_main_file())) {
  
        switch(decl->node_type()) {
        case AST_Decl::NT_module:
! 	o2be_module::
! 	  narrow_from_decl(decl)->produce_decls_at_global_scope_in_hdr(s); 
  	break;
        case AST_Decl::NT_union:
! 	o2be_union::
! 	  narrow_from_decl(decl)->produce_decls_at_global_scope_in_hdr(s);
  	break;
        case AST_Decl::NT_struct:
! 	o2be_structure::
! 	  narrow_from_decl(decl)->produce_decls_at_global_scope_in_hdr(s);
  	break;
        default:
  	break;
--- 256,286 ----
  {
    if( !(in_main_file()) )  return;
  
!   UTL_ScopeActiveIterator i(this, UTL_Scope::IK_decls);
  
    while( !i.is_done() ) {
  
!     AST_Decl* decl = i.item();
      i.next();
  
      if ((decl->in_main_file())) {
  
        switch(decl->node_type()) {
        case AST_Decl::NT_module:
! 	o2be_module::narrow_from_decl(decl)
! 	  ->produce_decls_at_global_scope_in_hdr(s); 
  	break;
        case AST_Decl::NT_union:
! 	o2be_union::narrow_from_decl(decl)
! 	  ->produce_decls_at_global_scope_in_hdr(s);
  	break;
        case AST_Decl::NT_struct:
! 	o2be_structure::narrow_from_decl(decl)
! 	  ->produce_decls_at_global_scope_in_hdr(s);
! 	break;
!       case AST_Decl::NT_interface:
! 	o2be_interface::narrow_from_decl(decl)
! 	  ->produce_decls_at_global_scope_in_hdr(s);
  	break;
        default:
  	break;