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 remote-tracking branch 'Microsoft/master' into alternate_byte_impl

Browse Source
This commit is contained in:
MikeGitb 2016-10-02 15:29:45 +02:00
commit 536ce5c15d
5 changed files with 146 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
.travis.yml
View File

@ -3,65 +3,140 @@
language: cpp
sudo: false
cache:
directories:
- ${TRAVIS_BUILD_DIR}/deps/cmake
- ${TRAVIS_BUILD_DIR}/deps/llvm-3.5.2/install
- ${TRAVIS_BUILD_DIR}/deps/llvm-3.6.2/install
- ${TRAVIS_BUILD_DIR}/deps/llvm-3.7.1/install
- ${TRAVIS_BUILD_DIR}/deps/llvm-3.8.1/install
- ${TRAVIS_BUILD_DIR}/deps/llvm-3.9.0/install
matrix:
include:
- env: COMPILER=clang++-3.6 BUILD_TYPE=Debug CLANG=1
- env: BUILD_TYPE=Debug
os: osx
osx_image: xcode8
compiler: clang
- env: BUILD_TYPE=Release
os: osx
osx_image: xcode8
compiler: clang
- env: CLANG_VERSION=3.6 BUILD_TYPE=Debug
os: linux
addons: &clang36
apt:
packages:
- clang-3.6
- cmake
- g++-5
sources: &sources
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.6
- kalakris-cmake
- env: COMPILER=clang++-3.6 BUILD_TYPE=Release CLANG=1
compiler: clang
- env: CLANG_VERSION=3.6 BUILD_TYPE=Release
os: linux
addons: *clang36
- env: COMPILER=g++-5 BUILD_TYPE=Debug
compiler: gcc
- env: CLANG_VERSION=3.7 BUILD_TYPE=Debug
os: linux
addons: &clang37
apt:
packages:
- clang-3.7
- g++-5
sources: &sources
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.7
- env: CLANG_VERSION=3.7 BUILD_TYPE=Release
os: linux
addons: *clang37
- env: CLANG_VERSION=3.8 BUILD_TYPE=Debug
os: linux
addons: &clang38
apt:
packages:
- clang-3.8
- g++-5
sources: &sources
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.8
- env: CLANG_VERSION=3.8 BUILD_TYPE=Release
os: linux
addons: *clang38
- env: GCC_VERSION=5 BUILD_TYPE=Debug
os: linux
addons: &gcc5
apt:
packages: g++-5
sources: *sources
- env: COMPILER=g++-5 BUILD_TYPE=Release
compiler: gcc
- env: GCC_VERSION=5 BUILD_TYPE=Release
os: linux
addons: *gcc5
- env: GCC_VERSION=6 BUILD_TYPE=Debug
os: linux
addons: &gcc6
apt:
packages: g++-6
sources: *sources
- env: GCC_VERSION=6 BUILD_TYPE=Release
os: linux
addons: *gcc6
install:
- which $COMPILER
- if [[ -n "$CLANG_VERSION" ]]; then export CXX=clang++-$CLANG_VERSION CC=clang-$CLANG_VERSION; fi
- if [[ -n "$GCC_VERSION" ]]; then export CXX=g++-$GCC_VERSION CC=gcc-$GCC_VERSION; fi
- JOBS=2
- DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
- mkdir ${DEPS_DIR} && cd ${DEPS_DIR}
- mkdir -p "${DEPS_DIR}" && cd "${DEPS_DIR}"
############################################################################
# Install a recent CMake (unless already installed on OS X)
############################################################################
- |
if [[ "$CLANG" == 1 && "${TRAVIS_OS_NAME}" == "linux" && "${STDLIB}" != "libstdc++" ]]; then
if [[ "${COMPILER}" == "clang++-3.5" ]]; then LLVM_VERSION="3.5.2"; fi
if [[ "${COMPILER}" == "clang++-3.6" ]]; then LLVM_VERSION="3.6.2"; fi
if [[ "${COMPILER}" == "clang++-3.7" ]]; then LLVM_VERSION="3.7.0"; fi
if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
if [[ -z "$(ls -A ${DEPS_DIR}/cmake/bin)" ]]; then
CMAKE_URL="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz"
mkdir -p cmake && travis_retry wget --no-check-certificate --quiet -O - "${CMAKE_URL}" | tar --strip-components=1 -xz -C cmake
fi
export PATH="${DEPS_DIR}/cmake/bin:${PATH}"
else
if ! brew ls --version cmake &>/dev/null; then brew install cmake; fi
fi
############################################################################
# [linux]: Install the right version of libc++
############################################################################
- |
if [[ -n "$CLANG_VERSION" && "${TRAVIS_OS_NAME}" == "linux" && "${STDLIB}" != "libstdc++" ]]; then
if [[ "$CLANG_VERSION" == "3.5" ]]; then LLVM_VERSION="3.5.2"; fi
if [[ "$CLANG_VERSION" == "3.6" ]]; then LLVM_VERSION="3.6.2"; fi
if [[ "$CLANG_VERSION" == "3.7" ]]; then LLVM_VERSION="3.7.1"; fi
if [[ "$CLANG_VERSION" == "3.8" ]]; then LLVM_VERSION="3.8.1"; fi
if [[ "$CLANG_VERSION" == "3.9" ]]; then LLVM_VERSION="3.9.0"; fi
LLVM_ROOT="${DEPS_DIR}/llvm-${LLVM_VERSION}"
LLVM_URL="http://llvm.org/releases/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz"
LIBCXX_URL="http://llvm.org/releases/${LLVM_VERSION}/libcxx-${LLVM_VERSION}.src.tar.xz"
LIBCXXABI_URL="http://llvm.org/releases/${LLVM_VERSION}/libcxxabi-${LLVM_VERSION}.src.tar.xz"
mkdir -p llvm llvm/build llvm/projects/libcxx llvm/projects/libcxxabi
travis_retry wget --quiet -O - ${LLVM_URL} | tar --strip-components=1 -xJ -C llvm
travis_retry wget --quiet -O - ${LIBCXX_URL} | tar --strip-components=1 -xJ -C llvm/projects/libcxx
travis_retry wget --quiet -O - ${LIBCXXABI_URL} | tar --strip-components=1 -xJ -C llvm/projects/libcxxabi
(cd llvm/build && cmake .. -DCMAKE_INSTALL_PREFIX=${DEPS_DIR}/llvm/install -DCMAKE_CXX_COMPILER=clang++)
(cd llvm/build/projects/libcxx && make install -j2)
(cd llvm/build/projects/libcxxabi && make install -j2)
export CXXFLAGS="-I ${DEPS_DIR}/llvm/install/include/c++/v1"
export LDFLAGS="-L ${DEPS_DIR}/llvm/install/lib -l c++ -l c++abi"
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${DEPS_DIR}/llvm/install/lib"
if [[ -z "$(ls -A ${LLVM_ROOT}/install/include)" ]]; then
mkdir -p "${LLVM_ROOT}" "${LLVM_ROOT}/build" "${LLVM_ROOT}/projects/libcxx" "${LLVM_ROOT}/projects/libcxxabi"
travis_retry wget --quiet -O - "${LLVM_URL}" | tar --strip-components=1 -xJ -C "${LLVM_ROOT}"
travis_retry wget --quiet -O - "${LIBCXX_URL}" | tar --strip-components=1 -xJ -C "${LLVM_ROOT}/projects/libcxx"
travis_retry wget --quiet -O - "${LIBCXXABI_URL}" | tar --strip-components=1 -xJ -C "${LLVM_ROOT}/projects/libcxxabi"
(cd "${LLVM_ROOT}/build" && cmake .. -DCMAKE_CXX_COMPILER="$CXX" -DCMAKE_C_COMPILER="$CC" -DCMAKE_INSTALL_PREFIX="${LLVM_ROOT}/install" -DCMAKE_BUILD_TYPE=$BUILD_TYPE)
(cd "${LLVM_ROOT}/build/projects/libcxx" && make install -j$JOBS)
(cd "${LLVM_ROOT}/build/projects/libcxxabi" && make install -j$JOBS)
fi
export CXXFLAGS="-I ${LLVM_ROOT}/install/include/c++/v1"
export LDFLAGS="-L ${LLVM_ROOT}/install/lib -lc++ -lc++abi"
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${LLVM_ROOT}/install/lib"
fi
before_script:
- cd ${TRAVIS_BUILD_DIR}
- cmake -H. -Bb -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_INSTALL_PREFIX=$PWD/o -DCMAKE_BUILD_TYPE=$BUILD_TYPE
- cmake --build b
- cd "${TRAVIS_BUILD_DIR}"
- cmake . -Bbuild -DCMAKE_CXX_COMPILER="$CXX" -DCMAKE_C_COMPILER="$CC" -DCMAKE_BUILD_TYPE=$BUILD_TYPE
- cmake --build build -- -j$JOBS
script:
- cd b
- ctest
- cd build
- ctest --output-on-failure -j$JOBS
notifications:
email: false

