zlaski      02/09/17 14:24:32

  Modified:    gcc/objcp objcp-decl.c
  Log:
  Fix ObjC++ merge bogosity.  Committed under emergency merge powers.
  
  Revision  Changes    Path
  1.16      +4 -2      gcc3/gcc/objcp/objcp-decl.c
  
  Index: objcp-decl.c
  ===================================================================
  RCS file: /cvs/Darwin/gcc3/gcc/objcp/objcp-decl.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- objcp-decl.c      2002/08/27 22:54:41     1.15
  +++ objcp-decl.c      2002/09/17 21:24:31     1.16
  @@ -224,8 +224,10 @@
   objcp_build_component_ref (datum, component) 
        tree datum, component;
   {
  -  /* APPLE MERGE fix this */
  -  return NULL /*build_component_ref (datum, component, NULL_TREE, 1)*/;
  +  /* The 'build_component_ref' routine has been removed from the C++
  +     front-end, but 'finish_class_member_access_expr' seems to be
  +     a worthy substitute.  */
  +  return finish_class_member_access_expr (datum, component);
   }  
   
   int
  
  
  


Reply via email to