cvs commit: gcc3/gcc/cp decl2.c

[Matthew Austern]

austern     02/09/23 22:26:22

  Modified:    gcc/cp   decl2.c
  Log:
  Fixed merge problem.
  
  Revision  Changes    Path
  1.92      +10 -10    gcc3/gcc/cp/decl2.c
  
  Index: decl2.c
  ===================================================================
  RCS file: /cvs/Darwin/gcc3/gcc/cp/decl2.c,v
  retrieving revision 1.91
  retrieving revision 1.92
  diff -u -r1.91 -r1.92
  --- decl2.c   2002/09/10 20:53:53     1.91
  +++ decl2.c   2002/09/24 05:26:22     1.92
  @@ -1972,18 +1972,18 @@
            }
        }
         else
  -     comdat_linkage (decl);
  -#if 0 /* APPLE MERGE need a new home for this */
  -      /* APPLE LOCAL begin coalescing */
  -      /* coalesce inline member functions */
  -#ifdef MAKE_DECL_COALESCED
  -      if (DECL_DECLARED_INLINE_P (decl))
        {
  -       MAKE_DECL_COALESCED (decl);
  -     }
  +       comdat_linkage (decl);
  +       /* APPLE LOCAL begin coalescing */
  +       /* coalesce inline member functions */
  +#ifdef MAKE_DECL_COALESCED
  +       if (DECL_DECLARED_INLINE_P (decl))
  +         {
  +           MAKE_DECL_COALESCED (decl);
  +         }
   #endif /* MAKE_DECL_COALESCED */
  -      /* APPLE LOCAL end coalescing */
  -#endif
  +       /* APPLE LOCAL end coalescing */
  +     }
       }
     else
       comdat_linkage (decl);