revert: re PR c++/15875 (rejects pointer to member in template)

	Revert:
	2005-05-01  Mark Mitchell  <mark@codesourcery.com>
	* typeck.c (unary_complex_lvalue): In a template, always refuse
	simplifications.

	PR c++/15875
	* g++.dg/template/ptrmem14.C: New test.

From-SVN: r99117

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6e354ff7363b056a4a716329e25cb904fac6a247..6365b27b086660e6733f5168ae60bb99a32e5cd5 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-02  Mark Mitchell  <mark@codesourcery.com>
+
+       Revert:
+       2005-05-01  Mark Mitchell  <mark@codesourcery.com>
+       * typeck.c (unary_complex_lvalue): In a template, always refuse
+       simplifications.
+
 2005-05-01  Mark Mitchell  <mark@codesourcery.com>
 
        Backport:

diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 3af17a8b95f0f46140af3719e5a4d6b6f2233fa2..0c9c6c4630b1feb2a0e3963e5c862dc629877e49 100644 (file)
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -4172,12 +4172,6 @@ build_unary_op (enum tree_code code, tree xarg, int noconvert)
 tree
 unary_complex_lvalue (enum tree_code code, tree arg)
 {
-  /* Inside a template, making these kinds of adjustments is
-     pointless; we are only concerned with the type of the
-     expression.  */
-  if (processing_template_decl)
-    return NULL_TREE;
-
   /* Handle (a, b) used as an "lvalue".  */
   if (TREE_CODE (arg) == COMPOUND_EXPR)
     {

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 990f45f2e620dcb95a73f62c8819d18d4ce66a6a..67b991b9a4b48579bc6de4c84aaeec17ee5860a1 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-02  Mark Mitchell  <mark@codesourcery.com>
+
+       PR c++/15875
+       * g++.dg/template/ptrmem14.C: New test.
+
 2005-05-01  Mark Mitchell  <mark@codesourcery.com>
 
        Backport: