OSDN Git Service
(root)
/
pf3gnuchains
/
gcc-fork.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
PR c++/13268, c++/13339
[pf3gnuchains/gcc-fork.git]
/
gcc
/
cp
/
pt.c
diff --git
a/gcc/cp/pt.c
b/gcc/cp/pt.c
index
e7a8863
..
3c0e7d8
100644
(file)
--- a/
gcc/cp/pt.c
+++ b/
gcc/cp/pt.c
@@
-4897,6
+4897,9
@@
tsubst_friend_function (tree decl, tree args)
Then, in S<int>, template <class U> void f(int, U) is not an
instantiation of anything. */
+ if (new_friend == error_mark_node)
+ return error_mark_node;
+
DECL_USE_TEMPLATE (new_friend) = 0;
if (TREE_CODE (decl) == TEMPLATE_DECL)
{