summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2013-08-07 19:39:48 +0000
committerHoward Hinnant <hhinnant@apple.com>2013-08-07 19:39:48 +0000
commitd098713aaf902ea7d4729b73f83af461dac45a0d (patch)
tree41fdfd9bfdea111c80febb2d08c27fb31fd44085
parentc5582b57c60e25ab2c2108f2c48e18c0b122bb6d (diff)
downloadbcm5719-llvm-d098713aaf902ea7d4729b73f83af461dac45a0d.tar.gz
bcm5719-llvm-d098713aaf902ea7d4729b73f83af461dac45a0d.zip
War on tabs
llvm-svn: 187906
-rw-r--r--libcxx/include/chrono128
-rw-r--r--libcxx/include/string46
-rw-r--r--libcxx/test/containers/sequences/list/db_iterators_9.pass.cpp2
-rw-r--r--libcxx/test/numerics/complex.number/cmplx.over/imag.pass.cpp8
-rw-r--r--libcxx/test/numerics/complex.number/cmplx.over/real.pass.cpp8
-rw-r--r--libcxx/test/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp4
-rw-r--r--libcxx/test/strings/basic.string.literals/literal.pass.cpp56
-rw-r--r--libcxx/test/strings/basic.string.literals/literal1.fail.cpp2
-rw-r--r--libcxx/test/strings/basic.string.literals/literal1.pass.cpp2
-rw-r--r--libcxx/test/strings/basic.string.literals/literal2.fail.cpp2
-rw-r--r--libcxx/test/strings/basic.string.literals/literal2.pass.cpp2
-rw-r--r--libcxx/test/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp2
-rw-r--r--libcxx/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type1.fail.cpp6
-rw-r--r--libcxx/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type2.fail.cpp6
-rw-r--r--libcxx/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type4.fail.cpp6
-rw-r--r--libcxx/test/utilities/utility/forward/forward.pass.cpp8
-rw-r--r--libcxx/test/utilities/utility/forward/move_if_noexcept.pass.cpp6
-rw-r--r--libcxx/test/utilities/utility/pairs/pair.astuple/pairs.by.type3.fail.cpp6
-rw-r--r--libcxx/test/utilities/utility/pairs/pairs.pair/default.pass.cpp4
19 files changed, 152 insertions, 152 deletions
diff --git a/libcxx/include/chrono b/libcxx/include/chrono
index fb26fb824ad..da550498b45 100644
--- a/libcxx/include/chrono
+++ b/libcxx/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<chrono::hours::rep>(__h));
- }
-
- constexpr chrono::duration<long double, ratio<3600,1>> operator"" h(long double __h)
- {
- return chrono::duration<long double, ratio<3600,1>>(__h);
- }
-
-
- constexpr chrono::minutes operator"" min(unsigned long long __m)
- {
- return chrono::minutes(static_cast<chrono::minutes::rep>(__m));
- }
-
- constexpr chrono::duration<long double, ratio<60,1>> operator"" min(long double __m)
- {
- return chrono::duration<long double, ratio<60,1>> (__m);
- }
-
-
- constexpr chrono::seconds operator"" s(unsigned long long __s)
- {
- return chrono::seconds(static_cast<chrono::seconds::rep>(__s));
- }
-
- constexpr chrono::duration<long double> operator"" s(long double __s)
- {
- return chrono::duration<long double> (__s);
- }
-
-
- constexpr chrono::milliseconds operator"" ms(unsigned long long __ms)
- {
- return chrono::milliseconds(static_cast<chrono::milliseconds::rep>(__ms));
- }
-
- constexpr chrono::duration<long double, milli> operator"" ms(long double __ms)
- {
- return chrono::duration<long double, milli>(__ms);
- }
-
-
- constexpr chrono::microseconds operator"" us(unsigned long long __us)
- {
- return chrono::microseconds(static_cast<chrono::microseconds::rep>(__us));
- }
-
- constexpr chrono::duration<long double, micro> operator"" us(long double __us)
- {
- return chrono::duration<long double, micro> (__us);
- }
-
-
- constexpr chrono::nanoseconds operator"" ns(unsigned long long __ns)
- {
- return chrono::nanoseconds(static_cast<chrono::nanoseconds::rep>(__ns));
- }
-
- constexpr chrono::duration<long double, nano> operator"" ns(long double __ns)
- {
- return chrono::duration<long double, nano> (__ns);
- }
+ constexpr chrono::hours operator"" h(unsigned long long __h)
+ {
+ return chrono::hours(static_cast<chrono::hours::rep>(__h));
+ }
+
+ constexpr chrono::duration<long double, ratio<3600,1>> operator"" h(long double __h)
+ {
+ return chrono::duration<long double, ratio<3600,1>>(__h);
+ }
+
+
+ constexpr chrono::minutes operator"" min(unsigned long long __m)
+ {
+ return chrono::minutes(static_cast<chrono::minutes::rep>(__m));
+ }
+
+ constexpr chrono::duration<long double, ratio<60,1>> operator"" min(long double __m)
+ {
+ return chrono::duration<long double, ratio<60,1>> (__m);
+ }
+
+
+ constexpr chrono::seconds operator"" s(unsigned long long __s)
+ {
+ return chrono::seconds(static_cast<chrono::seconds::rep>(__s));
+ }
+
+ constexpr chrono::duration<long double> operator"" s(long double __s)
+ {
+ return chrono::duration<long double> (__s);
+ }
+
+
+ constexpr chrono::milliseconds operator"" ms(unsigned long long __ms)
+ {
+ return chrono::milliseconds(static_cast<chrono::milliseconds::rep>(__ms));
+ }
+
+ constexpr chrono::duration<long double, milli> operator"" ms(long double __ms)
+ {
+ return chrono::duration<long double, milli>(__ms);
+ }
+
+
+ constexpr chrono::microseconds operator"" us(unsigned long long __us)
+ {
+ return chrono::microseconds(static_cast<chrono::microseconds::rep>(__us));
+ }
+
+ constexpr chrono::duration<long double, micro> operator"" us(long double __us)
+ {
+ return chrono::duration<long double, micro> (__us);
+ }
+
+
+ constexpr chrono::nanoseconds operator"" ns(unsigned long long __ns)
+ {
+ return chrono::nanoseconds(static_cast<chrono::nanoseconds::rep>(__ns));
+ }
+
+ constexpr chrono::duration<long double, nano> operator"" ns(long double __ns)
+ {
+ return chrono::duration<long double, nano> (__ns);
+ }
}}
#endif
diff --git a/libcxx/include/string b/libcxx/include/string
index 283be3a35bc..83dc53a1097 100644
--- a/libcxx/include/string
+++ b/libcxx/include/string
@@ -4111,29 +4111,29 @@ namespace literals
{
inline namespace string_literals
{
- inline _LIBCPP_INLINE_VISIBILITY
- basic_string<char> operator "" s( const char *__str, size_t __len )
- {
- return basic_string<char> (__str, __len);
- }
-
- inline _LIBCPP_INLINE_VISIBILITY
- basic_string<wchar_t> operator "" s( const wchar_t *__str, size_t __len )
- {
- return basic_string<wchar_t> (__str, __len);
- }
-
- inline _LIBCPP_INLINE_VISIBILITY
- basic_string<char16_t> operator "" s( const char16_t *__str, size_t __len )
- {
- return basic_string<char16_t> (__str, __len);
- }
-
- inline _LIBCPP_INLINE_VISIBILITY
- basic_string<char32_t> operator "" s( const char32_t *__str, size_t __len )
- {
- return basic_string<char32_t> (__str, __len);
- }
+ inline _LIBCPP_INLINE_VISIBILITY
+ basic_string<char> operator "" s( const char *__str, size_t __len )
+ {
+ return basic_string<char> (__str, __len);
+ }
+
+ inline _LIBCPP_INLINE_VISIBILITY
+ basic_string<wchar_t> operator "" s( const wchar_t *__str, size_t __len )
+ {
+ return basic_string<wchar_t> (__str, __len);
+ }
+
+ inline _LIBCPP_INLINE_VISIBILITY
+ basic_string<char16_t> operator "" s( const char16_t *__str, size_t __len )
+ {
+ return basic_string<char16_t> (__str, __len);
+ }
+
+ inline _LIBCPP_INLINE_VISIBILITY
+ basic_string<char32_t> operator "" s( const char32_t *__str, size_t __len )
+ {
+ return basic_string<char32_t> (__str, __len);
+ }
}
}
#endif
diff --git a/libcxx/test/containers/sequences/list/db_iterators_9.pass.cpp b/libcxx/test/containers/sequences/list/db_iterators_9.pass.cpp
index 6f4a5af3633..1437d615941 100644
--- a/libcxx/test/containers/sequences/list/db_iterators_9.pass.cpp
+++ b/libcxx/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<T> C;
diff --git a/libcxx/test/numerics/complex.number/cmplx.over/imag.pass.cpp b/libcxx/test/numerics/complex.number/cmplx.over/imag.pass.cpp
index a2fe7b74844..30c95c3c88d 100644
--- a/libcxx/test/numerics/complex.number/cmplx.over/imag.pass.cpp
+++ b/libcxx/test/numerics/complex.number/cmplx.over/imag.pass.cpp
@@ -28,8 +28,8 @@ test(typename std::enable_if<std::is_integral<T>::value>::type* = 0)
#if _LIBCPP_STD_VER > 11
constexpr T val {x};
static_assert(std::imag(val) == 0, "");
- constexpr std::complex<T> t{val, val};
- static_assert(t.imag() == x, "" );
+ constexpr std::complex<T> t{val, val};
+ static_assert(t.imag() == x, "" );
#endif
}
@@ -42,8 +42,8 @@ test(typename std::enable_if<!std::is_integral<T>::value>::type* = 0)
#if _LIBCPP_STD_VER > 11
constexpr T val {x};
static_assert(std::imag(val) == 0, "");
- constexpr std::complex<T> t{val, val};
- static_assert(t.imag() == x, "" );
+ constexpr std::complex<T> t{val, val};
+ static_assert(t.imag() == x, "" );
#endif
}
diff --git a/libcxx/test/numerics/complex.number/cmplx.over/real.pass.cpp b/libcxx/test/numerics/complex.number/cmplx.over/real.pass.cpp
index 5824317afbd..a5a4a35b13c 100644
--- a/libcxx/test/numerics/complex.number/cmplx.over/real.pass.cpp
+++ b/libcxx/test/numerics/complex.number/cmplx.over/real.pass.cpp
@@ -28,8 +28,8 @@ test(typename std::enable_if<std::is_integral<T>::value>::type* = 0)
#if _LIBCPP_STD_VER > 11
constexpr T val {x};
static_assert(std::real(val) == val, "");
- constexpr std::complex<T> t{val, val};
- static_assert(t.real() == x, "" );
+ constexpr std::complex<T> t{val, val};
+ static_assert(t.real() == x, "" );
#endif
}
@@ -42,8 +42,8 @@ test(typename std::enable_if<!std::is_integral<T>::value>::type* = 0)
#if _LIBCPP_STD_VER > 11
constexpr T val {x};
static_assert(std::real(val) == val, "");
- constexpr std::complex<T> t{val, val};
- static_assert(t.real() == x, "" );
+ constexpr std::complex<T> t{val, val};
+ static_assert(t.real() == x, "" );
#endif
}
diff --git a/libcxx/test/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp b/libcxx/test/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp
index f5ff3fd1dac..ee138c1ecbc 100644
--- a/libcxx/test/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp
+++ b/libcxx/test/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp
@@ -50,8 +50,8 @@ test()
assert(!(lhs != rhs));
}
- test_constexpr<T> ();
- }
+ test_constexpr<T> ();
+ }
int main()
{
diff --git a/libcxx/test/strings/basic.string.literals/literal.pass.cpp b/libcxx/test/strings/basic.string.literals/literal.pass.cpp
index a2442012fcf..dbb5f681395 100644
--- a/libcxx/test/strings/basic.string.literals/literal.pass.cpp
+++ b/libcxx/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<decltype( "Hi"s), std::string>::value, "" );
- static_assert ( std::is_same<decltype( u8"Hi"s), std::string>::value, "" );
- static_assert ( std::is_same<decltype( L"Hi"s), std::wstring>::value, "" );
- static_assert ( std::is_same<decltype( u"Hi"s), std::u16string>::value, "" );
- static_assert ( std::is_same<decltype( U"Hi"s), std::u32string>::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<decltype( "Hi"s), std::string>::value, "" );
+ static_assert ( std::is_same<decltype( u8"Hi"s), std::string>::value, "" );
+ static_assert ( std::is_same<decltype( L"Hi"s), std::wstring>::value, "" );
+ static_assert ( std::is_same<decltype( u"Hi"s), std::u16string>::value, "" );
+ static_assert ( std::is_same<decltype( U"Hi"s), std::u32string>::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/libcxx/test/strings/basic.string.literals/literal1.fail.cpp b/libcxx/test/strings/basic.string.literals/literal1.fail.cpp
index 0901c62c8ca..16641f2b57d 100644
--- a/libcxx/test/strings/basic.string.literals/literal1.fail.cpp
+++ b/libcxx/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/libcxx/test/strings/basic.string.literals/literal1.pass.cpp b/libcxx/test/strings/basic.string.literals/literal1.pass.cpp
index adc2615f249..f5143746b0b 100644
--- a/libcxx/test/strings/basic.string.literals/literal1.pass.cpp
+++ b/libcxx/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/libcxx/test/strings/basic.string.literals/literal2.fail.cpp b/libcxx/test/strings/basic.string.literals/literal2.fail.cpp
index 35c63750709..68f1d254e32 100644
--- a/libcxx/test/strings/basic.string.literals/literal2.fail.cpp
+++ b/libcxx/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/libcxx/test/strings/basic.string.literals/literal2.pass.cpp b/libcxx/test/strings/basic.string.literals/literal2.pass.cpp
index 81c03862d2b..86d28e60e52 100644
--- a/libcxx/test/strings/basic.string.literals/literal2.pass.cpp
+++ b/libcxx/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/libcxx/test/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp b/libcxx/test/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp
index 4b6649a0507..5b33d1a23f8 100644
--- a/libcxx/test/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp
+++ b/libcxx/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/libcxx/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type1.fail.cpp b/libcxx/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type1.fail.cpp
index 094f8090542..ec63a3974e9 100644
--- a/libcxx/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type1.fail.cpp
+++ b/libcxx/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<float> cf;
- auto t1 = std::make_tuple<int, std::string> ( 42, "Hi" );
- assert ( std::get<cf>(t1) == cf {1,2} ); // no such type
+ typedef std::complex<float> cf;
+ auto t1 = std::make_tuple<int, std::string> ( 42, "Hi" );
+ assert ( std::get<cf>(t1) == cf {1,2} ); // no such type
#else
#error
#endif
diff --git a/libcxx/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type2.fail.cpp b/libcxx/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type2.fail.cpp
index 0b2fac04c1a..fde7c69f761 100644
--- a/libcxx/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type2.fail.cpp
+++ b/libcxx/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<float> cf;
- auto t1 = std::make_tuple<int, int, std::string, cf> ( 42, 21, "Hi", { 1,2 } );
- assert ( std::get<int>(t1) == 42 ); // two ints here
+ typedef std::complex<float> cf;
+ auto t1 = std::make_tuple<int, int, std::string, cf> ( 42, 21, "Hi", { 1,2 } );
+ assert ( std::get<int>(t1) == 42 ); // two ints here
#else
#error
#endif
diff --git a/libcxx/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type4.fail.cpp b/libcxx/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type4.fail.cpp
index e78c4f107c2..b6d5773be38 100644
--- a/libcxx/test/utilities/tuple/tuple.tuple/tuple.elem/tuple.by.type4.fail.cpp
+++ b/libcxx/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<int> upint;
- std::tuple<upint> t(upint(new int(4)));
- upint p = std::get<upint>(t);
+ typedef std::unique_ptr<int> upint;
+ std::tuple<upint> t(upint(new int(4)));
+ upint p = std::get<upint>(t);
#else
#error
#endif
diff --git a/libcxx/test/utilities/utility/forward/forward.pass.cpp b/libcxx/test/utilities/utility/forward/forward.pass.cpp
index aed396ee49b..357b36fafa9 100644
--- a/libcxx/test/utilities/utility/forward/forward.pass.cpp
+++ b/libcxx/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<int>(42);
- static_assert(i2 == 42, "" );
+ constexpr int i1 = std::move(23);
+ static_assert(i1 == 23, "" );
+ constexpr int i2 = std::forward<int>(42);
+ static_assert(i2 == 42, "" );
#endif
}
diff --git a/libcxx/test/utilities/utility/forward/move_if_noexcept.pass.cpp b/libcxx/test/utilities/utility/forward/move_if_noexcept.pass.cpp
index 4a07467b99f..f94ff2a6097 100644
--- a/libcxx/test/utilities/utility/forward/move_if_noexcept.pass.cpp
+++ b/libcxx/test/utilities/utility/forward/move_if_noexcept.pass.cpp
@@ -61,9 +61,9 @@ int main()
static_assert((std::is_same<decltype(std::move_if_noexcept(l)), const legacy&>::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/libcxx/test/utilities/utility/pairs/pair.astuple/pairs.by.type3.fail.cpp b/libcxx/test/utilities/utility/pairs/pair.astuple/pairs.by.type3.fail.cpp
index 8bf35c7b312..48434734574 100644
--- a/libcxx/test/utilities/utility/pairs/pair.astuple/pairs.by.type3.fail.cpp
+++ b/libcxx/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<int> upint;
- std::pair<upint, int> t(upint(new int(4)), 23);
- upint p = std::get<upint>(t);
+ typedef std::unique_ptr<int> upint;
+ std::pair<upint, int> t(upint(new int(4)), 23);
+ upint p = std::get<upint>(t);
#else
#error
#endif
diff --git a/libcxx/test/utilities/utility/pairs/pairs.pair/default.pass.cpp b/libcxx/test/utilities/utility/pairs/pairs.pair/default.pass.cpp
index 18fdb47bb42..bb6661f7966 100644
--- a/libcxx/test/utilities/utility/pairs/pairs.pair/default.pass.cpp
+++ b/libcxx/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<float, short*> P;
OpenPOWER on IntegriCloud