From 6147f01a6d460e80adde69fdb3b2a816fd159dd7 Mon Sep 17 00:00:00 2001 From: Glen Fernandes Date: Wed, 3 May 2017 08:44:31 -0400 Subject: [PATCH] Reformat source; wrap at 80 characters --- README.md | 7 ++-- include/boost/align/aligned_allocator.hpp | 6 ++-- .../boost/align/aligned_allocator_adaptor.hpp | 36 +++++++------------ include/boost/align/detail/align.hpp | 4 +-- include/boost/align/detail/align_down.hpp | 4 +-- include/boost/align/detail/align_up.hpp | 4 +-- .../boost/align/detail/alignment_of_msvc.hpp | 3 +- test/aligned_allocator_adaptor_test.cpp | 24 +++++-------- 8 files changed, 32 insertions(+), 56 deletions(-) diff --git a/README.md b/README.md index 7228558..983b806 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,9 @@ # Boost.Align -The Boost Align C++ library provides functions, classes, templates, -traits, and macros, for the control, inspection, and diagnostic of -memory alignment. +The Boost Align C++ library provides functions, classes, templates, traits, +and macros, for the control, inspection, and diagnostic of memory alignment. ### License Distributed under the -[Boost Software License, Version 1.0](http://boost.org/LICENSE_1_0.txt). +[Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt). diff --git a/include/boost/align/aligned_allocator.hpp b/include/boost/align/aligned_allocator.hpp index 6d0f788..6176bc2 100644 --- a/include/boost/align/aligned_allocator.hpp +++ b/include/boost/align/aligned_allocator.hpp @@ -28,8 +28,7 @@ namespace alignment { template class aligned_allocator { - BOOST_STATIC_ASSERT(detail:: - is_alignment_constant::value); + BOOST_STATIC_ASSERT(detail::is_alignment_constant::value); public: typedef T value_type; @@ -124,8 +123,7 @@ public: template class aligned_allocator { - BOOST_STATIC_ASSERT(detail:: - is_alignment_constant::value); + BOOST_STATIC_ASSERT(detail::is_alignment_constant::value); public: typedef void value_type; diff --git a/include/boost/align/aligned_allocator_adaptor.hpp b/include/boost/align/aligned_allocator_adaptor.hpp index 8905c21..996b5a7 100644 --- a/include/boost/align/aligned_allocator_adaptor.hpp +++ b/include/boost/align/aligned_allocator_adaptor.hpp @@ -32,39 +32,30 @@ namespace alignment { template class aligned_allocator_adaptor : public Allocator { - BOOST_STATIC_ASSERT(detail:: - is_alignment_constant::value); + BOOST_STATIC_ASSERT(detail::is_alignment_constant::value); #if !defined(BOOST_NO_CXX11_ALLOCATOR) typedef std::allocator_traits traits; - - typedef typename traits:: - template rebind_alloc char_alloc; - - typedef typename traits:: - template rebind_traits char_traits; - + typedef typename traits::template rebind_alloc char_alloc; + typedef typename traits::template rebind_traits char_traits; typedef typename char_traits::pointer char_ptr; #else - typedef typename Allocator:: - template rebind::other char_alloc; - + typedef typename Allocator::template rebind::other char_alloc; typedef typename char_alloc::pointer char_ptr; #endif public: #if !defined(BOOST_NO_CXX11_ALLOCATOR) typedef typename traits::value_type value_type; - typedef typename traits::size_type size_type; #else typedef typename Allocator::value_type value_type; - typedef typename Allocator::size_type size_type; #endif typedef value_type* pointer; typedef const value_type* const_pointer; typedef void* void_pointer; typedef const void* const_void_pointer; + typedef std::size_t size_type; typedef std::ptrdiff_t difference_type; private: @@ -77,11 +68,11 @@ public: template struct rebind { #if !defined(BOOST_NO_CXX11_ALLOCATOR) - typedef aligned_allocator_adaptor, Alignment> other; + typedef aligned_allocator_adaptor, Alignment> other; #else - typedef aligned_allocator_adaptor::other, Alignment> other; + typedef aligned_allocator_adaptor::other, Alignment> other; #endif }; @@ -122,8 +113,7 @@ public: char_ptr p = a.allocate(sizeof p + n); void* r = detail::addressof(*p) + sizeof p; (void)align(min_align, s, r, n); - ::new(static_cast(static_cast(r) - - 1)) char_ptr(p); + ::new(static_cast(static_cast(r) - 1)) char_ptr(p); return static_cast(r); } @@ -142,8 +132,7 @@ public: #endif void* r = detail::addressof(*p) + sizeof p; (void)align(min_align, s, r, n); - ::new(static_cast(static_cast(r) - - 1)) char_ptr(p); + ::new(static_cast(static_cast(r) - 1)) char_ptr(p); return static_cast(r); } @@ -152,8 +141,7 @@ public: char_ptr r = *p; p->~char_ptr(); char_alloc a(base()); - a.deallocate(r, sizeof r + size * sizeof(value_type) + - min_align - 1); + a.deallocate(r, sizeof r + size * sizeof(value_type) + min_align - 1); } }; diff --git a/include/boost/align/detail/align.hpp b/include/boost/align/detail/align.hpp index a58dcea..905940a 100644 --- a/include/boost/align/detail/align.hpp +++ b/include/boost/align/detail/align.hpp @@ -20,8 +20,8 @@ align(std::size_t alignment, std::size_t size, void*& ptr, { BOOST_ASSERT(detail::is_alignment(alignment)); if (size <= space) { - char* p = reinterpret_cast((reinterpret_cast(ptr) + alignment - 1) & ~(alignment - 1)); + char* p = reinterpret_cast(~(alignment - 1) & + (reinterpret_cast(ptr) + alignment - 1)); std::size_t n = space - (p - static_cast(ptr)); if (size <= n) { ptr = p; diff --git a/include/boost/align/detail/align_down.hpp b/include/boost/align/detail/align_down.hpp index 9a8c358..de3c80d 100644 --- a/include/boost/align/detail/align_down.hpp +++ b/include/boost/align/detail/align_down.hpp @@ -18,8 +18,8 @@ inline void* align_down(void* ptr, std::size_t alignment) BOOST_NOEXCEPT { BOOST_ASSERT(detail::is_alignment(alignment)); - return reinterpret_cast(reinterpret_cast(ptr) & ~(alignment - 1)); + return reinterpret_cast(~(alignment - 1) & + reinterpret_cast(ptr)); } } /* alignment */ diff --git a/include/boost/align/detail/align_up.hpp b/include/boost/align/detail/align_up.hpp index 86686da..ac11f89 100644 --- a/include/boost/align/detail/align_up.hpp +++ b/include/boost/align/detail/align_up.hpp @@ -18,8 +18,8 @@ inline void* align_up(void* ptr, std::size_t alignment) BOOST_NOEXCEPT { BOOST_ASSERT(detail::is_alignment(alignment)); - return reinterpret_cast((reinterpret_cast(ptr) + alignment - 1) & ~(alignment - 1)); + return reinterpret_cast(~(alignment - 1) & + (reinterpret_cast(ptr) + alignment - 1)); } } /* alignment */ diff --git a/include/boost/align/detail/alignment_of_msvc.hpp b/include/boost/align/detail/alignment_of_msvc.hpp index 1526c7c..440b840 100644 --- a/include/boost/align/detail/alignment_of_msvc.hpp +++ b/include/boost/align/detail/alignment_of_msvc.hpp @@ -23,8 +23,7 @@ struct offset_value { template struct alignment_of - : min_size) - (sizeof(T) << 1)> { }; + : min_size) - (sizeof(T) << 1)> { }; } /* detail */ } /* alignment */ diff --git a/test/aligned_allocator_adaptor_test.cpp b/test/aligned_allocator_adaptor_test.cpp index d0d6b19..720cb65 100644 --- a/test/aligned_allocator_adaptor_test.cpp +++ b/test/aligned_allocator_adaptor_test.cpp @@ -73,8 +73,7 @@ template void test_allocate() { { - boost::alignment::aligned_allocator_adaptor, - Alignment> a(5); + boost::alignment::aligned_allocator_adaptor, Alignment> a(5); int* p = a.allocate(1); BOOST_TEST(p != 0); BOOST_TEST(boost::alignment::is_aligned(p, Alignment)); @@ -82,8 +81,7 @@ void test_allocate() a.deallocate(p, 1); } { - boost::alignment::aligned_allocator_adaptor, - Alignment> a(5); + boost::alignment::aligned_allocator_adaptor, Alignment> a(5); int* p = a.allocate(1); int* q = a.allocate(1, p); BOOST_TEST(q != 0); @@ -93,8 +91,7 @@ void test_allocate() a.deallocate(p, 1); } { - boost::alignment::aligned_allocator_adaptor, - Alignment> a(5); + boost::alignment::aligned_allocator_adaptor, Alignment> a(5); int* p = a.allocate(0); a.deallocate(p, 0); } @@ -103,8 +100,7 @@ void test_allocate() template void test_construct() { - boost::alignment::aligned_allocator_adaptor, - Alignment> a(5); + boost::alignment::aligned_allocator_adaptor, Alignment> a(5); int* p = a.allocate(1); a.construct(p, 1); BOOST_TEST(*p == 1); @@ -116,16 +112,13 @@ template void test_constructor() { { - boost::alignment::aligned_allocator_adaptor, - Alignment> a(5); - boost::alignment::aligned_allocator_adaptor, - Alignment> b(a); + boost::alignment::aligned_allocator_adaptor, Alignment> a(5); + boost::alignment::aligned_allocator_adaptor, Alignment> b(a); BOOST_TEST(b == a); } { A a(5); - boost::alignment::aligned_allocator_adaptor, - Alignment> b(a); + boost::alignment::aligned_allocator_adaptor, Alignment> b(a); BOOST_TEST(b.base() == a); } } @@ -133,8 +126,7 @@ void test_constructor() template void test_rebind() { - boost::alignment::aligned_allocator_adaptor, - Alignment> a(5); + boost::alignment::aligned_allocator_adaptor, Alignment> a(5); typename boost::alignment::aligned_allocator_adaptor, Alignment>::template rebind::other b(a); BOOST_TEST(b == a);