Skip to content
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix access modifier
  • Loading branch information
barendgehrels committed Apr 26, 2025
commit 6aabaaf3d8c066af2e1d48089a2baffee6ab0621
3 changes: 3 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ BasedOnStyle: LLVM
---
Language: Cpp

AccessModifierOffset: 0
AlwaysBreakAfterReturnType: None
AlwaysBreakTemplateDeclarations: true
AllowShortBlocksOnASingleLine: Always
Expand All @@ -15,8 +16,10 @@ BinPackArguments: false
BinPackParameters: false
ColumnLimit: 100
CompactNamespaces: true
EmptyLineBeforeAccessModifier: Always
IndentCaseLabels: true
IndentWidth: 4
IndentAccessModifiers: false
PackConstructorInitializers: NextLine
PointerAlignment: Left
QualifierAlignment: Right
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ struct buffer_inserter<linestring_tag, Linestring, Polygon>
template <typename PolygonInput, typename PolygonOutput>
struct buffer_inserter<polygon_tag, PolygonInput, PolygonOutput>
{
private:
private:
using input_ring_type = ring_type_t<PolygonInput>;
using output_ring_type = ring_type_t<PolygonOutput>;

Expand Down Expand Up @@ -839,7 +839,7 @@ struct buffer_inserter<polygon_tag, PolygonInput, PolygonOutput>
true);
}

public:
public:
template <typename Collection,
typename DistanceStrategy,
typename SegmentStrategy,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ namespace buffer

struct buffer_overlay_visitor
{
public:
public:
template <typename Turns>
void visit_turns(int, Turns const&)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ struct unique_sub_range_from_piece
}
}

private:
private:
inline point_type const& get_point_k() const
{
if (! m_point_retrieved)
Expand Down Expand Up @@ -298,7 +298,7 @@ class piece_turn_visitor
}
}

public:
public:
piece_turn_visitor(Pieces const& pieces,
Rings const& ring_collection,
Turns& turns,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ struct piece_border
return m_ring == NULL || m_begin >= m_end || m_original_size == 0;
}

private:
private:
static geometry::strategy::buffer::place_on_ring_type
adapted_place_on_ring(geometry::strategy::buffer::place_on_ring_type target,
bool one_sided,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ inline int point_in_original(Point const& point,
template <typename Turns, typename Strategy>
class turn_in_original_visitor
{
public:
public:
turn_in_original_visitor(Turns& turns, Strategy const& strategy)
: m_mutable_turns(turns), m_strategy(strategy)
{
Expand Down Expand Up @@ -271,7 +271,7 @@ class turn_in_original_visitor
return true;
}

private:
private:
Turns& m_mutable_turns;
Strategy const& m_strategy;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class turn_in_piece_visitor
m_distance_strategy.apply(point, point, strategy::buffer::buffer_side_right));
}

public:
public:
inline turn_in_piece_visitor(Turns& turns,
Pieces const& pieces,
DistanceStrategy const& distance_strategy,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ struct clustered_count_handler
}
}

private:
private:
Geometry1 const& m_geometry1;
Geometry2 const& m_geometry2;
Turns& m_turns;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ template <bool Reverse1,
typename Strategy>
struct edge_selector
{
private:
private:
static constexpr operation_type target_operation = operation_from_overlay<OverlayType>::value;
using point_type = typename Turns::value_type::point_type;
using edge_type = edge_and_side<point_type>;
Expand Down Expand Up @@ -203,7 +203,7 @@ struct edge_selector
return edges.front().toi;
}

public:
public:
edge_selector(Geometry1 const& m_geometry1,
Geometry2 const& m_geometry2,
Turns const& m_turns,
Expand Down Expand Up @@ -296,7 +296,7 @@ struct edge_selector
return select_by_side(edges, p1, p2);
}

private:
private:
Geometry1 const& m_geometry1;
Geometry2 const& m_geometry2;
Turns const& m_turns;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ struct traverse_graph
update_administration();
}

private:
private:
edge_selector<Reverse1, Reverse2, OverlayType, Geometry1, Geometry2, Turns, Clusters, Strategy>
m_edge_selector;

Expand Down