boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-07-31 13:27:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix BOOST_NO_CXX11_ALLOCATOR check

Browse Source
This commit is contained in:
Daniel James
2018-03-11 19:18:46 +00:00
committed by Vinnie Falco
parent 6a34afb38a
commit dabc1c8ae6
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -1,3 +1,9 @@
Version 165:
* Fix BOOST_NO_CXX11_ALLOCATOR check
--------------------------------------------------------------------------------
Version 164: Version 164:
* Fix masking on continuation frames * Fix masking on continuation frames

4
include/boost/beast/core/detail/allocator.hpp
View File

@@ -11,7 +11,7 @@
#define BOOST_BEAST_DETAIL_ALLOCATOR_HPP #define BOOST_BEAST_DETAIL_ALLOCATOR_HPP
#include <boost/config.hpp> #include <boost/config.hpp>
#if BOOST_NO_CXX11_ALLOCATOR #ifdef BOOST_NO_CXX11_ALLOCATOR
#include <boost/container/allocator_traits.hpp> #include <boost/container/allocator_traits.hpp>
#else #else
#include <memory> #include <memory>
@@ -25,7 +25,7 @@ namespace detail {
// implementations which falsely claim C++11 // implementations which falsely claim C++11
// compatibility. // compatibility.
#if BOOST_NO_CXX11_ALLOCATOR #ifdef BOOST_NO_CXX11_ALLOCATOR
template<class Alloc> template<class Alloc>
using allocator_traits = boost::container::allocator_traits<Alloc>; using allocator_traits = boost::container::allocator_traits<Alloc>;