Skip to content

Commit a475ad2

Browse files
DennisOSRMmattwigway
authored andcommitted
Fix formatting
1 parent 575718e commit a475ad2

File tree

10 files changed

+42
-16
lines changed

10 files changed

+42
-16
lines changed

include/guidance/turn_lane_handler.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ namespace lanes
3434

3535
namespace
3636
{
37-
using TurnLaneScenario = enum TurnLaneScenario
38-
{
37+
using TurnLaneScenario = enum TurnLaneScenario {
3938
SIMPLE, // a straightforward assignment
4039
PARTITION_LOCAL, // an assignment that requires partitioning, using local turns
4140
SIMPLE_PREVIOUS, // an assignemtnn using the turns specified at the previous road (e.g.

include/partitioner/cell_storage.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ template <storage::Ownership Ownership> class CellStorageImpl
100100
{
101101

102102
using ValueT = decltype(*std::declval<ValuePtrT>());
103-
using base_t = boost::iterator_facade<ColumnIterator<ValueT>, ValueT, boost::random_access_traversal_tag>;
103+
using base_t = boost::
104+
iterator_facade<ColumnIterator<ValueT>, ValueT, boost::random_access_traversal_tag>;
104105

105106
public:
106107
using value_type = typename base_t::value_type;

include/util/bit_range.hpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ class BitIterator : public boost::iterator_facade<BitIterator<DataT>,
4949
boost::forward_traversal_tag,
5050
const std::size_t>
5151
{
52-
using base_t = boost::iterator_facade<BitIterator<DataT>, const std::size_t, boost::forward_traversal_tag, const std::size_t>;
52+
using base_t = boost::iterator_facade<BitIterator<DataT>,
53+
const std::size_t,
54+
boost::forward_traversal_tag,
55+
const std::size_t>;
5356

5457
public:
5558
using value_type = typename base_t::value_type;

include/util/filtered_integer_range.hpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ class filtered_integer_iterator
2626
boost::single_pass_traversal_tag,
2727
Integer>
2828
{
29-
using base_t = boost::iterator_facade<filtered_integer_iterator<Integer, Filter>, Integer, boost::single_pass_traversal_tag, Integer>;
29+
using base_t = boost::iterator_facade<filtered_integer_iterator<Integer, Filter>,
30+
Integer,
31+
boost::single_pass_traversal_tag,
32+
Integer>;
3033

3134
public:
3235
using value_type = typename base_t::value_type;

include/util/integer_range.hpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ class integer_iterator : public boost::iterator_facade<integer_iterator<Integer>
2222
boost::random_access_traversal_tag,
2323
Integer>
2424
{
25-
using base_t = boost::iterator_facade<integer_iterator<Integer>, Integer, boost::random_access_traversal_tag, Integer>;
25+
using base_t = boost::iterator_facade<integer_iterator<Integer>,
26+
Integer,
27+
boost::random_access_traversal_tag,
28+
Integer>;
2629

2730
public:
2831
using value_type = typename base_t::value_type;

include/util/packed_vector.hpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,10 @@ template <typename T, std::size_t Bits, storage::Ownership Ownership> class Pack
336336
boost::random_access_traversal_tag,
337337
ReferenceT>
338338
{
339-
using base_t = boost::iterator_facade<iterator_impl<DataT, ContainerT, ReferenceT>, DataT, boost::random_access_traversal_tag, ReferenceT>;
339+
using base_t = boost::iterator_facade<iterator_impl<DataT, ContainerT, ReferenceT>,
340+
DataT,
341+
boost::random_access_traversal_tag,
342+
ReferenceT>;
340343

341344
public:
342345
using value_type = typename base_t::value_type;

include/util/static_assert.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@ namespace util
1010

1111
template <typename It, typename Value> inline void static_assert_iter_value()
1212
{
13-
using IterValueType = typename std::iterator_traits;<It>::value_type;
13+
using IterValueType = typename std::iterator_traits;
14+
<It>::value_type;
1415
static_assert(std::is_same<IterValueType, Value>::value, "");
1516
}
1617

1718
template <typename It, typename Category> inline void static_assert_iter_category()
1819
{
19-
using IterCategoryType = typename std::iterator_traits;<It>::iterator_category;
20+
using IterCategoryType = typename std::iterator_traits;
21+
<It>::iterator_category;
2022
static_assert(std::is_base_of<Category, IterCategoryType>::value, "");
2123
}
2224

include/util/vector_view.hpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ class VectorViewIterator : public boost::iterator_facade<VectorViewIterator<Data
3030
boost::random_access_traversal_tag,
3131
DataT &>
3232
{
33-
using base_t = boost::iterator_facade<VectorViewIterator<DataT>, DataT, boost::random_access_traversal_tag, DataT &>;
33+
using base_t = boost::iterator_facade<VectorViewIterator<DataT>,
34+
DataT,
35+
boost::random_access_traversal_tag,
36+
DataT &>;
3437

3538
public:
3639
using value_type = typename base_t::value_type;

unit_tests/util/query_heap.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ struct TestData
2222
using TestNodeID = NodeID;
2323
using TestKey = int;
2424
using TestWeight = int;
25-
using storage_types = boost::mpl::list<ArrayStorage<TestNodeID, TestKey>, MapStorage<TestNodeID, TestKey>, UnorderedMapStorage<TestNodeID, TestKey>>;
25+
using storage_types = boost::mpl::list<ArrayStorage<TestNodeID, TestKey>,
26+
MapStorage<TestNodeID, TestKey>,
27+
UnorderedMapStorage<TestNodeID, TestKey>>;
2628

2729
template <unsigned NUM_ELEM> struct RandomDataFixture
2830
{

unit_tests/util/static_rtree.cpp

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,18 @@ struct GraphFixture
174174
std::vector<TestData> edges;
175175
};
176176

177-
using TestRandomGraphFixture_LeafHalfFull = RandomGraphFixture<TEST_LEAF_NODE_SIZE * 3, TEST_LEAF_NODE_SIZE / 2>;
178-
using TestRandomGraphFixture_LeafFull = RandomGraphFixture<TEST_LEAF_NODE_SIZE * 5, TEST_LEAF_NODE_SIZE>;
179-
using TestRandomGraphFixture_TwoLeaves = RandomGraphFixture<TEST_LEAF_NODE_SIZE * 10, TEST_LEAF_NODE_SIZE * 2>;
180-
using TestRandomGraphFixture_Branch = RandomGraphFixture<TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 3, TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR>;
181-
using TestRandomGraphFixture_MultipleLevels = RandomGraphFixture<TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 3, TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 2>;
177+
using TestRandomGraphFixture_LeafHalfFull =
178+
RandomGraphFixture<TEST_LEAF_NODE_SIZE * 3, TEST_LEAF_NODE_SIZE / 2>;
179+
using TestRandomGraphFixture_LeafFull =
180+
RandomGraphFixture<TEST_LEAF_NODE_SIZE * 5, TEST_LEAF_NODE_SIZE>;
181+
using TestRandomGraphFixture_TwoLeaves =
182+
RandomGraphFixture<TEST_LEAF_NODE_SIZE * 10, TEST_LEAF_NODE_SIZE * 2>;
183+
using TestRandomGraphFixture_Branch =
184+
RandomGraphFixture<TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 3,
185+
TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR>;
186+
using TestRandomGraphFixture_MultipleLevels =
187+
RandomGraphFixture<TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 3,
188+
TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 2>;
182189
using TestRandomGraphFixture_10_30 = RandomGraphFixture<10, 30>;
183190

184191
template <typename RTreeT>

0 commit comments

Comments
 (0)