re PR c++/51319 (Eigen3 enums not accepted)

gcc/testsuite/ChangeLog

2011-12-05  Fabien Chene  <fabien@gcc.gnu.org>

	PR c++/51319
	* g++.dg/lookup/using50.C: New.
	* g++.dg/lookup/using51.C: New.

gcc/cp/ChangeLog

2011-12-05  Fabien Chene  <fabien@gcc.gnu.org>

	PR c++/51319
	* semantics.c (finish_id_expression): Strip using declarations
	early in the function.

From-SVN: r182029

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index cca601d3973681c9f043aca3308035e52a4dfd74..9a1043a1a9b69c03484938656b2221c4a4cf7c74 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -2893,6 +2893,8 @@ finish_id_expression (tree id_expression,
                      const char **error_msg,
                      location_t location)
 {
+  decl = strip_using_decl (decl);
+
   /* Initialize the output parameters.  */
   *idk = CP_ID_KIND_NONE;
   *error_msg = NULL;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index efb2ed42af3025311d68ab34e14303886da32cbd..12709b770b77ed08d2b7d2a772aa06f4e1620bbf 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-05  Fabien Chêne  <fabien@gcc.gnu.org>
+
+       PR c++/51319
+       * g++.dg/lookup/using50.C: New.
+       * g++.dg/lookup/using51.C: New.
+
 2011-12-05  Jakub Jelinek  <jakub@redhat.com>
 
        PR tree-optimization/51396

diff --git a/gcc/testsuite/g++.dg/lookup/using50.C b/gcc/testsuite/g++.dg/lookup/using50.C
new file mode 100644 (file)
index 0000000..d525a47
--- /dev/null
+++ b/gcc/testsuite/g++.dg/lookup/using50.C
@@ -0,0 +1,15 @@
+// PR c++/51319
+// { dg-do compile }
+
+template<int> struct X {};
+
+struct Base 
+{
+    enum { a = 1 };
+};
+
+struct Der : Base 
+{
+    using Base::a;
+    typedef X<(int)a> Y;
+};

diff --git a/gcc/testsuite/g++.dg/lookup/using51.C b/gcc/testsuite/g++.dg/lookup/using51.C
new file mode 100644 (file)
index 0000000..8438f7f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/lookup/using51.C
@@ -0,0 +1,17 @@
+// PR c++/51382
+// { dg-do compile }
+
+template< int Value >
+struct Base
+{
+   enum { b_e = Value };
+};
+
+template< typename Type >
+struct Derived : Type
+{
+   Type::b_e;
+   enum { d_e = b_e };
+};
+
+int v = (int)Derived< Base< 3 > >::d_e;