diff options
Diffstat (limited to 'boost/align/detail/aligned_alloc.hpp')
| -rw-r--r-- | boost/align/detail/aligned_alloc.hpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/boost/align/detail/aligned_alloc.hpp b/boost/align/detail/aligned_alloc.hpp index 0488847bbd..69da19659a 100644 --- a/boost/align/detail/aligned_alloc.hpp +++ b/boost/align/detail/aligned_alloc.hpp @@ -1,10 +1,9 @@ /* -(c) 2014-2015 Glen Joseph Fernandes -<glenjofe -at- gmail.com> +Copyright 2014-2015 Glen Joseph Fernandes +(glenjofe@gmail.com) -Distributed under the Boost Software -License, Version 1.0. -http://boost.org/LICENSE_1_0.txt +Distributed under the Boost Software License, Version 1.0. +(http://www.boost.org/LICENSE_1_0.txt) */ #ifndef BOOST_ALIGN_DETAIL_ALIGNED_ALLOC_HPP #define BOOST_ALIGN_DETAIL_ALIGNED_ALLOC_HPP @@ -18,35 +17,36 @@ http://boost.org/LICENSE_1_0.txt namespace boost { namespace alignment { -inline void* aligned_alloc(std::size_t alignment, std::size_t size) - BOOST_NOEXCEPT +inline void* +aligned_alloc(std::size_t alignment, std::size_t size) BOOST_NOEXCEPT { BOOST_ASSERT(detail::is_alignment(alignment)); enum { - min_align = alignment_of<void*>::value + N = alignment_of<void*>::value }; - if (alignment < min_align) { - alignment = min_align; + if (alignment < N) { + alignment = N; } - std::size_t n = size + alignment - min_align; - void* r = 0; + std::size_t n = size + alignment - N; void* p = std::malloc(sizeof(void*) + n); if (p) { - r = static_cast<char*>(p) + sizeof p; + void* r = static_cast<char*>(p) + sizeof(void*); (void)align(alignment, size, r, n); *(static_cast<void**>(r) - 1) = p; + p = r; } - return r; + return p; } -inline void aligned_free(void* ptr) BOOST_NOEXCEPT +inline void +aligned_free(void* ptr) BOOST_NOEXCEPT { if (ptr) { std::free(*(static_cast<void**>(ptr) - 1)); } } -} /* .alignment */ -} /* .boost */ +} /* alignment */ +} /* boost */ #endif |