diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-04-15 05:55:59 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-04-15 05:55:59 +0000 |
| commit | 6c42e7f87f8634d0f698c1f7339adc035d023e52 (patch) | |
| tree | b8af04949e1b1f547526fafd1d1f33673f81893b | |
| parent | 6c00379d492f9295f50a6d392486575a45ee4cc4 (diff) | |
| download | ppe42-gcc-6c42e7f87f8634d0f698c1f7339adc035d023e52.tar.gz ppe42-gcc-6c42e7f87f8634d0f698c1f7339adc035d023e52.zip | |
remove conflict indicators
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26473 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 42 |
1 files changed, 1 insertions, 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 <jason@yorick.cygnus.com> (notype_qualified_id): Don't add template declarators here. Sat Sep 27 16:21:58 1997 Mark Mitchell <mmitchell@usa.net> -<<<<<<< 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 <mmitchell@usa.net> * 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. |
