Use Boost.Config

This commit is contained in:
Vinnie Falco
2017-07-20 08:15:30 -07:00
parent f65a611b85
commit 0324dc371f
9 changed files with 34 additions and 31 deletions
+9 -6
View File
@@ -8,20 +8,23 @@
#ifndef BEAST_CONFIG_HPP
#define BEAST_CONFIG_HPP
#include <boost/config.hpp>
// Available to every header
#include <boost/core/ignore_unused.hpp>
#include <boost/static_assert.hpp>
/*
_MSC_VER and _MSC_FULL_VER by version:
14.0 (2015) 1900 190023026
14.0 (2015 Update 1) 1900 190023506
14.0 (2015 Update 2) 1900 190023918
14.0 (2015 Update 3) 1900 190024210
14.0 (2015) 1900 190023026
14.0 (2015 Update 1) 1900 190023506
14.0 (2015 Update 2) 1900 190023918
14.0 (2015 Update 3) 1900 190024210
*/
#if defined(_MSC_FULL_VER)
#if _MSC_FULL_VER < 190024210
#ifdef BOOST_MSVC
#if BOOST_MSVC_FULL_VER < 190024210
static_assert(false,
"This library requires Visual Studio 2015 Update 3 or later");
#endif
+2 -2
View File
@@ -20,7 +20,7 @@
#if ! BEAST_NO_INTRINSICS
#if defined(BOOST_MSVC)
#ifdef BOOST_MSVC
#include <intrin.h> // __cpuid
#else
#include <cpuid.h> // __get_cpuid
@@ -41,7 +41,7 @@ cpuid(
std::uint32_t& ecx,
std::uint32_t& edx)
{
#if defined(BOOST_MSVC)
#ifdef BOOST_MSVC
int regs[4];
__cpuid(regs, id);
eax = regs[0];
@@ -8,6 +8,7 @@
#ifndef BEAST_DETAIL_INTEGER_SEQUENCE_HPP
#define BEAST_DETAIL_INTEGER_SEQUENCE_HPP
#include <boost/config.hpp>
#include <cstddef>
#include <type_traits>
#include <utility>
@@ -39,9 +40,9 @@ struct sizeof_workaround
static std::size_t constexpr size = sizeof... (Args);
};
#ifdef _MSC_VER
#ifdef BOOST_MSVC
// This implementation compiles on MSVC and clang but not gcc
// This implementation compiles on real MSVC and clang but not gcc
template<class T, unsigned long long N, class Seq>
struct make_integer_sequence_unchecked;