Skip to content
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

Add duplicate pragma #6732

Merged
merged 1 commit into from
Jun 27, 2024
Merged

Add duplicate pragma #6732

merged 1 commit into from
Jun 27, 2024

Conversation

hekota
Copy link
Member

@hekota hekota commented Jun 27, 2024

Internal build that has DXC as a submodule and that is built with a different VC toolset version started failing after the pragma got moved up in commit 0b9acdb. Adding a duplicate pragma back at the original location makes both compiler versions happy.

Internal build that has DXC as a submodule and is built with a different VC toolset version fails after the pragma got moved up in commit 0b9acdb. Adding a duplicate pragma back at the original location makes both compiler versions happy.
@hekota hekota requested a review from a team as a code owner June 27, 2024 21:02
@hekota hekota enabled auto-merge (squash) June 27, 2024 22:09
@hekota hekota merged commit 49d1ae9 into microsoft:main Jun 27, 2024
13 checks passed
pow2clk pushed a commit to pow2clk/DirectXShaderCompiler that referenced this pull request Jul 16, 2024
Internal build that has DXC as a submodule and that is built with a
different VC toolset version started failing after the pragma got moved
up in commit 0b9acdb. Adding a duplicate pragma back at the original
location makes both compiler versions happy.

(cherry picked from commit 49d1ae9)
pow2clk added a commit that referenced this pull request Jul 16, 2024
Merges the following changes into mesh nodes to fix a known bug that
required a point release in the march release branch and also some build
fixes for new visual studio diagnostics.

9ca52f4 Add duplicate pragma (#6732)
7809c0b Remove Windows C++ redist hack (#6692)
33277a1 Workaround broken GitHub runner images (#6683)
1b9a796 [Sema] Check FunctionDecl has identifier before getName.
(#6439) (#6457)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants