summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/utilities
diff options
context:
space:
mode:
Diffstat (limited to 'libcxx/test/std/utilities')
-rw-r--r--libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/common_type.pass.cpp5
-rw-r--r--libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/is_assignable.pass.cpp2
2 files changed, 2 insertions, 5 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 85b14726617..dbbbe159f09 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
@@ -11,8 +11,9 @@
// common_type
-#include <type_traits>
+#include <functional>
#include <memory>
+#include <type_traits>
#include "test_macros.h"
@@ -45,7 +46,6 @@ namespace std
template <> struct common_type< ::S<long>, long> {};
template <> struct common_type<long, ::S<long> > {};
- template <> struct common_type< ::X<float> > {};
template <> struct common_type< ::X<double>, ::X<double> > {};
}
@@ -97,7 +97,6 @@ void test_bullet_two() {
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, "");
}
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/is_assignable.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/is_assignable.pass.cpp
index 8d63a23494b..4808a4dc9e4 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/is_assignable.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/is_assignable.pass.cpp
@@ -59,8 +59,6 @@ struct E
template <typename T>
struct X { T t; };
-struct Incomplete;
-
int main()
{
test_is_assignable<int&, int&> ();
OpenPOWER on IntegriCloud