16
gsl/gsl_assert
View File

@ -38,6 +38,14 @@
#define GSL_STRINGIFY_DETAIL(x) #x
#define GSL_STRINGIFY(x) GSL_STRINGIFY_DETAIL(x)
#if defined(__clang__) || defined(__GNUC__)
#define GSL_LIKELY(x) __builtin_expect (!!(x), 1)
#define GSL_UNLIKELY(x) __builtin_expect (!!(x), 0)
#else
#define GSL_LIKELY(x) (x)
#define GSL_UNLIKELY(x) (x)
#endif
//
// GSL.assert: assertions
//
@ -53,19 +61,19 @@ struct fail_fast : public std::runtime_error
#if defined(GSL_THROW_ON_CONTRACT_VIOLATION)
#define Expects(cond) \
if (!(cond)) \
if (GSL_UNLIKELY(!(cond))) \
throw gsl::fail_fast("GSL: Precondition failure at " __FILE__ ": " GSL_STRINGIFY(__LINE__));
#define Ensures(cond) \
if (!(cond)) \
if (GSL_UNLIKELY(!(cond))) \
throw gsl::fail_fast("GSL: Postcondition failure at " __FILE__ \
": " GSL_STRINGIFY(__LINE__));
#elif defined(GSL_TERMINATE_ON_CONTRACT_VIOLATION)
#define Expects(cond) \
if (!(cond)) std::terminate();
if (GSL_UNLIKELY(!(cond))) std::terminate();
#define Ensures(cond) \
if (!(cond)) std::terminate();
if (GSL_UNLIKELY(!(cond))) std::terminate();
#elif defined(GSL_UNENFORCED_ON_CONTRACT_VIOLATION)

