para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2024-11-03 17:56:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1 from microsoft/master

Browse Source 
updating from root
This commit is contained in:
Jordan Maples [MSFT] 2019-08-30 12:37:36 -07:00 committed by GitHub
commit 1046c9d247
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/gsl/gsl_byte
View File

@ -56,6 +56,7 @@
#else // _MSC_VER #else // _MSC_VER
#ifndef GSL_USE_STD_BYTE #ifndef GSL_USE_STD_BYTE
#include <cstddef> /* __cpp_lib_byte */
// this tests if we are under GCC or Clang with enough -std:c++1z power to get us std::byte // this tests if we are under GCC or Clang with enough -std:c++1z power to get us std::byte
// also check if libc++ version is sufficient (> 5.0) or libstc++ actually contains std::byte // also check if libc++ version is sufficient (> 5.0) or libstc++ actually contains std::byte
#if defined(__cplusplus) && (__cplusplus >= 201703L) && \ #if defined(__cplusplus) && (__cplusplus >= 201703L) && \
@ -63,7 +64,6 @@
defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION >= 5000)) defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION >= 5000))
#define GSL_USE_STD_BYTE 1 #define GSL_USE_STD_BYTE 1
#include <cstddef>
#else // defined(__cplusplus) && (__cplusplus >= 201703L) && #else // defined(__cplusplus) && (__cplusplus >= 201703L) &&
// (defined(__cpp_lib_byte) && (__cpp_lib_byte >= 201603) || // (defined(__cpp_lib_byte) && (__cpp_lib_byte >= 201603) ||

2
include/gsl/gsl_util
View File

@ -37,7 +37,7 @@
#endif // _MSC_VER < 1910 #endif // _MSC_VER < 1910
#endif // _MSC_VER #endif // _MSC_VER
#if (defined(_MSC_VER) && _MSC_VER < 1910) || (!defined(__clang__) && defined(__GNUC__) && __GUNC__ < 6) #if (defined(_MSC_VER) && _MSC_VER < 1910) || (!defined(__clang__) && defined(__GNUC__) && __GNUC__ < 6)
#define GSL_CONSTEXPR_NARROW 0 #define GSL_CONSTEXPR_NARROW 0
#else #else
#define GSL_CONSTEXPR_NARROW 1 #define GSL_CONSTEXPR_NARROW 1

2
include/gsl/span
View File

@ -141,7 +141,7 @@ namespace details
span_iterator() = default; span_iterator() = default;
constexpr span_iterator(const Span* span, typename Span::index_type idx) noexcept constexpr span_iterator(const Span* span, difference_type idx) noexcept
: span_(span), index_(idx) : span_(span), index_(idx)
{} {}

1
include/gsl/string_span
View File

@ -20,7 +20,6 @@
#include <gsl/gsl_assert> // for Ensures, Expects #include <gsl/gsl_assert> // for Ensures, Expects
#include <gsl/gsl_util> // for narrow_cast #include <gsl/gsl_util> // for narrow_cast
#include <gsl/span> // for operator!=, operator==, dynamic_extent #include <gsl/span> // for operator!=, operator==, dynamic_extent
#include <gsl/pointers> // for not_null
#include <algorithm> // for equal, lexicographical_compare #include <algorithm> // for equal, lexicographical_compare
#include <array> // for array #include <array> // for array