From b367da592c568277ab76850dcde5422f4ae118de Mon Sep 17 00:00:00 2001 From: Ali Mohammad Pur Date: Wed, 14 Dec 2022 15:21:48 +0330 Subject: [PATCH] AK: Bring back the AK_DONT_REPLACE_STD #define This was removed in a910961f37d1da9dafb6385e348266746354cf98 in favour of the more general USING_AK_GLOBALLY #define, but Ladybird (and probably other projects) depend on the smaller hammer to include STL headers and keep the USING_AK_GLOBALLY behaviour, so put it back and preserve its behaviour. --- AK/StdLibExtras.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AK/StdLibExtras.h b/AK/StdLibExtras.h index 8e1e87be20..869f2789cf 100644 --- a/AK/StdLibExtras.h +++ b/AK/StdLibExtras.h @@ -34,7 +34,7 @@ requires(AK::Detail::IsIntegral) } -#if !USING_AK_GLOBALLY +#if !USING_AK_GLOBALLY || defined(AK_DONT_REPLACE_STD) # define AK_REPLACED_STD_NAMESPACE AK::replaced_std #else # define AK_REPLACED_STD_NAMESPACE std