premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

pick standard std::aligned_union if using clang (#2447)

This commit is contained in:
Alden Torres 2017-10-14 22:29:33 -04:00 committed by Arvid Norberg
parent 516df740a3
commit 762ae9aec4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libtorrent/aux_/aligned_storage.hpp
View File

@ -37,7 +37,7 @@ POSSIBILITY OF SUCH DAMAGE.
namespace libtorrent { namespace aux {
#if defined __GNUC__ && __GNUC__ < 5
#if defined __GNUC__ && __GNUC__ < 5 && !defined(_LIBCPP_VERSION)
// this is for backwards compatibility with not-quite C++11 compilers
template <std::size_t Len, std::size_t Align = alignof(void*)>

2
include/libtorrent/aux_/aligned_union.hpp
View File

@ -37,7 +37,7 @@ POSSIBILITY OF SUCH DAMAGE.
namespace libtorrent { namespace aux {
#if defined __GNUC__ && __GNUC__ < 5
#if defined __GNUC__ && __GNUC__ < 5 && !defined(_LIBCPP_VERSION)
constexpr std::size_t max(std::size_t a)
{ return a; }