From 76d847a1496a6f8f346ff19aa4ddaf32dfef1ce3 Mon Sep 17 00:00:00 2001 From: Shreyas Atre Date: Tue, 23 Jan 2024 11:30:59 -0600 Subject: [PATCH 1/5] [macOS] Comparison between exactly same types Signed-off-by: Shreyas Atre --- libs/core/concurrency/tests/unit/tagged_ptr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/core/concurrency/tests/unit/tagged_ptr.cpp b/libs/core/concurrency/tests/unit/tagged_ptr.cpp index b29652a3ede1..d86fc5775415 100644 --- a/libs/core/concurrency/tests/unit/tagged_ptr.cpp +++ b/libs/core/concurrency/tests/unit/tagged_ptr.cpp @@ -25,7 +25,7 @@ void tagged_ptr_test() i = j; HPX_TEST_EQ(i.get_ptr(), &b); - HPX_TEST_EQ(i.get_tag(), 1); + HPX_TEST_EQ(i.get_tag(), 1UL); } { @@ -43,7 +43,7 @@ void tagged_ptr_test() { tagged_ptr j(&a, max_tag); - HPX_TEST_EQ(j.get_next_tag(), 0); + HPX_TEST_EQ(j.get_next_tag(), 0UL); } { From 75973a8efc7640fed711493f06cc0dbe38d1ceee Mon Sep 17 00:00:00 2001 From: Shreyas Atre Date: Tue, 23 Jan 2024 11:32:20 -0600 Subject: [PATCH 2/5] [macOS] Apple does not seem to have any typedef for unsigned long int Signed-off-by: Shreyas Atre --- libs/core/debugging/src/print.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/core/debugging/src/print.cpp b/libs/core/debugging/src/print.cpp index 3d7cf5da2aa0..8a01d9574853 100644 --- a/libs/core/debugging/src/print.cpp +++ b/libs/core/debugging/src/print.cpp @@ -57,6 +57,10 @@ namespace hpx::debug { std::ostream&, std::int32_t const&, int); template HPX_CORE_EXPORT void print_dec( std::ostream&, std::int64_t const&, int); +#ifdef __APPLE__ + template HPX_CORE_EXPORT void print_dec( + std::ostream&, unsigned long const&, int); +#endif template HPX_CORE_EXPORT void print_dec( std::ostream&, std::uint64_t const&, int); From 5c36a4e47f0aba76889cf51fa20c2ef282e06d60 Mon Sep 17 00:00:00 2001 From: Shreyas Atre Date: Mon, 25 Nov 2024 11:10:30 -0600 Subject: [PATCH 3/5] Execute at_quick_exit feature test - macOSs command line tools 16+ apparently has issues with at_quick_exit not found - For those, this feature macro should be disabled as it cannot execute at runtime but compiles Signed-off-by: Shreyas Atre --- cmake/HPX_AddConfigTest.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/HPX_AddConfigTest.cmake b/cmake/HPX_AddConfigTest.cmake index 92b24ceec194..b0e1ea437452 100644 --- a/cmake/HPX_AddConfigTest.cmake +++ b/cmake/HPX_AddConfigTest.cmake @@ -408,7 +408,7 @@ function(hpx_check_for_cxx11_std_quick_exit) add_hpx_config_test( HPX_WITH_CXX11_STD_QUICK_EXIT SOURCE cmake/tests/cxx11_std_quick_exit.cpp - FILE ${ARGN} + FILE EXECUTE ${ARGN} ) endfunction() From 1682407fd0dfa4f1407a3c5f034f9de385efebd1 Mon Sep 17 00:00:00 2001 From: Shreyas Atre Date: Mon, 25 Nov 2024 11:15:59 -0600 Subject: [PATCH 4/5] Revert "[macOS] Apple does not seem to have any typedef for unsigned long int" This reverts commit 75973a8efc7640fed711493f06cc0dbe38d1ceee. Signed-off-by: Shreyas Atre --- libs/core/debugging/src/print.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libs/core/debugging/src/print.cpp b/libs/core/debugging/src/print.cpp index 8a01d9574853..3d7cf5da2aa0 100644 --- a/libs/core/debugging/src/print.cpp +++ b/libs/core/debugging/src/print.cpp @@ -57,10 +57,6 @@ namespace hpx::debug { std::ostream&, std::int32_t const&, int); template HPX_CORE_EXPORT void print_dec( std::ostream&, std::int64_t const&, int); -#ifdef __APPLE__ - template HPX_CORE_EXPORT void print_dec( - std::ostream&, unsigned long const&, int); -#endif template HPX_CORE_EXPORT void print_dec( std::ostream&, std::uint64_t const&, int); From 6ff0c9d27530074f7d5cdd151522f2a40fdbc9f1 Mon Sep 17 00:00:00 2001 From: Shreyas Atre Date: Mon, 25 Nov 2024 11:16:32 -0600 Subject: [PATCH 5/5] Revert "[macOS] Comparison between exactly same types" This reverts commit 76d847a1496a6f8f346ff19aa4ddaf32dfef1ce3. Signed-off-by: Shreyas Atre --- libs/core/concurrency/tests/unit/tagged_ptr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/core/concurrency/tests/unit/tagged_ptr.cpp b/libs/core/concurrency/tests/unit/tagged_ptr.cpp index d86fc5775415..b29652a3ede1 100644 --- a/libs/core/concurrency/tests/unit/tagged_ptr.cpp +++ b/libs/core/concurrency/tests/unit/tagged_ptr.cpp @@ -25,7 +25,7 @@ void tagged_ptr_test() i = j; HPX_TEST_EQ(i.get_ptr(), &b); - HPX_TEST_EQ(i.get_tag(), 1UL); + HPX_TEST_EQ(i.get_tag(), 1); } { @@ -43,7 +43,7 @@ void tagged_ptr_test() { tagged_ptr j(&a, max_tag); - HPX_TEST_EQ(j.get_next_tag(), 0UL); + HPX_TEST_EQ(j.get_next_tag(), 0); } {