averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into rebranch

Browse Source
This commit is contained in:
swift-ci
2024-10-18 12:22:36 -07:00
parent 138625f758 9c5519a74a
commit ed4836f5b1
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ClangImporter/ImportDecl.cpp
View File

@@ -2734,7 +2734,8 @@ namespace {
if (decl->getDeclContext()->isNamespace() &&
decl->getDeclContext()->getParent()->isStdNamespace() &&
decl->getIdentifier() &&
(decl->getName() == "tzdb" || decl->getName() == "time_zone_link"))
(decl->getName() == "tzdb" || decl->getName() == "time_zone_link" ||
decl->getName() == "time_zone"))
return nullptr;
auto &clangSema = Impl.getClangSema();