Skip to content

Commit d3dedd4

Browse files
author
Heiko Thiel
committedApr 21, 2020
* More fundamental headers come last
* Increase value of Priority in .clang-format so in case a new dependency will be added not all values have to adjusted
·
pcl-1.11.1pcl-1.11.0
1 parent 98e3eed commit d3dedd4

16 files changed

+53
-44
lines changed
 

‎.clang-format

+26-17
Original file line numberDiff line numberDiff line change
@@ -24,37 +24,46 @@ TabWidth: 2
2424
UseTab: Never
2525
IncludeBlocks: Regroup
2626
IncludeCategories:
27-
- Regex: '^<pcl/'
28-
Priority: 1
27+
# Main PCL includes of common module should be sorted at end of PCL includes
28+
- Regex: '^<pcl/[^/]+>$'
29+
Priority: 100
30+
SortPriority: 101
31+
# All other PCL includes, which are grouped into modules
32+
- Regex: '^<pcl/.*/.*>$'
33+
Priority: 100
34+
SortPriority: 100
35+
# Major 3rd-Party components of tests & modules
2936
- Regex: '^<gtest/'
30-
Priority: 2
37+
Priority: 200
3138
- Regex: '^<boost/'
32-
Priority: 3
39+
Priority: 210
3340
- Regex: '^<(unsupported/)?Eigen/'
34-
Priority: 4
41+
Priority: 220
3542
- Regex: '^<flann/'
36-
Priority: 5
43+
Priority: 230
44+
# Major 3rd-Party components of apps
3745
- Regex: '^<Q[^/]+>$'
38-
Priority: 6
46+
Priority: 300
3947
- Regex: '^<ui_[^/]+\.h>$'
40-
Priority: 6
48+
Priority: 300
4149
- Regex: '^<vtk[^/]+\.h>$'
42-
Priority: 7
50+
Priority: 310
51+
# Minor 3rd-Party components
4352
- Regex: '^<librealsense2/'
44-
Priority: 8
53+
Priority: 400
4554
- Regex: '^<(ros|message_filters)/'
46-
Priority: 9
55+
Priority: 410
4756
- Regex: '^<opencv(2)?/'
48-
Priority: 10
57+
Priority: 420
4958
- Regex: '^<tide/'
50-
Priority: 11
59+
Priority: 430
5160
- Regex: '^<thrust/'
52-
Priority: 12
61+
Priority: 440
5362
- Regex: '^<(OpenGL|(GL(UT)?/))'
54-
Priority: 13
63+
Priority: 450
5564
# Matches all std includes. Match them before any unknown include, so we can order them behind.
5665
- Regex: '^<[a-z]+>$'
57-
Priority: 15
66+
Priority: 900
5867
# Any unknown include
5968
- Regex: '.*'
60-
Priority: 14
69+
Priority: 500

‎ml/include/pcl/ml/densecrf.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939

4040
#pragma once
4141

42-
#include <pcl/memory.h>
4342
#include <pcl/ml/pairwise_potential.h>
43+
#include <pcl/memory.h>
4444
#include <pcl/pcl_macros.h>
4545
#include <pcl/point_cloud.h>
4646
#include <pcl/point_types.h>

‎octree/include/pcl/octree/octree_nodes.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838

3939
#pragma once
4040

41-
#include <pcl/memory.h>
4241
#include <pcl/octree/octree_container.h>
42+
#include <pcl/memory.h>
4343
#include <pcl/pcl_macros.h>
4444

4545
#include <Eigen/Core>

‎octree/include/pcl/octree/octree_pointcloud_changedetector.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838

3939
#pragma once
4040

41-
#include <pcl/memory.h>
4241
#include <pcl/octree/octree2buf_base.h>
4342
#include <pcl/octree/octree_pointcloud.h>
43+
#include <pcl/memory.h>
4444

