summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/utilities/meta
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2015-02-05 20:28:37 +0000
committerEric Fiselier <eric@efcs.ca>2015-02-05 20:28:37 +0000
commitc281a7a19fbbf229334f595e879e0fed42613264 (patch)
treed4eaeac1d793795b29d0578203c694b19b7b04b1 /libcxx/test/std/utilities/meta
parentd40bb5353dd91dd3b6c886495b20dd08bf3fe7d2 (diff)
downloadbcm5719-llvm-c281a7a19fbbf229334f595e879e0fed42613264.tar.gz
bcm5719-llvm-c281a7a19fbbf229334f595e879e0fed42613264.zip
Get tests running with warnings. Fix warnings in headers and tests
llvm-svn: 228344
Diffstat (limited to 'libcxx/test/std/utilities/meta')
-rw-r--r--libcxx/test/std/utilities/meta/meta.hel/integral_constant.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/result_of.pass.cpp7
-rw-r--r--libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/class.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/class.pass.cpp2
4 files changed, 4 insertions, 9 deletions
diff --git a/libcxx/test/std/utilities/meta/meta.hel/integral_constant.pass.cpp b/libcxx/test/std/utilities/meta/meta.hel/integral_constant.pass.cpp
index 1ad1adcc5cd..335305a2823 100644
--- a/libcxx/test/std/utilities/meta/meta.hel/integral_constant.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.hel/integral_constant.pass.cpp
@@ -41,7 +41,9 @@ int main()
std::false_type f1;
std::false_type f2 = f1;
+ assert(!f2);
std::true_type t1;
std::true_type t2 = t1;
+ assert(t2);
}
diff --git a/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/result_of.pass.cpp b/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/result_of.pass.cpp
index bf44c340ee5..1064d59e8b4 100644
--- a/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/result_of.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/result_of.pass.cpp
@@ -67,13 +67,13 @@ int main()
#endif
#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
using type1 = std::result_of<decltype(&wat::foo)(wat)>::type;
+ static_assert(std::is_same<type1, void>::value, "");
#endif
#if _LIBCPP_STD_VER > 11
using type2 = std::result_of_t<decltype(&wat::foo)(wat)>;
+ static_assert(std::is_same<type2, void>::value, "");
#endif
-
-
static_assert((std::is_same<std::result_of<S(int)>::type, short>::value), "Error!");
static_assert((std::is_same<std::result_of<S&(unsigned char, int&)>::type, double>::value), "Error!");
static_assert((std::is_same<std::result_of<PF1()>::type, bool>::value), "Error!");
@@ -92,7 +92,4 @@ int main()
static_assert((std::is_same<std::result_of<int (F::* (F &&)) () const&&>::type, int>::value), "Error!");
static_assert((std::is_same<std::result_of<int (F::* (F const&&)) () const&&>::type, int>::value), "Error!");
#endif
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
- using type = std::result_of<decltype(&wat::foo)(wat)>::type;
-#endif
}
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/class.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/class.pass.cpp
index 0de00485572..ac5d6e59231 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/class.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/class.pass.cpp
@@ -45,8 +45,6 @@ void test_class()
class Class
{
- int _;
- double __;
};
int main()
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/class.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/class.pass.cpp
index a77a10149d3..49e41380ca2 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/class.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/class.pass.cpp
@@ -36,8 +36,6 @@ void test_class()
class Class
{
- int _;
- double __;
};
int main()
OpenPOWER on IntegriCloud