Skip to content

handle Clang-CUDA #2075

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

Merged
CaseyCarter merged 8 commits into from
Jan 6, 2022
Merged

handle Clang-CUDA #2075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dec4105
handle Clang-CUDA
fsb4000 Jul 24, 2021
38a7e39
Merge branch 'main' into fix1949
fsb4000 Aug 17, 2021
23b046d
Merge branch 'main' into fix1949
fsb4000 Oct 8, 2021
e4baf10
do not require protection from macroized new for Clang in Cuda mode
fsb4000 Oct 8, 2021
7e9d2b2
Merge branch 'microsoft:main' into fix1949
fsb4000 Nov 21, 2021
bc0b9b1
Merge branch 'main' into fix1949
StephanTLavavej Dec 18, 2021
79347e0
Fix comment spacing.
StephanTLavavej Dec 18, 2021
fbb95f9
Don't check NVCC version if __CUDACC_VER_MAJOR__ is not defined
CaseyCarter Jan 6, 2022
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
4 changes: 4 additions & 0 deletions stl/inc/__msvc_all_public_headers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@
#pragma warning(1 : 4668) // 'MEOW' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'

// All STL headers should protect themselves from macroized new.
#if !(defined(__CUDACC__) && defined(__clang__))
#pragma push_macro("new")
#undef new
#define new WILL NOT COMPILE
#endif // !(defined(__CUDACC__) && defined(__clang__))

// VSO-768746: mbctype.h macroizes _MS, _MP, _M1, and _M2. Include it first for test coverage.
#ifndef _MSVC_TESTING_NVCC
Expand Down Expand Up @@ -232,7 +234,9 @@
#endif // _M_CEE_PURE
#endif // _MSVC_TESTING_NVCC

#if !(defined(__CUDACC__) && defined(__clang__))
#pragma pop_macro("new")
#endif // !(defined(__CUDACC__) && defined(__clang__))

#pragma warning(pop)

Expand Down
2 changes: 1 addition & 1 deletion stl/inc/yvals_core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@
#define _MSVC_STL_UPDATE 202112L

#ifndef _ALLOW_COMPILER_AND_STL_VERSION_MISMATCH
#ifdef __CUDACC__
#if defined(__CUDACC__) && defined(__CUDACC_VER_MAJOR__)
#if __CUDACC_VER_MAJOR__ < 10 \
|| (__CUDACC_VER_MAJOR__ == 10 \
&& (__CUDACC_VER_MINOR__ < 1 || (__CUDACC_VER_MINOR__ == 1 && __CUDACC_VER_BUILD__ < 243)))
Expand Down