Skip to content

fully qualifies use of detail namespace #87536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 3, 2024
Merged

fully qualifies use of detail namespace #87536

merged 2 commits into from
Apr 3, 2024

Conversation

cjdb
Copy link
Contributor

@cjdb cjdb commented Apr 3, 2024

Some TUs apparently end up with an ambiguity between ::llvm::detail and support::detail, so we close that gap at the source.

Some TUs apparently end up with an ambiguity between `::llvm::detail`
and `support::detail`, so we close that gap at the source.
@llvmbot
Copy link
Member

llvmbot commented Apr 3, 2024

@llvm/pr-subscribers-llvm-adt

Author: Christopher Di Bella (cjdb)

Changes

Some TUs apparently end up with an ambiguity between ::llvm::detail and support::detail, so we close that gap at the source.


Full diff: https://github.com/llvm/llvm-project/pull/87536.diff

1 Files Affected:

  • (modified) llvm/include/llvm/ADT/iterator_range.h (+2-2)
diff --git a/llvm/include/llvm/ADT/iterator_range.h b/llvm/include/llvm/ADT/iterator_range.h
index 7d288ea4506ba5..021256c545b0af 100644
--- a/llvm/include/llvm/ADT/iterator_range.h
+++ b/llvm/include/llvm/ADT/iterator_range.h
@@ -50,7 +50,7 @@ class iterator_range {
 #else
   template <typename Container,
             std::enable_if_t<explicitly_convertible<
-                detail::IterOfRange<Container>, IteratorT>::value> * = nullptr>
+                llvm::detail::IterOfRange<Container>, IteratorT>::value> * = nullptr>
 #endif
   iterator_range(Container &&c)
       : begin_iterator(adl_begin(c)), end_iterator(adl_end(c)) {
@@ -65,7 +65,7 @@ class iterator_range {
 };
 
 template <typename Container>
-iterator_range(Container &&) -> iterator_range<detail::IterOfRange<Container>>;
+iterator_range(Container &&) -> iterator_range<llvm::detail::IterOfRange<Container>>;
 
 /// Convenience function for iterating over sub-ranges.
 ///

Copy link

github-actions bot commented Apr 3, 2024

✅ With the latest revision this PR passed the C/C++ code formatter.

Copy link
Collaborator

@slackito slackito left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@kazutakahirata
Copy link
Contributor

Thank you for fixing this!

@cjdb cjdb merged commit e506dd0 into llvm:main Apr 3, 2024
@cjdb cjdb deleted the qualifiers branch April 3, 2024 20:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants