MatCat.OpenSource/8sa1-gcc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove conflict indicators

Browse Source 
From-SVN: r26473
This commit is contained in:
Jason Merrill 1999-04-15 01:55:59 -04:00
parent b607c87f1f
commit fb8708d7b7
1 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gcc/cp/ChangeLog
View File

@ -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.