Author: marshall
Date: Mon Apr 10 20:54:48 2017
New Revision: 299909
URL: http://llvm.org/viewvc/llvm-project?rev=299909&view=rev
Log:
Fix a C++03 failure
Modified:
libcxx/trunk/test/std/utilities/meta/meta.trans/meta.trans.other/common_type.pass.cpp
Modified:
libcxx/trunk/test/std/utilities/meta/meta.trans/meta.trans.other/common_type.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/meta/meta.trans/meta.trans.other/common_type.pass.cpp?rev=299909&r1=299908&r2=299909&view=diff
==============================================================================
---
libcxx/trunk/test/std/utilities/meta/meta.trans/meta.trans.other/common_type.pass.cpp
(original)
+++
libcxx/trunk/test/std/utilities/meta/meta.trans/meta.trans.other/common_type.pass.cpp
Mon Apr 10 20:54:48 2017
@@ -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, "");
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
