diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-06-17 17:11:43 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-23 11:50:07 +0100 |
commit | 0faa5f72999fea82fadda8bab70abea2303216c7 (patch) | |
tree | 05a8c18d2f67d883f94d2bd6f060ab0f4ac7f156 /meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0187-PR-c-42687.patch | |
parent | c2007ba4cdb64fa9e308d3dae395c03ef4cc9161 (diff) | |
download | poky-0faa5f72999fea82fadda8bab70abea2303216c7.tar.gz |
gcc-4.6: Switch to using svn SRC_URI for recipe
We call the recipes 4.6
Remove the backport patches
(From OE-Core rev: 68b545f4ff719f2b6e57d68b002dc9845c7a14ae)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0187-PR-c-42687.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0187-PR-c-42687.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0187-PR-c-42687.patch b/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0187-PR-c-42687.patch deleted file mode 100644 index 9f3514ca72..0000000000 --- a/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0187-PR-c-42687.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | From ccb3ae3a3167213d1c84397653a7cfec0df3a5b7 Mon Sep 17 00:00:00 2001 | ||
2 | From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | ||
3 | Date: Wed, 27 Apr 2011 05:20:06 +0000 | ||
4 | Subject: [PATCH] PR c++/42687 | ||
5 | * parser.c (cp_parser_primary_expression): Set *idk to | ||
6 | CP_ID_KIND_NONE for a parenthesized identifier. | ||
7 | |||
8 | git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@173008 138bc75d-0d04-0410-961f-82ee72b054a4 | ||
9 | |||
10 | index ba3a98f..9d8457f 100644 | ||
11 | --- a/gcc/cp/parser.c | ||
12 | +++ b/gcc/cp/parser.c | ||
13 | @@ -3696,6 +3696,12 @@ cp_parser_primary_expression (cp_parser *parser, | ||
14 | `&A::B' might be a pointer-to-member, but `&(A::B)' is | ||
15 | not. */ | ||
16 | finish_parenthesized_expr (expr); | ||
17 | + /* DR 705: Wrapping an unqualified name in parentheses | ||
18 | + suppresses arg-dependent lookup. We want to pass back | ||
19 | + CP_ID_KIND_QUALIFIED for suppressing vtable lookup | ||
20 | + (c++/37862), but none of the others. */ | ||
21 | + if (*idk != CP_ID_KIND_QUALIFIED) | ||
22 | + *idk = CP_ID_KIND_NONE; | ||
23 | } | ||
24 | /* The `>' token might be the end of a template-id or | ||
25 | template-parameter-list now. */ | ||
26 | new file mode 100644 | ||
27 | index 0000000..625a181 | ||
28 | --- /dev/null | ||
29 | +++ b/gcc/testsuite/g++.dg/lookup/koenig13.C | ||
30 | @@ -0,0 +1,16 @@ | ||
31 | +// PR c++/42687 | ||
32 | +// DR 705 | ||
33 | + | ||
34 | +namespace N | ||
35 | +{ | ||
36 | + struct S { }; | ||
37 | + void f(const S &) { } | ||
38 | +} | ||
39 | + | ||
40 | +void f(const N::S &) { } | ||
41 | + | ||
42 | +int main() | ||
43 | +{ | ||
44 | + N::S v; | ||
45 | + (f)(v); // no ambiguity: ADL is prevented with (), only ::f is considered | ||
46 | +} | ||
47 | -- | ||
48 | 1.7.0.4 | ||
49 | |||