16
gsl/multi_span
View File

@ -308,8 +308,6 @@ namespace details
{
}
BoundsRanges(const BoundsRanges&) = default;
BoundsRanges& operator=(const BoundsRanges&) = default;
BoundsRanges(const std::ptrdiff_t* const) {}
BoundsRanges() = default;
@ -346,9 +344,9 @@ namespace details
static const size_t DynamicNum = Base::DynamicNum + 1;
static const size_type CurrentRange = dynamic_range;
static const size_type TotalSize = dynamic_range;
const size_type m_bound;
BoundsRanges(const BoundsRanges&) = default;
private:
size_type m_bound;
public:
BoundsRanges(const std::ptrdiff_t* const arr)
: Base(arr + 1), m_bound(*arr * this->Base::totalSize())
@ -420,8 +418,6 @@ namespace details
static const size_type TotalSize =
Base::TotalSize == dynamic_range ? dynamic_range : CurrentRange * Base::TotalSize;
BoundsRanges(const BoundsRanges&) = default;
BoundsRanges(const std::ptrdiff_t* const arr) : Base(arr) {}
BoundsRanges() = default;
@ -633,12 +629,6 @@ public:
constexpr static_bounds() = default;
constexpr static_bounds& operator=(const static_bounds& otherBounds)
{
new (&m_ranges) MyRanges(otherBounds.m_ranges);
return *this;
}
constexpr sliced_type slice() const noexcept
{
return sliced_type{static_cast<const details::BoundsRanges<RestRanges...>&>(m_ranges)};

9
gsl/span
View File

@ -132,8 +132,7 @@ namespace details
template <class From, class To>
struct is_allowed_element_type_conversion
: public std::integral_constant<bool, std::is_same<From, std::remove_cv_t<To>>::value ||
std::is_convertible<From(*)[], To(*)[]>::value>
: public std::integral_constant<bool, std::is_convertible<From (*)[], To (*)[]>::value>
{
};
@ -420,8 +419,7 @@ public:
details::is_allowed_extent_conversion<OtherExtent, Extent>::value &&
details::is_allowed_element_type_conversion<OtherElementType, element_type>::value>>
constexpr span(const span<OtherElementType, OtherExtent>& other)
: storage_(static_cast<pointer>(other.data()),
details::extent_type<OtherExtent>(other.size()))
: storage_(other.data(), details::extent_type<OtherExtent>(other.size()))
{
}
@ -431,8 +429,7 @@ public:
details::is_allowed_extent_conversion<OtherExtent, Extent>::value &&
details::is_allowed_element_type_conversion<OtherElementType, element_type>::value>>
constexpr span(span<OtherElementType, OtherExtent>&& other)
: storage_(static_cast<pointer>(other.data()),
details::extent_type<OtherExtent>(other.size()))
: storage_(other.data(), details::extent_type<OtherExtent>(other.size()))
{
}

26
gsl/string_span
View File

@ -118,6 +118,24 @@ namespace details
return len;
#endif
}
inline std::size_t wstring_length(const wchar_t *str, std::size_t n)
{
#ifdef GSL_PLATFORM_HAS_STRNLEN
return wcsnlen(str, n);
#else
if (str == nullptr || n == 0)
return 0;
std::size_t len = 0;
span<const wchar_t> str_span{str, n};
while (len < n && str_span[len])
len++;
return len;
#endif
}
}
//
@ -166,14 +184,14 @@ inline span<const char, dynamic_extent> ensure_z(const char* const& sz, std::ptr
inline span<wchar_t, dynamic_extent> ensure_z(wchar_t* const& sz, std::ptrdiff_t max)
{
auto len = wcsnlen(sz, narrow_cast<size_t>(max));
auto len = details::wstring_length(sz, narrow_cast<size_t>(max));
Ensures(sz[len] == 0);
return {sz, static_cast<std::ptrdiff_t>(len)};
}
inline span<const wchar_t, dynamic_extent> ensure_z(const wchar_t* const& sz, std::ptrdiff_t max)
{
auto len = wcsnlen(sz, narrow_cast<size_t>(max));
auto len = details::wstring_length(sz, narrow_cast<size_t>(max));
Ensures(sz[len] == 0);
return {sz, static_cast<std::ptrdiff_t>(len)};
}
@ -230,7 +248,7 @@ namespace details
{
std::ptrdiff_t operator()(wchar_t* const ptr, std::ptrdiff_t length) noexcept
{
return narrow_cast<std::ptrdiff_t>(wcsnlen(ptr, narrow_cast<size_t>(length)));
return narrow_cast<std::ptrdiff_t>(details::wstring_length(ptr, narrow_cast<size_t>(length)));
}
};
@ -248,7 +266,7 @@ namespace details
{
std::ptrdiff_t operator()(const wchar_t* const ptr, std::ptrdiff_t length) noexcept
{
return narrow_cast<std::ptrdiff_t>(wcsnlen(ptr, narrow_cast<size_t>(length)));
return narrow_cast<std::ptrdiff_t>(details::wstring_length(ptr, narrow_cast<size_t>(length)));
}
};
}