diff --git a/include/chrono b/include/chrono index fb26fb82..da550498 100644 --- a/include/chrono +++ b/include/chrono @@ -920,70 +920,70 @@ namespace literals inline namespace chrono_literals { - constexpr chrono::hours operator"" h(unsigned long long __h) - { - return chrono::hours(static_cast(__h)); - } + constexpr chrono::hours operator"" h(unsigned long long __h) + { + return chrono::hours(static_cast(__h)); + } - constexpr chrono::duration> operator"" h(long double __h) - { - return chrono::duration>(__h); - } + constexpr chrono::duration> operator"" h(long double __h) + { + return chrono::duration>(__h); + } - constexpr chrono::minutes operator"" min(unsigned long long __m) - { - return chrono::minutes(static_cast(__m)); - } + constexpr chrono::minutes operator"" min(unsigned long long __m) + { + return chrono::minutes(static_cast(__m)); + } - constexpr chrono::duration> operator"" min(long double __m) - { - return chrono::duration> (__m); - } + constexpr chrono::duration> operator"" min(long double __m) + { + return chrono::duration> (__m); + } - constexpr chrono::seconds operator"" s(unsigned long long __s) - { - return chrono::seconds(static_cast(__s)); - } + constexpr chrono::seconds operator"" s(unsigned long long __s) + { + return chrono::seconds(static_cast(__s)); + } - constexpr chrono::duration operator"" s(long double __s) - { - return chrono::duration (__s); - } + constexpr chrono::duration operator"" s(long double __s) + { + return chrono::duration (__s); + } - constexpr chrono::milliseconds operator"" ms(unsigned long long __ms) - { - return chrono::milliseconds(static_cast(__ms)); - } + constexpr chrono::milliseconds operator"" ms(unsigned long long __ms) + { + return chrono::milliseconds(static_cast(__ms)); + } - constexpr chrono::duration operator"" ms(long double __ms) - { - return chrono::duration(__ms); - } + constexpr chrono::duration operator"" ms(long double __ms) + { + return chrono::duration(__ms); + } - constexpr chrono::microseconds operator"" us(unsigned long long __us) - { - return chrono::microseconds(static_cast(__us)); - } + constexpr chrono::microseconds operator"" us(unsigned long long __us) + { + return chrono::microseconds(static_cast(__us)); + } - constexpr chrono::duration operator"" us(long double __us) - { - return chrono::duration (__us); - } - + constexpr chrono::duration operator"" us(long double __us) + { + return chrono::duration (__us); + } + - constexpr chrono::nanoseconds operator"" ns(unsigned long long __ns) - { - return chrono::nanoseconds(static_cast(__ns)); - } + constexpr chrono::nanoseconds operator"" ns(unsigned long long __ns) + { + return chrono::nanoseconds(static_cast(__ns)); + } - constexpr chrono::duration operator"" ns(long double __ns) - { - return chrono::duration (__ns); - } + constexpr chrono::duration operator"" ns(long double __ns) + { + return chrono::duration (__ns); + } }} #endif diff --git a/include/string b/include/string index 283be3a3..83dc53a1 100644 --- a/include/string +++ b/include/string @@ -4111,29 +4111,29 @@ namespace literals { inline namespace string_literals { - inline _LIBCPP_INLINE_VISIBILITY - basic_string operator "" s( const char *__str, size_t __len ) - { - return basic_string (__str, __len); - } + inline _LIBCPP_INLINE_VISIBILITY + basic_string operator "" s( const char *__str, size_t __len ) + { + return basic_string (__str, __len); + } - inline _LIBCPP_INLINE_VISIBILITY - basic_string operator "" s( const wchar_t *__str, size_t __len ) - { - return basic_string (__str, __len); - } + inline _LIBCPP_INLINE_VISIBILITY + basic_string operator "" s( const wchar_t *__str, size_t __len ) + { + return basic_string (__str, __len); + } - inline _LIBCPP_INLINE_VISIBILITY - basic_string operator "" s( const char16_t *__str, size_t __len ) - { - return basic_string (__str, __len); - } + inline _LIBCPP_INLINE_VISIBILITY + basic_string operator "" s( const char16_t *__str, size_t __len ) + { + return basic_string (__str, __len); + } - inline _LIBCPP_INLINE_VISIBILITY - basic_string operator "" s( const char32_t *__str, size_t __len ) - { - return basic_string (__str, __len); - } + inline _LIBCPP_INLINE_VISIBILITY + basic_string operator "" s( const char32_t *__str, size_t __len ) + { + return basic_string (__str, __len); + } } } #endif diff --git a/test/containers/sequences/list/db_iterators_9.pass.cpp b/test/containers/sequences/list/db_iterators_9.pass.cpp index 6f4a5af3..1437d615 100644 --- a/test/containers/sequences/list/db_iterators_9.pass.cpp +++ b/test/containers/sequences/list/db_iterators_9.pass.cpp @@ -27,7 +27,7 @@ int main() { #if _LIBCPP_STD_VER > 11 { - unsigned lib_asserts; + unsigned lib_asserts; typedef S T; typedef std::list C; diff --git a/test/numerics/complex.number/cmplx.over/imag.pass.cpp b/test/numerics/complex.number/cmplx.over/imag.pass.cpp index a2fe7b74..30c95c3c 100644 --- a/test/numerics/complex.number/cmplx.over/imag.pass.cpp +++ b/test/numerics/complex.number/cmplx.over/imag.pass.cpp @@ -28,8 +28,8 @@ test(typename std::enable_if::value>::type* = 0) #if _LIBCPP_STD_VER > 11 constexpr T val {x}; static_assert(std::imag(val) == 0, ""); - constexpr std::complex t{val, val}; - static_assert(t.imag() == x, "" ); + constexpr std::complex t{val, val}; + static_assert(t.imag() == x, "" ); #endif } @@ -42,8 +42,8 @@ test(typename std::enable_if::value>::type* = 0) #if _LIBCPP_STD_VER > 11 constexpr T val {x}; static_assert(std::imag(val) == 0, ""); - constexpr std::complex t{val, val}; - static_assert(t.imag() == x, "" ); + constexpr std::complex t{val, val}; + static_assert(t.imag() == x, "" ); #endif } diff --git a/test/numerics/complex.number/cmplx.over/real.pass.cpp b/test/numerics/complex.number/cmplx.over/real.pass.cpp index 5824317a..a5a4a35b 100644 --- a/test/numerics/complex.number/cmplx.over/real.pass.cpp +++ b/test/numerics/complex.number/cmplx.over/real.pass.cpp @@ -28,8 +28,8 @@ test(typename std::enable_if::value>::type* = 0) #if _LIBCPP_STD_VER > 11 constexpr T val {x}; static_assert(std::real(val) == val, ""); - constexpr std::complex t{val, val}; - static_assert(t.real() == x, "" ); + constexpr std::complex t{val, val}; + static_assert(t.real() == x, "" ); #endif } @@ -42,8 +42,8 @@ test(typename std::enable_if::value>::type* = 0) #if _LIBCPP_STD_VER > 11 constexpr T val {x}; static_assert(std::real(val) == val, ""); - constexpr std::complex t{val, val}; - static_assert(t.real() == x, "" ); + constexpr std::complex t{val, val}; + static_assert(t.real() == x, "" ); #endif } diff --git a/test/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp b/test/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp index f5ff3fd1..ee138c1e 100644 --- a/test/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp +++ b/test/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp @@ -50,8 +50,8 @@ test() assert(!(lhs != rhs)); } - test_constexpr (); - } + test_constexpr (); + } int main() { diff --git a/test/strings/basic.string.literals/literal.pass.cpp b/test/strings/basic.string.literals/literal.pass.cpp index a2442012..dbb5f681 100644 --- a/test/strings/basic.string.literals/literal.pass.cpp +++ b/test/strings/basic.string.literals/literal.pass.cpp @@ -15,33 +15,33 @@ int main() #if _LIBCPP_STD_VER > 11 using namespace std::literals::string_literals; - static_assert ( std::is_same::value, "" ); - static_assert ( std::is_same::value, "" ); - static_assert ( std::is_same::value, "" ); - static_assert ( std::is_same::value, "" ); - static_assert ( std::is_same::value, "" ); - - std::string foo; - std::wstring Lfoo; - std::u16string ufoo; - std::u32string Ufoo; - - foo = ""s; assert( foo.size() == 0); - foo = u8""s; assert( foo.size() == 0); - Lfoo = L""s; assert(Lfoo.size() == 0); - ufoo = u""s; assert(ufoo.size() == 0); - Ufoo = U""s; assert(Ufoo.size() == 0); - - foo = " "s; assert( foo.size() == 1); - foo = u8" "s; assert( foo.size() == 1); - Lfoo = L" "s; assert(Lfoo.size() == 1); - ufoo = u" "s; assert(ufoo.size() == 1); - Ufoo = U" "s; assert(Ufoo.size() == 1); - - foo = "ABC"s; assert( foo == "ABC"); assert( foo == std::string ( "ABC")); - foo = u8"ABC"s; assert( foo == u8"ABC"); assert( foo == std::string (u8"ABC")); - Lfoo = L"ABC"s; assert(Lfoo == L"ABC"); assert(Lfoo == std::wstring ( L"ABC")); - ufoo = u"ABC"s; assert(ufoo == u"ABC"); assert(ufoo == std::u16string( u"ABC")); - Ufoo = U"ABC"s; assert(Ufoo == U"ABC"); assert(Ufoo == std::u32string( U"ABC")); + static_assert ( std::is_same::value, "" ); + static_assert ( std::is_same::value, "" ); + static_assert ( std::is_same::value, "" ); + static_assert ( std::is_same::value, "" ); + static_assert ( std::is_same::value, "" ); + + std::string foo; + std::wstring Lfoo; + std::u16string ufoo; + std::u32string Ufoo; + + foo = ""s; assert( foo.size() == 0); + foo = u8""s; assert( foo.size() == 0); + Lfoo = L""s; assert(Lfoo.size() == 0); + ufoo = u""s; assert(ufoo.size() == 0); + Ufoo = U""s; assert(Ufoo.size() == 0); + + foo = " "s; assert( foo.size() == 1); + foo = u8" "s; assert( foo.size() == 1); + Lfoo = L" "s; assert(Lfoo.size() == 1); + ufoo = u" "s; assert(ufoo.size() == 1); + Ufoo = U" "s; assert(Ufoo.size() == 1); + + foo = "ABC"s; assert( foo == "ABC"); assert( foo == std::string ( "ABC")); + foo = u8"ABC"s; assert( foo == u8"ABC"); assert( foo == std::string (u8"ABC")); + Lfoo = L"ABC"s; assert(Lfoo == L"ABC"); assert(Lfoo == std::wstring ( L"ABC")); + ufoo = u"ABC"s; assert(ufoo == u"ABC"); assert(ufoo == std::u16string( u"ABC")); + Ufoo = U"ABC"s; assert(Ufoo == U"ABC"); assert(Ufoo == std::u32string( U"ABC")); #endif } diff --git a/test/strings/basic.string.literals/literal1.fail.cpp b/test/strings/basic.string.literals/literal1.fail.cpp index 0901c62c..16641f2b 100644 --- a/test/strings/basic.string.literals/literal1.fail.cpp +++ b/test/strings/basic.string.literals/literal1.fail.cpp @@ -15,7 +15,7 @@ int main() #if _LIBCPP_STD_VER > 11 using namespace std; - std::string foo = ""s; // should fail w/conversion operator not found + std::string foo = ""s; // should fail w/conversion operator not found #else #error #endif diff --git a/test/strings/basic.string.literals/literal1.pass.cpp b/test/strings/basic.string.literals/literal1.pass.cpp index adc2615f..f5143746 100644 --- a/test/strings/basic.string.literals/literal1.pass.cpp +++ b/test/strings/basic.string.literals/literal1.pass.cpp @@ -15,6 +15,6 @@ int main() #if _LIBCPP_STD_VER > 11 using namespace std::literals; - std::string foo = ""s; + std::string foo = ""s; #endif } diff --git a/test/strings/basic.string.literals/literal2.fail.cpp b/test/strings/basic.string.literals/literal2.fail.cpp index 35c63750..68f1d254 100644 --- a/test/strings/basic.string.literals/literal2.fail.cpp +++ b/test/strings/basic.string.literals/literal2.fail.cpp @@ -13,7 +13,7 @@ int main() { #if _LIBCPP_STD_VER > 11 - std::string foo = ""s; // should fail w/conversion operator not found + std::string foo = ""s; // should fail w/conversion operator not found #else #error #endif diff --git a/test/strings/basic.string.literals/literal2.pass.cpp b/test/strings/basic.string.literals/literal2.pass.cpp index 81c03862..86d28e60 100644 --- a/test/strings/basic.string.literals/literal2.pass.cpp +++ b/test/strings/basic.string.literals/literal2.pass.cpp @@ -15,6 +15,6 @@ int main() #if _LIBCPP_STD_VER > 11 using namespace std::literals::string_literals; - std::string foo = ""s; + std::string foo = ""s; #endif } diff --git a/test/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp b/test/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp index 4b6649a0..5b33d1a2 100644 --- a/test/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp +++ b/test/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp @@ -40,7 +40,7 @@ int main() } #if _LIBCPP_STD_VER > 11 { - constexpr auto t1 = std::make_tuple(0, 1, 3.14); + constexpr auto t1 = std::make_tuple(0, 1, 3.14); constexpr int i1 = std::get<1>(t1); constexpr double d1 = std::get<2>(t1); static_assert (i1 == 1, "" ); diff --git a/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type1.fail.cpp b/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type1.fail.cpp index 094f8090..ec63a397 100644 --- a/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type1.fail.cpp +++ b/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type1.fail.cpp @@ -16,9 +16,9 @@ int main() { #if _LIBCPP_STD_VER > 11 - typedef std::complex cf; - auto t1 = std::make_tuple ( 42, "Hi" ); - assert ( std::get(t1) == cf {1,2} ); // no such type + typedef std::complex cf; + auto t1 = std::make_tuple ( 42, "Hi" ); + assert ( std::get(t1) == cf {1,2} ); // no such type #else #error #endif diff --git a/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type2.fail.cpp b/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type2.fail.cpp index 0b2fac04..fde7c69f 100644 --- a/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type2.fail.cpp +++ b/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type2.fail.cpp @@ -16,9 +16,9 @@ int main() { #if _LIBCPP_STD_VER > 11 - typedef std::complex cf; - auto t1 = std::make_tuple ( 42, 21, "Hi", { 1,2 } ); - assert ( std::get(t1) == 42 ); // two ints here + typedef std::complex cf; + auto t1 = std::make_tuple ( 42, 21, "Hi", { 1,2 } ); + assert ( std::get(t1) == 42 ); // two ints here #else #error #endif diff --git a/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type4.fail.cpp b/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type4.fail.cpp index e78c4f10..b6d5773b 100644 --- a/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type4.fail.cpp +++ b/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type4.fail.cpp @@ -16,9 +16,9 @@ int main() { #if _LIBCPP_STD_VER > 11 - typedef std::unique_ptr upint; - std::tuple t(upint(new int(4))); - upint p = std::get(t); + typedef std::unique_ptr upint; + std::tuple t(upint(new int(4))); + upint p = std::get(t); #else #error #endif diff --git a/test/utilities/utility/forward/forward.pass.cpp b/test/utilities/utility/forward/forward.pass.cpp index aed396ee..357b36fa 100644 --- a/test/utilities/utility/forward/forward.pass.cpp +++ b/test/utilities/utility/forward/forward.pass.cpp @@ -72,9 +72,9 @@ int main() #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES #if _LIBCPP_STD_VER > 11 - constexpr int i1 = std::move(23); - static_assert(i1 == 23, "" ); - constexpr int i2 = std::forward(42); - static_assert(i2 == 42, "" ); + constexpr int i1 = std::move(23); + static_assert(i1 == 23, "" ); + constexpr int i2 = std::forward(42); + static_assert(i2 == 42, "" ); #endif } diff --git a/test/utilities/utility/forward/move_if_noexcept.pass.cpp b/test/utilities/utility/forward/move_if_noexcept.pass.cpp index 4a07467b..f94ff2a6 100644 --- a/test/utilities/utility/forward/move_if_noexcept.pass.cpp +++ b/test/utilities/utility/forward/move_if_noexcept.pass.cpp @@ -61,9 +61,9 @@ int main() static_assert((std::is_same::value), ""); #if _LIBCPP_STD_VER > 11 - constexpr int i1 = 23; - constexpr int i2 = std::move_if_noexcept(i1); - static_assert(i2 == 23, "" ); + constexpr int i1 = 23; + constexpr int i2 = std::move_if_noexcept(i1); + static_assert(i2 == 23, "" ); #endif } diff --git a/test/utilities/utility/pairs/pair.astuple/pairs.by.type3.fail.cpp b/test/utilities/utility/pairs/pair.astuple/pairs.by.type3.fail.cpp index 8bf35c7b..48434734 100644 --- a/test/utilities/utility/pairs/pair.astuple/pairs.by.type3.fail.cpp +++ b/test/utilities/utility/pairs/pair.astuple/pairs.by.type3.fail.cpp @@ -15,9 +15,9 @@ int main() { #if _LIBCPP_STD_VER > 11 - typedef std::unique_ptr upint; - std::pair t(upint(new int(4)), 23); - upint p = std::get(t); + typedef std::unique_ptr upint; + std::pair t(upint(new int(4)), 23); + upint p = std::get(t); #else #error #endif diff --git a/test/utilities/utility/pairs/pairs.pair/default.pass.cpp b/test/utilities/utility/pairs/pairs.pair/default.pass.cpp index 18fdb47b..bb6661f7 100644 --- a/test/utilities/utility/pairs/pairs.pair/default.pass.cpp +++ b/test/utilities/utility/pairs/pairs.pair/default.pass.cpp @@ -23,8 +23,8 @@ int main() P p; assert(p.first == 0.0f); assert(p.second == nullptr); - } - + } + #if _LIBCPP_STD_VER > 11 { typedef std::pair P;