From: nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 24 May 2015 23:17:58 +0000 (+0000)
Subject: 	cp/
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e05f806a0f59d22e75c1e9e898bc6c0aeb45dd1d;p=thirdparty%2Fgcc.git

	cp/
	PR c++/66243
	* decl.c (build_enumerator): Don't silently convert scoped enums.

	testsuite/
	PR c++/66243
	* g++.dg/cpp0x/pr66243.C: New.


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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b5168c2a2cb9..92c47388f74a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,4 +1,9 @@
-2015-05-22  Jan Hubicka  <hubicka@ucw.cz>
+2015-05-24  Nathan Sidwell  <nathan@acm.org>
+
+	PR c++/66243
+	* decl.c (build_enumerator): Don't silently convert scoped enums.
+
+2015-05-24  Jan Hubicka  <hubicka@ucw.cz>
 
 	PR lto/66180
 	* mangle.c (mangle_decl): Mangle anonymous namespace types as
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 06fbbd5451f5..41530c129477 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -13097,7 +13097,8 @@ build_enumerator (tree name, tree value, tree enumtype, tree attributes,
 	      if (tmp_value)
 		value = tmp_value;
 	    }
-	  else if (! INTEGRAL_OR_ENUMERATION_TYPE_P (TREE_TYPE (value)))
+	  else if (! INTEGRAL_OR_UNSCOPED_ENUMERATION_TYPE_P
+		   (TREE_TYPE (value)))
 	    value = perform_implicit_conversion_flags
 	      (ENUM_UNDERLYING_TYPE (enumtype), value, tf_warning_or_error,
 	       LOOKUP_IMPLICIT | LOOKUP_NO_NARROWING);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7e6122da2711..e41d7e89fcce 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,4 +1,9 @@
-2015-05-22  Jan Hubicka  <hubicka@ucw.cz>
+2015-05-23  Nathan Sidwell  <nathan@acm.org>
+
+	PR c++/66243
+	* g++.dg/cpp0x/pr66243.C: New.
+
+2015-05-24  Jan Hubicka  <hubicka@ucw.cz>
 
 	PR lto/66180
 	* g++.dg/lto/pr66180_0.C: New testcase.
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr66243.C b/gcc/testsuite/g++.dg/cpp0x/pr66243.C
new file mode 100644
index 000000000000..41465a039265
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/pr66243.C
@@ -0,0 +1,12 @@
+// { dg-do compile { target c++11 } }
+
+enum class A
+{
+  X
+};
+
+enum class B
+{
+  X = A::X // { dg-error "could not convert" }
+};
+