2013-08-09 Paolo Carlini <paolo.carlini@oracle.com>
Revert:
2013-08-07 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/46206
* name-lookup.c (lookup_name_real_1): Handle iter->type before
iter->value.
/testsuite
2013-08-09 Paolo Carlini <paolo.carlini@oracle.com>
Revert:
2013-08-07 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/46206
* g++.dg/lookup/typedef2.C: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@201629
138bc75d-0d04-0410-961f-
82ee72b054a4
+2013-08-09 Paolo Carlini <paolo.carlini@oracle.com>
+
+ Revert:
+ 2013-08-07 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR c++/46206
+ * name-lookup.c (lookup_name_real_1): Handle iter->type before
+ iter->value.
+
2013-08-07 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/46206
continue;
/* If this is the kind of thing we're looking for, we're done. */
- if ((flags & LOOKUP_PREFER_TYPES)
- && qualify_lookup (iter->type, flags))
- binding = iter->type;
- else if (qualify_lookup (iter->value, flags))
+ if (qualify_lookup (iter->value, flags))
binding = iter->value;
+ else if ((flags & LOOKUP_PREFER_TYPES)
+ && qualify_lookup (iter->type, flags))
+ binding = iter->type;
else
binding = NULL_TREE;
+2013-08-09 Paolo Carlini <paolo.carlini@oracle.com>
+
+ Revert:
+ 2013-08-07 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR c++/46206
+ * g++.dg/lookup/typedef2.C: New.
+
2013-08-09 James Greenhalgh <james.greenhalgh@arm.com>
* gcc.target/aarch64/scalar_intrinsics.c: Update expected
+++ /dev/null
-// PR c++/46206
-
-class Foo1
-{
- int u, v, w, x;
- typedef struct Bar { } Bar;
- virtual void foo(void) {
- struct Bar bar;
- }
-};
-
-class Foo2
-{
- int u, v, w;
- typedef struct Bar { } Bar;
- Bar bar;
- virtual void foo(void) {
- struct Bar bar;
- }
-};
-
-class Foo3
-{
- int u, v, w;
- typedef struct Bar { } Bar;
- int Bar; // { dg-error "conflicts" }
- virtual void foo(void) {
- struct Bar bar;
- }
-};