diff options
author | Hans Wennborg <hans@hanshq.net> | 2017-08-11 16:07:17 +0000 |
---|---|---|
committer | Hans Wennborg <hans@hanshq.net> | 2017-08-11 16:07:17 +0000 |
commit | d84167fd28cd57353c9b02d22bc7d4a4eeabf2e5 (patch) | |
tree | 47e5553a482c817a7e873a619e76bafee913ebfe /test | |
parent | 9ae15462ce434ac27321fd104c2969941fc70b71 (diff) |
Merging r310692:
------------------------------------------------------------------------
r310692 | rsmith | 2017-08-10 20:14:20 -0700 (Thu, 10 Aug 2017) | 2 lines
PR33850: Update cxx_dr_status for Clang 5 branch.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_50@310720 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
-rw-r--r-- | test/CXX/drs/dr20xx.cpp | 2 | ||||
-rw-r--r-- | test/CXX/drs/dr4xx.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/CXX/drs/dr20xx.cpp b/test/CXX/drs/dr20xx.cpp index b97a9a46bc..5819c319fd 100644 --- a/test/CXX/drs/dr20xx.cpp +++ b/test/CXX/drs/dr20xx.cpp @@ -10,7 +10,7 @@ #define static_assert(...) _Static_assert(__VA_ARGS__) #endif -namespace dr2094 { // dr2094: 5.0 +namespace dr2094 { // dr2094: 5 struct A { int n; }; struct B { volatile int n; }; static_assert(__is_trivially_copyable(volatile int), ""); diff --git a/test/CXX/drs/dr4xx.cpp b/test/CXX/drs/dr4xx.cpp index a55bb91be5..a30b82f24a 100644 --- a/test/CXX/drs/dr4xx.cpp +++ b/test/CXX/drs/dr4xx.cpp @@ -1202,7 +1202,7 @@ namespace dr495 { // dr495: 3.5 long n2 = s2; } -namespace dr496 { // dr496: sup dr2094 +namespace dr496 { // dr496: sup 2094 struct A { int n; }; struct B { volatile int n; }; int check1[ __is_trivially_copyable(const int) ? 1 : -1]; |