This patch makes the string/character literal tests run in C,

C++98/03, and C++0x mode, from Craig Topper!


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@136443 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 1 insertions, 6 deletions

diff --git a/test/SemaCXX/type-convert-construct.cpp b/test/SemaCXX/type-convert-construct.cpp
index a367633e48..479af21476 100644
--- a/test/SemaCXX/type-convert-construct.cpp
+++ b/test/SemaCXX/type-convert-construct.cpp
@@ -1,5 +1,4 @@
-// RUN: %clang_cc1 -std=gnu++0x -fsyntax-only -verify %s 
-// Runs in c++0x mode so that char16_t and char32_t are available.
+// RUN: %clang_cc1 -fsyntax-only -verify %s 
 
 void f() {
   float v1 = float(1);
@@ -15,8 +14,4 @@ void f() {
   str = "a string"; // expected-warning{{conversion from string literal to 'char *' is deprecated}}
   wchar_t *wstr;
   wstr = L"a wide string"; // expected-warning{{conversion from string literal to 'wchar_t *' is deprecated}}
-  char16_t *ustr;
-  ustr = u"a UTF-16 string"; // expected-error {{assigning to 'char16_t *' from incompatible type 'const char16_t [16]'}}
-  char32_t *Ustr;
-  Ustr = U"a UTF-32 string"; // expected-error {{assigning to 'char32_t *' from incompatible type 'const char32_t [16]'}}
 }