Skip to content

Commit

Permalink
Test only __cpp_lib_byte, drop _HAS_STD_BYTE. (#1145)
Browse files Browse the repository at this point in the history
  • Loading branch information
StephanTLavavej authored Feb 26, 2024
1 parent 1b4d42c commit 2e0d1ba
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions include/gsl/byte
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@

#include <type_traits>

// VS2017 15.8 added support for the __cpp_lib_byte definition
// To do: drop _HAS_STD_BYTE when support for pre 15.8 expires
#ifdef _MSC_VER

#pragma warning(push)
Expand All @@ -31,18 +29,15 @@

#ifndef GSL_USE_STD_BYTE
// this tests if we are under MSVC and the standard lib has std::byte and it is enabled
#if (defined(_HAS_STD_BYTE) && _HAS_STD_BYTE) || \
(defined(__cpp_lib_byte) && __cpp_lib_byte >= 201603)
#if defined(__cpp_lib_byte) && __cpp_lib_byte >= 201603

#define GSL_USE_STD_BYTE 1

#else // (defined(_HAS_STD_BYTE) && _HAS_STD_BYTE) || (defined(__cpp_lib_byte) && __cpp_lib_byte >=
// 201603)
#else // defined(__cpp_lib_byte) && __cpp_lib_byte >= 201603

#define GSL_USE_STD_BYTE 0

#endif // (defined(_HAS_STD_BYTE) && _HAS_STD_BYTE) || (defined(__cpp_lib_byte) && __cpp_lib_byte >=
// 201603)
#endif // defined(__cpp_lib_byte) && __cpp_lib_byte >= 201603
#endif // GSL_USE_STD_BYTE

#else // _MSC_VER
Expand Down

0 comments on commit 2e0d1ba

Please sign in to comment.