Skip to content

Commit

Permalink
Don't assume _HAS_CONDITIONAL_EXPLICIT for __INTEL_COMPILER (#424)
Browse files Browse the repository at this point in the history
This change is not a statement of support for the Intel C++ compiler by the STL, so much as an attempt to not break it gratuitously.

Fixes DevCom-744112.
  • Loading branch information
CaseyCarter authored Jan 17, 2020
1 parent d862650 commit e36c3bf
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions stl/inc/yvals_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -305,13 +305,11 @@
#ifndef _HAS_CONDITIONAL_EXPLICIT
#ifdef __cpp_conditional_explicit
#define _HAS_CONDITIONAL_EXPLICIT 1
#elif defined(__CUDACC__)
#define _HAS_CONDITIONAL_EXPLICIT 0 // TRANSITION
#elif defined(__clang__)
#define _HAS_CONDITIONAL_EXPLICIT 0 // TRANSITION, LLVM-42694
#else // vvv C1XX or non-CUDA EDG vvv
#elif defined(__clang__) || defined(__CUDACC__) || defined(__INTEL_COMPILER)
#define _HAS_CONDITIONAL_EXPLICIT 0 // TRANSITION, LLVM-42694/CUDA/ICC
#else // vvv C1XX or IntelliSense vvv
#define _HAS_CONDITIONAL_EXPLICIT 1
#endif // ^^^ C1XX or non-CUDA EDG ^^^
#endif // ^^^ C1XX or IntelliSense ^^^
#endif // _HAS_CONDITIONAL_EXPLICIT

// warning C4577: 'noexcept' used with no exception handling mode specified;
Expand Down

0 comments on commit e36c3bf

Please sign in to comment.