From bf600c8e1d49551258d588e9455dbf03367f96c4 Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Tue, 16 Jul 2024 23:47:22 -0600 Subject: [PATCH] AK: Stop exporting AK::Duration into the global namespace This has conflicts with MacTypes.h from the Apple macOS SDKs, which becomes a huge problem when trying to interact with system clang modules --- AK/Forward.h | 1 - AK/Time.h | 1 - Tests/AK/TestDuration.cpp | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AK/Forward.h b/AK/Forward.h index ab9a5307ec9..86b869547b5 100644 --- a/AK/Forward.h +++ b/AK/Forward.h @@ -157,7 +157,6 @@ using AK::CountingStream; using AK::DeprecatedFlyString; using AK::DeprecatedStringCodePointIterator; using AK::DoublyLinkedList; -using AK::Duration; using AK::Error; using AK::ErrorOr; using AK::FixedArray; diff --git a/AK/Time.h b/AK/Time.h index 7c06bcc84b5..1e52136019b 100644 --- a/AK/Time.h +++ b/AK/Time.h @@ -581,7 +581,6 @@ using AK::day_of_year; using AK::days_in_month; using AK::days_in_year; using AK::days_since_epoch; -using AK::Duration; using AK::is_leap_year; using AK::MonotonicTime; using AK::seconds_since_epoch_to_year; diff --git a/Tests/AK/TestDuration.cpp b/Tests/AK/TestDuration.cpp index 3d8405970ec..7b7feebaa96 100644 --- a/Tests/AK/TestDuration.cpp +++ b/Tests/AK/TestDuration.cpp @@ -9,6 +9,8 @@ #include #include +using AK::Duration; + #if defined(__TIMESIZE) && __TIMESIZE < 64 # define TIME_T_IS_32BIT #endif