From de229235b979e030b2d9dd1402f40d29e21571ad Mon Sep 17 00:00:00 2001
From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Thu, 6 Jun 2013 11:41:05 +0000
Subject: Implement DR1270: braces can be elided in all aggregate
 initialization, not just copy-list-initialization in a variable declaration.
 This effectively reverts r142147.

llvm-svn: 183397
---
 .../test/SemaCXX/cxx0x-initializer-aggregates.cpp  | 27 +++++++++++-----------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'clang/test/SemaCXX/cxx0x-initializer-aggregates.cpp')

diff --git a/clang/test/SemaCXX/cxx0x-initializer-aggregates.cpp b/clang/test/SemaCXX/cxx0x-initializer-aggregates.cpp
index f53ac6dff93..0e9a97d5bb0 100644
--- a/clang/test/SemaCXX/cxx0x-initializer-aggregates.cpp
+++ b/clang/test/SemaCXX/cxx0x-initializer-aggregates.cpp
@@ -4,7 +4,6 @@ struct one { char c[1]; };
 struct two { char c[2]; };
 
 namespace aggregate {
-  // Direct list initialization does NOT allow braces to be elided!
   struct S {
     int ar[2];
     struct T {
@@ -20,25 +19,25 @@ namespace aggregate {
   };
 
   void bracing() {
-    S s1 = { 1, 2, 3 ,4, 5, 6, 7, 8 }; // no-error
-    S s2{ {1, 2}, {3, 4}, { {5}, {6} }, { {7, 8} } }; // completely braced
-    S s3{ 1, 2, 3, 4, 5, 6 }; // expected-error 5 {{cannot omit braces}}
-    S s4{ {1, 2}, {3, 4}, {5, 6}, { {7, 8} } }; // expected-error 2 {{cannot omit braces}}
-    S s5{ {1, 2}, {3, 4}, { {5}, {6} }, {7, 8} }; // expected-error {{cannot omit braces}}
+    S s1 = { 1, 2, 3 ,4, 5, 6, 7, 8 };
+    S s2{ {1, 2}, {3, 4}, { {5}, {6} }, { {7, 8} } };
+    S s3{ 1, 2, 3, 4, 5, 6 };
+    S s4{ {1, 2}, {3, 4}, {5, 6}, { {7, 8} } };
+    S s5{ {1, 2}, {3, 4}, { {5}, {6} }, {7, 8} };
   }
 
   void bracing_new() {
-    new S{ {1, 2}, {3, 4}, { {5}, {6} }, { {7, 8} } }; // completely braced
-    new S{ 1, 2, 3, 4, 5, 6 }; // expected-error 5 {{cannot omit braces}}
-    new S{ {1, 2}, {3, 4}, {5, 6}, { {7, 8} } }; // expected-error 2 {{cannot omit braces}}
-    new S{ {1, 2}, {3, 4}, { {5}, {6} }, {7, 8} }; // expected-error {{cannot omit braces}}
+    new S{ {1, 2}, {3, 4}, { {5}, {6} }, { {7, 8} } };
+    new S{ 1, 2, 3, 4, 5, 6 };
+    new S{ {1, 2}, {3, 4}, {5, 6}, { {7, 8} } };
+    new S{ {1, 2}, {3, 4}, { {5}, {6} }, {7, 8} };
   }
 
   void bracing_construct() {
-    (void) S{ {1, 2}, {3, 4}, { {5}, {6} }, { {7, 8} } }; // completely braced
-    (void) S{ 1, 2, 3, 4, 5, 6 }; // expected-error 5 {{cannot omit braces}}
-    (void) S{ {1, 2}, {3, 4}, {5, 6}, { {7, 8} } }; // expected-error 2 {{cannot omit braces}}
-    (void) S{ {1, 2}, {3, 4}, { {5}, {6} }, {7, 8} }; // expected-error {{cannot omit braces}}
+    (void) S{ {1, 2}, {3, 4}, { {5}, {6} }, { {7, 8} } };
+    (void) S{ 1, 2, 3, 4, 5, 6 };
+    (void) S{ {1, 2}, {3, 4}, {5, 6}, { {7, 8} } };
+    (void) S{ {1, 2}, {3, 4}, { {5}, {6} }, {7, 8} };
   }
 
   struct String {
-- 
cgit v1.2.3