Skip to content

experimental: use clang-format for buffer and graph #1400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 2 commits
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
27 changes: 27 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
BasedOnStyle: LLVM
---
Language: Cpp

AccessModifierOffset: 0
AlwaysBreakAfterReturnType: None
AlwaysBreakTemplateDeclarations: true
AllowShortBlocksOnASingleLine: Always
AllowShortCaseLabelsOnASingleLine: true
AllowShortEnumsOnASingleLine: true
AllowShortLambdasOnASingleLine: true
BreakBeforeBinaryOperators: All
BreakBeforeBraces: Allman
BinPackArguments: false
BinPackParameters: false
ColumnLimit: 100
CompactNamespaces: true
EmptyLineBeforeAccessModifier: Always
IndentCaseLabels: true
IndentWidth: 4
IndentAccessModifiers: false
PackConstructorInitializers: NextLine
PointerAlignment: Left
QualifierAlignment: Right
SpaceAfterLogicalNot: true
SpaceAfterTemplateKeyword: true
19 changes: 12 additions & 7 deletions include/boost/geometry/algorithms/detail/buffer/buffer_box.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,19 @@

#include <cstddef>

#include <boost/geometry/core/access.hpp>
#include <boost/geometry/core/coordinate_dimension.hpp>
#include <boost/geometry/core/coordinate_type.hpp>
#include <boost/geometry/core/access.hpp>


namespace boost { namespace geometry
namespace boost
{
namespace geometry
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I cannot find a rule which doesn't affect this style for namespace.
Maybe we can live with this change.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the more detailled Brace rules as in #1400 (comment) , I can get namespace boost { namespace geometry {

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, better for sure! Thanks! Applied!

{

#ifndef DOXYGEN_NO_DETAIL
namespace detail { namespace buffer
namespace detail
{
namespace buffer
{

template <typename BoxIn, typename BoxOut, typename T, std::size_t C, std::size_t D, std::size_t N>
Expand All @@ -43,7 +46,7 @@ struct box_loop<BoxIn, BoxOut, T, C, N, N>
};

// Extends a box with the same amount in all directions
template<typename BoxIn, typename BoxOut, typename T>
template <typename BoxIn, typename BoxOut, typename T>
inline void buffer_box(BoxIn const& box_in, T const& distance, BoxOut& box_out)
{
assert_dimension_equal<BoxIn, BoxOut>();
Expand All @@ -54,9 +57,11 @@ inline void buffer_box(BoxIn const& box_in, T const& distance, BoxOut& box_out)
box_loop<BoxIn, BoxOut, T, max_corner, 0, N>::apply(box_in, distance, box_out);
}

}} // namespace detail::buffer
} // namespace buffer
} // namespace detail
#endif // DOXYGEN_NO_DETAIL

}} // namespace boost::geometry
} // namespace geometry
} // namespace boost

#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_BUFFER_BOX_HPP
Loading