From: Erich Keane Date: Mon, 12 Nov 2018 19:29:26 +0000 (+0000) Subject: [NFC] Fix formatting in inline nested namespace definition. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d905b9e6e2de1e0ab2e36082c6c7e0f926e1bb5;p=clang [NFC] Fix formatting in inline nested namespace definition. Apparently my invocation of clang-format in VIM didn't get this right, but the patch-version DID. This patch just runs CF on this file. Change-Id: Ied462a2d921cbb813fa427740d3ef6e97959b56d git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@346696 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/Parser/cxx2a-inline-nested-namespace-definition.cpp b/test/Parser/cxx2a-inline-nested-namespace-definition.cpp index 8e603d24c0..660287c83f 100644 --- a/test/Parser/cxx2a-inline-nested-namespace-definition.cpp +++ b/test/Parser/cxx2a-inline-nested-namespace-definition.cpp @@ -16,14 +16,14 @@ inline namespace foo4::foo5::foo6 { // expected-error {{nested namespace definit #else // expected-warning@+2 {{inline nested namespace definition is incompatible with C++ standards before C++2a}} #endif -namespace valid1::valid2::inline valid3::inline valid4::valid5{} +namespace valid1::valid2::inline valid3::inline valid4::valid5 {} // expected-note@-1 2 {{previous definition is here}} #if __cplusplus <= 201402L // expected-warning@+3 {{nested namespace definition is a C++17 extension; define each namespace separately}} #endif //expected-warning@+1 2 {{inline namespace reopened as a non-inline namespace}} -namespace valid1::valid2::valid3::valid4::valid5{} +namespace valid1::valid2::valid3::valid4::valid5 {} #if __cplusplus <= 201402L // expected-warning@+7 {{nested namespace definition is a C++17 extension; define each namespace separately}} @@ -33,19 +33,19 @@ namespace valid1::valid2::valid3::valid4::valid5{} #else // expected-warning@+2 {{inline nested namespace definition is incompatible with C++ standards before C++2a}} #endif -namespace valid1::valid2::inline valid3::inline valid4::valid5{} +namespace valid1::valid2::inline valid3::inline valid4::valid5 {} // expected-note@-1 2 {{previous definition is here}} namespace valid1 { - namespace valid2 { +namespace valid2 { //expected-warning@+1 {{inline namespace reopened as a non-inline namespace}} - namespace valid3 { +namespace valid3 { //expected-warning@+1 {{inline namespace reopened as a non-inline namespace}} - namespace valid4 { - namespace valid5 { - } - } - } - } +namespace valid4 { +namespace valid5 { } +} // namespace valid4 +} // namespace valid3 +} // namespace valid2 +} // namespace valid1