From 6f9aea4e56e13071a183a8ac5a05aaf5819399c0 Mon Sep 17 00:00:00 2001 From: Michael Krasnyk Date: Tue, 7 Mar 2017 14:14:10 +0100 Subject: [PATCH] fix clang format style --- include/util/msb.hpp | 2 +- include/util/shared_memory_vector_wrapper.hpp | 6 ++++-- src/partition/bisection_to_partition.cpp | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/util/msb.hpp b/include/util/msb.hpp index a58b93273..457cb79da 100644 --- a/include/util/msb.hpp +++ b/include/util/msb.hpp @@ -23,7 +23,7 @@ template std::size_t msb(T value) msb++; } BOOST_ASSERT(msb > 0); - return msb-1; + return msb - 1; } #if (defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)) && __x86_64__ diff --git a/include/util/shared_memory_vector_wrapper.hpp b/include/util/shared_memory_vector_wrapper.hpp index 9e0fa6228..3f6affcfe 100644 --- a/include/util/shared_memory_vector_wrapper.hpp +++ b/include/util/shared_memory_vector_wrapper.hpp @@ -106,12 +106,14 @@ template class SharedMemoryWrapper return m_ptr[index]; } - const DataT &front() const { + const DataT &front() const + { BOOST_ASSERT_MSG(m_size > 0, "invalid size"); return m_ptr[0]; } - const DataT &back() const { + const DataT &back() const + { BOOST_ASSERT_MSG(m_size > 0, "invalid size"); return m_ptr[m_size - 1]; } diff --git a/src/partition/bisection_to_partition.cpp b/src/partition/bisection_to_partition.cpp index 4a898ec6b..08f562366 100644 --- a/src/partition/bisection_to_partition.cpp +++ b/src/partition/bisection_to_partition.cpp @@ -69,7 +69,7 @@ void partitionLevel(const std::vector &node_to_bisection_id, return lhs | node_to_bisection_id[rhs]; }); // masks all bit strictly higher then cell.bit - BOOST_ASSERT(sizeof(unsigned long long)*CHAR_BIT > sizeof(BisectionID)*CHAR_BIT); + BOOST_ASSERT(sizeof(unsigned long long) * CHAR_BIT > sizeof(BisectionID) * CHAR_BIT); const BisectionID mask = (1ULL << (cell.bit + 1)) - 1; BOOST_ASSERT(mask == 0 || util::msb(mask) == cell.bit); const auto masked_sum = sum & mask; @@ -90,7 +90,7 @@ void partitionLevel(const std::vector &node_to_bisection_id, std::partition(permutation.begin() + cell.begin, permutation.begin() + cell.end, [is_left_mask, &node_to_bisection_id](const auto node_id) { - return node_to_bisection_id[node_id] & is_left_mask; + return node_to_bisection_id[node_id] & is_left_mask; }) - permutation.begin(); @@ -120,8 +120,8 @@ bisectionToPartition(const std::vector &node_to_bisection_id, std::iota(permutation.begin(), permutation.end(), 0); std::vector cells; - cells.push_back( - CellBisection{0, static_cast(node_to_bisection_id.size()), NUM_BISECTION_BITS-1, false}); + cells.push_back(CellBisection{ + 0, static_cast(node_to_bisection_id.size()), NUM_BISECTION_BITS - 1, false}); std::vector partitions(max_cell_sizes.size()); std::vector num_cells(max_cell_sizes.size());