summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0178-PR-c-48707.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0178-PR-c-48707.patch')
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0178-PR-c-48707.patch46
1 files changed, 0 insertions, 46 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0178-PR-c-48707.patch b/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0178-PR-c-48707.patch
deleted file mode 100644
index 275d5edce9..0000000000
--- a/meta/recipes-devtools/gcc/gcc-4.6.0/gcc-4_6-branch-backports/0178-PR-c-48707.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From c2606fe2aa58ae13a13e7ff0b17da61e4565586d Mon Sep 17 00:00:00 2001
2From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
3Date: Mon, 25 Apr 2011 21:53:57 +0000
4Subject: [PATCH] PR c++/48707
5 * pt.c (value_dependent_expression_p): Handle type-dependent
6 expression.
7
8git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@172942 138bc75d-0d04-0410-961f-82ee72b054a4
9
10index ed48203..fc5177d 100644
11--- a/gcc/cp/pt.c
12+++ b/gcc/cp/pt.c
13@@ -18068,6 +18068,11 @@ value_dependent_expression_p (tree expression)
14 if (DECL_P (expression) && type_dependent_expression_p (expression))
15 return true;
16
17+ /* We shouldn't have gotten here for a type-dependent expression, but
18+ let's handle it properly anyway. */
19+ if (TREE_TYPE (expression) == NULL_TREE)
20+ return true;
21+
22 switch (TREE_CODE (expression))
23 {
24 case IDENTIFIER_NODE:
25new file mode 100644
26index 0000000..25354b3
27--- /dev/null
28+++ b/gcc/testsuite/g++.dg/cpp0x/regress/template-const2.C
29@@ -0,0 +1,14 @@
30+// PR c++/48707
31+// { dg-options -std=c++0x }
32+
33+struct A {
34+ static int a();
35+};
36+
37+template<typename X>
38+struct B: A {
39+ static int const b;
40+};
41+
42+template<typename X>
43+int const B<X>::b=B<X>::a();
44--
451.7.0.4
46