aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@gcc.gnu.org>2017-05-09 16:37:57 -0400
committerJason Merrill <jason@gcc.gnu.org>2017-05-09 16:37:57 -0400
commit824c3184d7364aa92e9990b4f23cd5ede4ca53df (patch)
tree2df2d9c6aac3192014000a9c2270f165a8d55431 /gcc
parent65d7adba7ba2736bb7f11f4728c084f85f76cf86 (diff)
downloadgcc-824c3184d7364aa92e9990b4f23cd5ede4ca53df.zip
gcc-824c3184d7364aa92e9990b4f23cd5ede4ca53df.tar.gz
gcc-824c3184d7364aa92e9990b4f23cd5ede4ca53df.tar.bz2
* g++.dg/cpp1z/direct-enum-init1.C: Correct error message.
From-SVN: r247815
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/g++.dg/cpp1z/direct-enum-init1.C4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/testsuite/g++.dg/cpp1z/direct-enum-init1.C b/gcc/testsuite/g++.dg/cpp1z/direct-enum-init1.C
index a17473f..11269cc 100644
--- a/gcc/testsuite/g++.dg/cpp1z/direct-enum-init1.C
+++ b/gcc/testsuite/g++.dg/cpp1z/direct-enum-init1.C
@@ -22,7 +22,7 @@ foo ()
C c1 { s };
D d1 { D(t) }; // { dg-error "invalid cast from type 'T' to type 'D {enum}'" }
D d2 { t }; // { dg-error "cannot convert 'T' to 'D {enum}' in initialization" "" { target c++14_down } }
- // { dg-error "invalid cast from type 'T' to type 'D'" "" { target c++1z } .-1 }
+ // { dg-error "invalid cast from type 'T' to type 'D {enum}'" "" { target c++1z } .-1 }
D d3 { 9 }; // { dg-error "cannot convert 'int' to 'D {enum}' in initialization" "" { target c++14_down } }
D d4 { l }; // { dg-error "cannot convert 'long int' to 'D {enum}' in initialization" "" { target c++14_down } }
D d5 { D(l) };
@@ -89,7 +89,7 @@ foo2 ()
C c1 { s };
D d1 { D(t) }; // { dg-error "invalid cast from type 'T' to type 'D {enum}'" }
D d2 { t }; // { dg-error "cannot convert 'T' to 'D {enum}' in initialization" "" { target c++14_down } }
- // { dg-error "invalid cast from type 'T' to type 'D'" "" { target c++1z } .-1 }
+ // { dg-error "invalid cast from type 'T' to type 'D {enum}'" "" { target c++1z } .-1 }
D d3 { 9 }; // { dg-error "cannot convert 'int' to 'D {enum}' in initialization" "" { target c++14_down } }
D d4 { l }; // { dg-error "cannot convert 'long int' to 'D {enum}' in initialization" "" { target c++14_down } }
D d5 { D(l) };