summaryrefslogtreecommitdiffstats
path: root/libcxx
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2017-04-11 01:54:48 +0000
committerMarshall Clow <mclow.lists@gmail.com>2017-04-11 01:54:48 +0000
commitdcad8bf00eedf7350204d4bf9eeef3a7c13940e6 (patch)
treea0da1cba91c4480412bad5e47c95a73cd15ebefe /libcxx
parent55379ab8c719efc27c525dbc73dbb6b186f88724 (diff)
downloadbcm5719-llvm-dcad8bf00eedf7350204d4bf9eeef3a7c13940e6.tar.gz
bcm5719-llvm-dcad8bf00eedf7350204d4bf9eeef3a7c13940e6.zip
Fix a C++03 failure
llvm-svn: 299909
Diffstat (limited to 'libcxx')
-rw-r--r--libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/common_type.pass.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/common_type.pass.cpp b/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/common_type.pass.cpp
index 506f4757c65..85b14726617 100644
--- a/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/common_type.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/common_type.pass.cpp
@@ -96,6 +96,9 @@ void test_bullet_two() {
static_assert(std::is_same<CommonType<int const>, int>::value, "");
static_assert(std::is_same<CommonType<int volatile[]>, int volatile*>::value, "");
static_assert(std::is_same<CommonType<void(&)()>, void(*)()>::value, "");
+
+ static_assert(no_common_type<X<float> >::value, "");
+ static_assert(no_common_type<X<double> >::value, "");
}
template <class T, class U, class Expect>
@@ -306,7 +309,4 @@ int main()
static_assert((std::is_same<std::common_type<const int, int>::type, int>::value), "");
static_assert((std::is_same<std::common_type<int, const int>::type, int>::value), "");
static_assert((std::is_same<std::common_type<const int, const int>::type, int>::value), "");
-
- static_assert(no_common_type<X<float> >::value, "");
- static_assert(no_common_type<X<double> >::value, "");
}
OpenPOWER on IntegriCloud