From 0f3efc4aab9748ea4791ed47530a9ea7174b97e3 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Wed, 21 Aug 2019 22:38:38 +0000 Subject: libcxx: Rename last two .hpp files in libcxx to .h Differential Revision: https://reviews.llvm.org/D66544 llvm-svn: 369597 --- .../function.objects/comparisons/greater.pass.cpp | 2 +- .../comparisons/greater_equal.pass.cpp | 2 +- .../function.objects/comparisons/less.pass.cpp | 2 +- .../comparisons/less_equal.pass.cpp | 2 +- .../comparisons/pointer_comparison_test_helper.h | 39 ++++++++++++++++++++++ .../comparisons/pointer_comparison_test_helper.hpp | 39 ---------------------- 6 files changed, 43 insertions(+), 43 deletions(-) create mode 100644 libcxx/test/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.h delete mode 100644 libcxx/test/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.hpp (limited to 'libcxx/test/std/utilities') diff --git a/libcxx/test/std/utilities/function.objects/comparisons/greater.pass.cpp b/libcxx/test/std/utilities/function.objects/comparisons/greater.pass.cpp index 35c05757c8c..b1f1fe65667 100644 --- a/libcxx/test/std/utilities/function.objects/comparisons/greater.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/comparisons/greater.pass.cpp @@ -15,7 +15,7 @@ #include #include "test_macros.h" -#include "pointer_comparison_test_helper.hpp" +#include "pointer_comparison_test_helper.h" int main(int, char**) { diff --git a/libcxx/test/std/utilities/function.objects/comparisons/greater_equal.pass.cpp b/libcxx/test/std/utilities/function.objects/comparisons/greater_equal.pass.cpp index 9a6d36c4176..30cf7e0bca1 100644 --- a/libcxx/test/std/utilities/function.objects/comparisons/greater_equal.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/comparisons/greater_equal.pass.cpp @@ -15,7 +15,7 @@ #include #include "test_macros.h" -#include "pointer_comparison_test_helper.hpp" +#include "pointer_comparison_test_helper.h" int main(int, char**) { diff --git a/libcxx/test/std/utilities/function.objects/comparisons/less.pass.cpp b/libcxx/test/std/utilities/function.objects/comparisons/less.pass.cpp index 31a2f975b18..88b7c784ea7 100644 --- a/libcxx/test/std/utilities/function.objects/comparisons/less.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/comparisons/less.pass.cpp @@ -15,7 +15,7 @@ #include #include "test_macros.h" -#include "pointer_comparison_test_helper.hpp" +#include "pointer_comparison_test_helper.h" int main(int, char**) { diff --git a/libcxx/test/std/utilities/function.objects/comparisons/less_equal.pass.cpp b/libcxx/test/std/utilities/function.objects/comparisons/less_equal.pass.cpp index 31cbed17172..5aa6d799577 100644 --- a/libcxx/test/std/utilities/function.objects/comparisons/less_equal.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/comparisons/less_equal.pass.cpp @@ -15,7 +15,7 @@ #include #include "test_macros.h" -#include "pointer_comparison_test_helper.hpp" +#include "pointer_comparison_test_helper.h" int main(int, char**) { diff --git a/libcxx/test/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.h b/libcxx/test/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.h new file mode 100644 index 00000000000..ac4df550a33 --- /dev/null +++ b/libcxx/test/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.h @@ -0,0 +1,39 @@ +#ifndef POINTER_COMPARISON_TEST_HELPER_H +#define POINTER_COMPARISON_TEST_HELPER_H + +#include +#include +#include +#include + +#include "test_macros.h" + +template class CompareTemplate> +void do_pointer_comparison_test() { + typedef CompareTemplate Compare; + typedef CompareTemplate UIntCompare; +#if TEST_STD_VER > 11 + typedef CompareTemplate VoidCompare; +#else + typedef Compare VoidCompare; +#endif + std::vector > pointers; + const std::size_t test_size = 100; + for (size_t i=0; i < test_size; ++i) + pointers.push_back(std::shared_ptr(new T())); + Compare comp; + UIntCompare ucomp; + VoidCompare vcomp; + for (size_t i=0; i < test_size; ++i) { + for (size_t j=0; j < test_size; ++j) { + T* lhs = pointers[i].get(); + T* rhs = pointers[j].get(); + std::uintptr_t lhs_uint = reinterpret_cast(lhs); + std::uintptr_t rhs_uint = reinterpret_cast(rhs); + assert(comp(lhs, rhs) == ucomp(lhs_uint, rhs_uint)); + assert(vcomp(lhs, rhs) == ucomp(lhs_uint, rhs_uint)); + } + } +} + +#endif // POINTER_COMPARISON_TEST_HELPER_H diff --git a/libcxx/test/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.hpp b/libcxx/test/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.hpp deleted file mode 100644 index b23d4e8bb47..00000000000 --- a/libcxx/test/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.hpp +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef POINTER_COMPARISON_TEST_HELPER_HPP -#define POINTER_COMPARISON_TEST_HELPER_HPP - -#include -#include -#include -#include - -#include "test_macros.h" - -template class CompareTemplate> -void do_pointer_comparison_test() { - typedef CompareTemplate Compare; - typedef CompareTemplate UIntCompare; -#if TEST_STD_VER > 11 - typedef CompareTemplate VoidCompare; -#else - typedef Compare VoidCompare; -#endif - std::vector > pointers; - const std::size_t test_size = 100; - for (size_t i=0; i < test_size; ++i) - pointers.push_back(std::shared_ptr(new T())); - Compare comp; - UIntCompare ucomp; - VoidCompare vcomp; - for (size_t i=0; i < test_size; ++i) { - for (size_t j=0; j < test_size; ++j) { - T* lhs = pointers[i].get(); - T* rhs = pointers[j].get(); - std::uintptr_t lhs_uint = reinterpret_cast(lhs); - std::uintptr_t rhs_uint = reinterpret_cast(rhs); - assert(comp(lhs, rhs) == ucomp(lhs_uint, rhs_uint)); - assert(vcomp(lhs, rhs) == ucomp(lhs_uint, rhs_uint)); - } - } -} - -#endif // POINTER_COMPARISON_TEST_HELPER_HPP -- cgit v1.2.3