From fb8708d7b74bc42547e4bf31ed4f27f19add0efc Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 15 Apr 1999 01:55:59 -0400 Subject: [PATCH] remove conflict indicators From-SVN: r26473 --- gcc/cp/ChangeLog | 42 +----------------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b4adb084143..c2c55829f01 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -9172,26 +9172,6 @@ Sat Sep 27 16:22:48 1997 Jason Merrill (notype_qualified_id): Don't add template declarators here. Sat Sep 27 16:21:58 1997 Mark Mitchell -<<<<<<< ChangeLog -<<<<<<< ChangeLog - - * call.c (add_template_candidate): Add explicit_targs parameter. - (build_scoped_method_call): Use it. - (build_overload_call_real): Likewise. - (build_user_type_conversion_1): Likewise. - (build_new_function_call): Likewise. - (build_object_call): Likewise. - (build_new_op): Likewise. - (build_new_method_call): Likewise. - (build_new_function_call): Handle TEMPLATE_ID_EXPR. - (build_new_method_call): Likewise. - - * class.c (finish_struct_methods): Add specialization pass to - determine which methods were specializing which other methods. - (instantiate_type): Handle TEMPLATE_ID_EXPR. -======= -======= ->>>>>>> 1.996 * call.c (add_template_candidate): Add explicit_targs parameter. (build_scoped_method_call): Use it. @@ -9236,31 +9216,11 @@ Sat Sep 27 16:21:58 1997 Mark Mitchell * friend.c (do_friend): Don't call pushdecl for template instantiations. -<<<<<<< ChangeLog ->>>>>>> 1.988 -======= ->>>>>>> 1.996 - -<<<<<<< ChangeLog -<<<<<<< ChangeLog - * init.c (build_member_call): Handle TEMPLATE_ID_EXPR. - - * lang-options.h: Add -fname-mangling-version, -fguiding-decls, -======= -======= ->>>>>>> 1.996 + * init.c (build_member_call): Handle TEMPLATE_ID_EXPR. * lang-options.h: Add -fname-mangling-version, -fguiding-decls, and -fno-guiding-decls. -<<<<<<< ChangeLog -<<<<<<< ChangeLog - - * lex.c (identifier_type): Return PFUNCNAME for template function - names. -======= -======= ->>>>>>> 1.996 * lex.c (identifier_type): Return PFUNCNAME for template function names. -- 2.30.2