summaryrefslogtreecommitdiffstats
path: root/clang/test
diff options
context:
space:
mode:
authorDavid Majnemer <david.majnemer@gmail.com>2015-03-18 04:15:23 +0000
committerDavid Majnemer <david.majnemer@gmail.com>2015-03-18 04:15:23 +0000
commit28aae9c29b6dd740c4d8da4b7019f2b83bc446b2 (patch)
tree883872fd80aad04f93722c006426f1efb1f75dfd /clang/test
parent91797559acb50c46c77aa200253caefc6acdd11c (diff)
downloadbcm5719-llvm-28aae9c29b6dd740c4d8da4b7019f2b83bc446b2.tar.gz
bcm5719-llvm-28aae9c29b6dd740c4d8da4b7019f2b83bc446b2.zip
MSVC Compat: Permit char16_t, char32_t and _Atomic when targeting > 2013
We disabled support for _Atomic because the STL had name conflicts, they've been resolved in 2015. Similarly, reenable char16_t and char32_t. llvm-svn: 232611
Diffstat (limited to 'clang/test')
-rw-r--r--clang/test/SemaCXX/MicrosoftCompatibility.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/clang/test/SemaCXX/MicrosoftCompatibility.cpp b/clang/test/SemaCXX/MicrosoftCompatibility.cpp
index 56486b8f049..480c7cbdcac 100644
--- a/clang/test/SemaCXX/MicrosoftCompatibility.cpp
+++ b/clang/test/SemaCXX/MicrosoftCompatibility.cpp
@@ -1,9 +1,15 @@
-// RUN: %clang_cc1 %s -triple i686-pc-win32 -fsyntax-only -std=c++11 -Wmicrosoft -verify -fms-compatibility -fexceptions -fcxx-exceptions
-
-
+// RUN: %clang_cc1 %s -triple i686-pc-win32 -fsyntax-only -std=c++11 -Wmicrosoft -verify -fms-compatibility -fexceptions -fcxx-exceptions -fms-compatibility-version=19.00
+// RUN: %clang_cc1 %s -triple i686-pc-win32 -fsyntax-only -std=c++11 -Wmicrosoft -verify -fms-compatibility -fexceptions -fcxx-exceptions -fms-compatibility-version=18.00
+
+#if _MSC_VER >= 1900
+char16_t x;
+char32_t y;
+_Atomic(int) z;
+#else
typedef unsigned short char16_t;
typedef unsigned int char32_t;
struct _Atomic {};
+#endif
typename decltype(3) a; // expected-warning {{expected a qualified name after 'typename'}}
OpenPOWER on IntegriCloud