Fix merge conflict from two inflight PRs #338
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wmaxey
approved these changes
Aug 15, 2023
We renamed `TEST_COMPILER_C1XX` to `TEST_COMPILER_MSVC` because the former does not make sense and the latter is the convention we have for the internal macro However, an inflight PR did miss the macro rename Skipping tests as this is only libcudacxx test related
miscco
force-pushed
the
fix_msvc_macro_name
branch
from
0019f07 to
84f1d7e
Compare
gevtushenko
approved these changes
Aug 15, 2023
miscco
added a commit
to miscco/cccl
that referenced
this pull request
Aug 16, 2023
We renamed `TEST_COMPILER_C1XX` to `TEST_COMPILER_MSVC` because the former does not make sense and the latter is the convention we have for the internal macro However, an inflight PR did miss the macro rename Skipping tests as this is only libcudacxx test related
miscco
added a commit
to miscco/cccl
that referenced
this pull request
Aug 17, 2023
We renamed `TEST_COMPILER_C1XX` to `TEST_COMPILER_MSVC` because the former does not make sense and the latter is the convention we have for the internal macro However, an inflight PR did miss the macro rename Skipping tests as this is only libcudacxx test related
miscco
added a commit
that referenced
this pull request
Aug 17, 2023
We renamed `TEST_COMPILER_C1XX` to `TEST_COMPILER_MSVC` because the former does not make sense and the latter is the convention we have for the internal macro However, an inflight PR did miss the macro rename Skipping tests as this is only libcudacxx test related
alliepiper
pushed a commit
to alliepiper/cccl
that referenced
this pull request
Aug 30, 2023
We renamed `TEST_COMPILER_C1XX` to `TEST_COMPILER_MSVC` because the former does not make sense and the latter is the convention we have for the internal macro However, an inflight PR did miss the macro rename Skipping tests as this is only libcudacxx test related
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We renamed
TEST_COMPILER_C1XXtoTEST_COMPILER_MSVCbecause the former does not make sense and the latter is the convention we have for the internal macroHowever, an inflight PR did miss the macro rename
Skipping tests because this is only related to libcudacxx tests
Fixes nvbug3853157