Skip to content

Add an include to xtr1common in ADL.h #7818

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

Add an include to xtr1common in ADL.h #7818

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions llvm/include/llvm/ADT/ADL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
#ifndef LLVM_ADT_ADL_H
#define LLVM_ADT_ADL_H

#if defined(_MSC_VER) && _MSC_VER < 1937
Copy link
Member Author

Choose a reason for hiding this comment

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

@compnerd You suggested checking for the following to me but that check did not evaluate to true in Windows CI.

#if defined(_MSVC_STL_UPDATE) && _MSVC_STL_UPDATE < 202305l

Based on the _MSVC_STL_UPDATE <-> _MSC_VER mapping, I changed it to a check for _MSC_VER. Does this make sense to you?

Copy link
Member

Choose a reason for hiding this comment

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

That doesn't really work. _MSC_VER is the compiler version, the problem here is the header version, which is _MSVC_STL_UPDATE. I think that we should just figure out what version is in use and use that.

Copy link
Member Author

Choose a reason for hiding this comment

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

Do you have any suggestions I should try?

#include <xtr1common>
#endif
#include <type_traits>
#include <iterator>
#include <utility>
Expand Down