diff options
Diffstat (limited to 'boost/align/detail/max_align.hpp')
-rw-r--r-- | boost/align/detail/max_align.hpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/boost/align/detail/max_align.hpp b/boost/align/detail/max_align.hpp index 4351a5a2ed..daa0413935 100644 --- a/boost/align/detail/max_align.hpp +++ b/boost/align/detail/max_align.hpp @@ -1,6 +1,6 @@ /* -(c) 2014 Glen Joseph Fernandes -glenjofe at gmail dot com +(c) 2014-2015 Glen Joseph Fernandes +<glenjofe -at- gmail.com> Distributed under the Boost Software License, Version 1.0. @@ -9,20 +9,21 @@ http://boost.org/LICENSE_1_0.txt #ifndef BOOST_ALIGN_DETAIL_MAX_ALIGN_HPP #define BOOST_ALIGN_DETAIL_MAX_ALIGN_HPP -#include <boost/align/detail/integral_constant.hpp> +#include <boost/align/detail/max_size.hpp> +#include <boost/align/alignment_of.hpp> #include <cstddef> namespace boost { namespace alignment { namespace detail { -template<std::size_t A, std::size_t B> +template<class A, class B> struct max_align - : integral_constant<std::size_t, (A > B) ? A : B> { + : max_size<alignment_of<A>::value, alignment_of<B>::value>::type { }; -} /* :detail */ -} /* :alignment */ -} /* :boost */ +} /* .detail */ +} /* .alignment */ +} /* .boost */ #endif |