mirror of
https://github.com/microsoft/GSL.git
synced 2024-11-03 17:56:43 -05:00
Test only __cpp_lib_byte
, drop _HAS_STD_BYTE
. (#1145)
This commit is contained in:
parent
1b4d42ca2e
commit
2e0d1ba48c
@ -19,8 +19,6 @@
|
|||||||
|
|
||||||
#include <type_traits>
|
#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
|
#ifdef _MSC_VER
|
||||||
|
|
||||||
#pragma warning(push)
|
#pragma warning(push)
|
||||||
@ -31,18 +29,15 @@
|
|||||||
|
|
||||||
#ifndef GSL_USE_STD_BYTE
|
#ifndef GSL_USE_STD_BYTE
|
||||||
// this tests if we are under MSVC and the standard lib has std::byte and it is enabled
|
// 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) || \
|
#if defined(__cpp_lib_byte) && __cpp_lib_byte >= 201603
|
||||||
(defined(__cpp_lib_byte) && __cpp_lib_byte >= 201603)
|
|
||||||
|
|
||||||
#define GSL_USE_STD_BYTE 1
|
#define GSL_USE_STD_BYTE 1
|
||||||
|
|
||||||
#else // (defined(_HAS_STD_BYTE) && _HAS_STD_BYTE) || (defined(__cpp_lib_byte) && __cpp_lib_byte >=
|
#else // defined(__cpp_lib_byte) && __cpp_lib_byte >= 201603
|
||||||
// 201603)
|
|
||||||
|
|
||||||
#define GSL_USE_STD_BYTE 0
|
#define GSL_USE_STD_BYTE 0
|
||||||
|
|
||||||
#endif // (defined(_HAS_STD_BYTE) && _HAS_STD_BYTE) || (defined(__cpp_lib_byte) && __cpp_lib_byte >=
|
#endif // defined(__cpp_lib_byte) && __cpp_lib_byte >= 201603
|
||||||
// 201603)
|
|
||||||
#endif // GSL_USE_STD_BYTE
|
#endif // GSL_USE_STD_BYTE
|
||||||
|
|
||||||
#else // _MSC_VER
|
#else // _MSC_VER
|
||||||
|
Loading…
Reference in New Issue
Block a user