summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0156-PR-c-48657.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-06-17 17:11:43 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-23 11:50:07 +0100
commit0faa5f72999fea82fadda8bab70abea2303216c7 (patch)
tree05a8c18d2f67d883f94d2bd6f060ab0f4ac7f156 /meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0156-PR-c-48657.patch
parentc2007ba4cdb64fa9e308d3dae395c03ef4cc9161 (diff)
downloadpoky-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/0156-PR-c-48657.patch')
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0156-PR-c-48657.patch58
1 files changed, 0 insertions, 58 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0156-PR-c-48657.patch b/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0156-PR-c-48657.patch
deleted file mode 100644
index c689525203..0000000000
--- a/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0156-PR-c-48657.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1From 03be58e53f230926009974bd7aed6a40a557dc1d Mon Sep 17 00:00:00 2001
2From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
3Date: Wed, 20 Apr 2011 19:39:26 +0000
4Subject: [PATCH] PR c++/48657
5 * decl.c (cp_finish_decl): Handle non-member constant variables
6 in templates, too.
7
8git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@172791 138bc75d-0d04-0410-961f-82ee72b054a4
9
10index 41beef3..61b57ea 100644
11--- a/gcc/cp/decl.c
12+++ b/gcc/cp/decl.c
13@@ -5862,11 +5862,9 @@ cp_finish_decl (tree decl, tree init, bool init_const_expr_p,
14 then it can be used in future constant expressions, so its value
15 must be available. */
16 if (!(init
17- && DECL_CLASS_SCOPE_P (decl)
18- /* We just set TREE_CONSTANT appropriately; see above. */
19- && TREE_CONSTANT (decl)
20+ && init_const_expr_p
21 && !type_dependent_p
22- /* FIXME non-value-dependent constant expression */
23+ && decl_maybe_constant_var_p (decl)
24 && !value_dependent_init_p (init)))
25 {
26 if (init)
27@@ -5878,6 +5876,14 @@ cp_finish_decl (tree decl, tree init, bool init_const_expr_p,
28 goto finish_end;
29 }
30
31+ if (!DECL_CLASS_SCOPE_P (decl))
32+ {
33+ tree init_code = check_initializer (decl, init, flags, &cleanup);
34+ if (init_code)
35+ DECL_INITIAL (decl) = init;
36+ goto finish_end;
37+ }
38+
39 if (TREE_CODE (init) == TREE_LIST)
40 {
41 /* If the parenthesized-initializer form was used (e.g.,
42new file mode 100644
43index 0000000..6552ec6
44--- /dev/null
45+++ b/gcc/testsuite/g++.dg/template/const4.C
46@@ -0,0 +1,9 @@
47+// PR c++/48657
48+
49+template<unsigned> struct A { typedef int T; };
50+
51+template<unsigned> void f()
52+{
53+ const unsigned D = 4;
54+ A<D>::T t;
55+}
56--
571.7.0.4
58