From e1685b6b69453d2e9e0485ed1f7ced3a23f7cbe2 Mon Sep 17 00:00:00 2001 From: Michel Hermier Date: Mon, 10 Jan 2022 15:20:48 +0100 Subject: [PATCH] Lagom: Avoid declaring `Time` in the global namespace When compiled using clang, an ambiguity error is detected between `class AK::Time` aliased to `::Time` and the `struct ::Time` provided in `GenerateTimeZoneData.cpp`. Solve this by moving most of the code in an anonymous namespace. --- .../Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp index f5cd8fbbde..f96b3e752a 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp @@ -13,6 +13,8 @@ #include #include +namespace { + struct Time { i8 hour { 0 }; u8 minute { 0 }; @@ -250,6 +252,8 @@ namespace TimeZone { VERIFY(file.write(generator.as_string_view())); } +} + ErrorOr serenity_main(Main::Arguments arguments) { StringView generated_header_path;