4545
namespace pcl {
4646
namespace octree {

‎simulation/include/pcl/simulation/model.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#pragma once
22

3-
#include <pcl/PolygonMesh.h>
43
#include <pcl/io/pcd_io.h>
4+
#include <pcl/simulation/glsl_shader.h>
5+
#include <pcl/PolygonMesh.h>
56
#include <pcl/memory.h>
67
#include <pcl/pcl_config.h>
78
#include <pcl/pcl_macros.h>
89
#include <pcl/point_types.h>
9-
#include <pcl/simulation/glsl_shader.h>
1010

1111
#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)
1212
#define WIN32_LEAN_AND_MEAN 1

‎simulation/include/pcl/simulation/range_likelihood.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#pragma once
22

33
#include <pcl/common/transforms.h>
4-
#include <pcl/memory.h>
5-
#include <pcl/pcl_config.h>
6-
#include <pcl/pcl_macros.h>
74
#include <pcl/range_image/range_image_planar.h>
85
#include <pcl/simulation/camera.h>
96
#include <pcl/simulation/glsl_shader.h>
107
#include <pcl/simulation/scene.h>
118
#include <pcl/simulation/sum_reduce.h>
9+
#include <pcl/memory.h>
10+
#include <pcl/pcl_config.h>
11+
#include <pcl/pcl_macros.h>
1212

1313
#include <Eigen/StdVector>
1414

‎simulation/include/pcl/simulation/sum_reduce.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
#pragma once
99

10-
#include <pcl/pcl_config.h>
1110
#include <pcl/simulation/glsl_shader.h>
1211
#include <pcl/simulation/model.h>
12+
#include <pcl/pcl_config.h>
1313

1414
#include <GL/glew.h>
1515
#ifdef OPENGL_IS_A_FRAMEWORK

‎simulation/src/range_likelihood.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <pcl/common/time.h>
2-
#include <pcl/pcl_config.h>
32
#include <pcl/simulation/range_likelihood.h>
3+
#include <pcl/pcl_config.h>
44

55
#include <boost/math/distributions/normal.hpp>
66

‎simulation/tools/sim_test_performance.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
#include <pcl/features/normal_3d.h>
1414
#include <pcl/io/pcd_io.h>
1515
#include <pcl/io/vtk_lib_io.h>
16-
#include <pcl/memory.h>
17-
#include <pcl/pcl_config.h>
18-
#include <pcl/point_types.h>
1916
#include <pcl/simulation/camera.h>
2017
#include <pcl/simulation/model.h>
2118
#include <pcl/simulation/range_likelihood.h>
2219
#include <pcl/simulation/scene.h>
2320
#include <pcl/surface/gp3.h>
21+
#include <pcl/memory.h>
22+
#include <pcl/pcl_config.h>
23+
#include <pcl/point_types.h>
2424

2525
#include <Eigen/Dense>
2626

‎simulation/tools/sim_test_simple.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@
2323
#include <pcl/features/normal_3d.h>
2424
#include <pcl/io/pcd_io.h>
2525
#include <pcl/io/vtk_lib_io.h>
26-
#include <pcl/memory.h>
27-
#include <pcl/pcl_config.h>
28-
#include <pcl/point_types.h>
2926
#include <pcl/range_image/range_image_planar.h> // RangeImage
3027
#include <pcl/simulation/camera.h>
3128
#include <pcl/simulation/model.h>
3229
#include <pcl/simulation/range_likelihood.h>
3330
#include <pcl/simulation/scene.h>
3431
#include <pcl/surface/gp3.h>
3532
#include <pcl/visualization/cloud_viewer.h> // Pop-up viewer
33+
#include <pcl/memory.h>
34+
#include <pcl/pcl_config.h>
35+
#include <pcl/point_types.h>
3636

3737
#include <Eigen/Dense>
3838

‎simulation/tools/sim_viewer.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@
4545
#include <pcl/features/normal_3d.h>
4646
#include <pcl/io/pcd_io.h>
4747
#include <pcl/io/vtk_lib_io.h>
48-
#include <pcl/memory.h>
49-
#include <pcl/pcl_config.h>
50-
#include <pcl/point_types.h>
5148
#include <pcl/range_image/range_image_planar.h> // RangeImage
5249
#include <pcl/simulation/camera.h>
5350
#include <pcl/simulation/model.h>
@@ -60,6 +57,9 @@
6057
#include <pcl/visualization/pcl_visualizer.h>
6158
#include <pcl/visualization/point_cloud_handlers.h>
6259
#include <pcl/visualization/point_picking_event.h>
60+
#include <pcl/memory.h>
61+
#include <pcl/pcl_config.h>
62+
#include <pcl/point_types.h>
6363

6464
#include <Eigen/Dense>
6565
#include <Eigen/Geometry>

‎simulation/tools/simulation_io.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
#include <pcl/io/pcd_io.h>
44
#include <pcl/io/vtk_lib_io.h>
5-
#include <pcl/memory.h>
6-
#include <pcl/pcl_config.h>
7-
#include <pcl/point_types.h>
85
#include <pcl/simulation/camera.h>
96
#include <pcl/simulation/range_likelihood.h>
107
#include <pcl/simulation/scene.h>
8+
#include <pcl/memory.h>
9+
#include <pcl/pcl_config.h>
10+
#include <pcl/point_types.h>
1111

1212
#include <GL/glew.h>
1313

‎stereo/include/pcl/stereo/digital_elevation_map.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636

3737
#pragma once
3838

39-
#include <pcl/point_types.h>
4039
#include <pcl/stereo/disparity_map_converter.h>
40+
#include <pcl/point_types.h>
4141

4242
namespace pcl {
4343

‎stereo/include/pcl/stereo/impl/disparity_map_converter.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939

4040
#include <pcl/common/intensity.h>
4141
#include <pcl/console/print.h>
42-
#include <pcl/point_types.h>
4342
#include <pcl/stereo/disparity_map_converter.h>
43+
#include <pcl/point_types.h>
4444

4545
#include <fstream>
4646
#include <limits>

‎stereo/include/pcl/stereo/stereo_grabber.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
#pragma once
3939

4040
#include <pcl/common/time_trigger.h>
41-
#include <pcl/conversions.h>
4241
#include <pcl/io/grabber.h>
43-
#include <pcl/point_cloud.h>
4442
#include <pcl/stereo/stereo_matching.h>
43+
#include <pcl/conversions.h>
44+
#include <pcl/point_cloud.h>
4545

4646
namespace pcl {
4747

‎stereo/src/stereo_grabber.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
*
3636
*/
3737

38+
#include <pcl/stereo/stereo_grabber.h>
3839
#include <pcl/point_cloud.h>
3940
#include <pcl/point_types.h>
40-
#include <pcl/stereo/stereo_grabber.h>
4141

4242
///////////////////////////////////////////////////////////////////////////////////////////
4343
//////////////////////// GrabberImplementation //////////////////////

0 commit comments

Comments
 (0)
Please sign in to comment.