diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2011-01-28 20:00:37 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2011-01-28 20:00:37 +0000 |
| commit | d44be13fa89c65ea42221dffbc78571f34ac2f24 (patch) | |
| tree | bc47dfb95babed7bae2426898eaa8f245598a9f5 /libcxx/test | |
| parent | a1a00b19b540a69cfd8285e7b849dfd0774a8ae1 (diff) | |
| download | bcm5719-llvm-d44be13fa89c65ea42221dffbc78571f34ac2f24.tar.gz bcm5719-llvm-d44be13fa89c65ea42221dffbc78571f34ac2f24.zip | |
minor corrections to test, and hook is_base_of up to clang intrinsic
llvm-svn: 124502
Diffstat (limited to 'libcxx/test')
| -rw-r--r-- | libcxx/test/utilities/meta/meta.rel/is_base_of.pass.cpp | 1 | ||||
| -rw-r--r-- | libcxx/test/utilities/meta/meta.rel/is_convertible.pass.cpp | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/libcxx/test/utilities/meta/meta.rel/is_base_of.pass.cpp b/libcxx/test/utilities/meta/meta.rel/is_base_of.pass.cpp index 1fad33f08a2..0f90ae5c1ca 100644 --- a/libcxx/test/utilities/meta/meta.rel/is_base_of.pass.cpp +++ b/libcxx/test/utilities/meta/meta.rel/is_base_of.pass.cpp @@ -46,5 +46,4 @@ int main() test_is_not_base_of<B&, D&>(); test_is_not_base_of<B[3], D[3]>(); test_is_not_base_of<int, int>(); - test_is_not_base_of<int, int>(); } diff --git a/libcxx/test/utilities/meta/meta.rel/is_convertible.pass.cpp b/libcxx/test/utilities/meta/meta.rel/is_convertible.pass.cpp index 8d05668992e..e0728543902 100644 --- a/libcxx/test/utilities/meta/meta.rel/is_convertible.pass.cpp +++ b/libcxx/test/utilities/meta/meta.rel/is_convertible.pass.cpp @@ -70,8 +70,7 @@ int main() static_assert((!std::is_convertible<Function, Function>::value), ""); - static_assert((!std::is_convertible<Function, Function&>::value), ""); - static_assert((!std::is_convertible<Function, Function&>::value), ""); + static_assert(( std::is_convertible<Function, Function&>::value), ""); static_assert(( std::is_convertible<Function, Function*>::value), ""); static_assert(( std::is_convertible<Function, Function* const>::value), ""); @@ -98,7 +97,6 @@ int main() static_assert((!std::is_convertible<Function&, Function>::value), ""); static_assert(( std::is_convertible<Function&, Function&>::value), ""); - static_assert(( std::is_convertible<Function&, const Function&>::value), ""); static_assert(( std::is_convertible<Function&, Function*>::value), ""); static_assert(( std::is_convertible<Function&, Function* const>::value), ""); @@ -185,7 +183,7 @@ int main() static_assert((!std::is_convertible<Array, Array&>::value), ""); static_assert(( std::is_convertible<Array, const Array&>::value), ""); static_assert((!std::is_convertible<const Array, Array&>::value), ""); - static_assert((!std::is_convertible<const Array, const Array&>::value), ""); + static_assert(( std::is_convertible<const Array, const Array&>::value), ""); static_assert((!std::is_convertible<Array, char>::value), ""); static_assert((!std::is_convertible<Array, const char>::value), ""); |
