From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 4 May 2010 19:01:13 +0000 (+0000)
Subject: 	PR c++/38064
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=1a9a3bd19520f9e1b2c869480777c039f31bbeef;hp=9a04fc27b4a24a04018215938cd4d6e095554bb5

	PR c++/38064
	* typeck.c (cp_build_binary_op): Allow enums for <> as well.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159042 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 634a74b9834..3f3b68ec34a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-04  Jason Merrill  <jason@redhat.com>
+
+	PR c++/38064
+	* typeck.c (cp_build_binary_op): Allow enums for <> as well.
+
 2010-05-04  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/43705
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 46bc34dbbb6..e92175f1d32 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -4174,8 +4174,10 @@ cp_build_binary_op (location_t location,
 	}
 
       build_type = boolean_type_node;
-      if ((code0 == INTEGER_TYPE || code0 == REAL_TYPE)
-	   && (code1 == INTEGER_TYPE || code1 == REAL_TYPE))
+      if ((code0 == INTEGER_TYPE || code0 == REAL_TYPE
+	   || code0 == ENUMERAL_TYPE)
+	   && (code1 == INTEGER_TYPE || code1 == REAL_TYPE
+	       || code1 == ENUMERAL_TYPE))
 	short_compare = 1;
       else if (code0 == POINTER_TYPE && code1 == POINTER_TYPE)
 	result_type = composite_pointer_type (type0, type1, op0, op1,
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 737a9f151e2..5b213ca82fd 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-04  Jason Merrill  <jason@redhat.com>
+
+	PR c++/38064
+	* g++.dg/cpp0x/enum3.C: Extend.
+
 2010-05-04  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR target/43799