From: Mark Mitchell <mark@codesourcery.com>
Date: Mon, 2 May 2005 18:38:51 +0000 (+0000)
Subject: revert: re PR c++/15875 (rejects pointer to member in template)
X-Git-Tag: releases/gcc-3.4.4~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=199ba38e23be36f633ad94cb4971fa02d0fb7eef;p=thirdparty%2Fgcc.git

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 6e354ff7363b..6365b27b0866 100644
--- 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 3af17a8b95f0..0c9c6c4630b1 100644
--- 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 990f45f2e620..67b991b9a4b4 100644
--- 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: