Skip to content

Commit 464f929

Browse files
mviethmvieth
authored
Merge pull request #5886 from Zekrom-7780/SemiColon_Changes
Semi-Colon Changes
2 parents e212ce7 + 90e8bac commit 464f929

File tree

3 files changed

+40
-41
lines changed

3 files changed

+40
-41
lines changed

‎apps/include/pcl/apps/manual_registration.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class ManualRegistration : public QMainWindow {
5959
using CloudPtr = Cloud::Ptr;
6060
using CloudConstPtr = Cloud::ConstPtr;
6161

62-
PCL_MAKE_ALIGNED_OPERATOR_NEW;
62+
PCL_MAKE_ALIGNED_OPERATOR_NEW
6363

6464
ManualRegistration(float voxel_size);
6565

‎common/include/pcl/impl/point_types.hpp

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ namespace pcl
338338

339339
struct _PointXYZ
340340
{
341-
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
341+
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
342342

343343
PCL_MAKE_ALIGNED_OPERATOR_NEW
344344
};
@@ -365,7 +365,7 @@ namespace pcl
365365
#endif
366366
struct _RGB
367367
{
368-
PCL_ADD_RGB;
368+
PCL_ADD_RGB
369369
};
370370

371371
PCL_EXPORTS std::ostream& operator << (std::ostream& os, const RGB& p);
@@ -401,7 +401,7 @@ namespace pcl
401401

402402
struct _Intensity
403403
{
404-
PCL_ADD_INTENSITY;
404+
PCL_ADD_INTENSITY
405405
};
406406

407407
PCL_EXPORTS std::ostream& operator << (std::ostream& os, const Intensity& p);
@@ -469,7 +469,7 @@ namespace pcl
469469
*/
470470
struct EIGEN_ALIGN16 _PointXYZI
471471
{
472-
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
472+
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
473473
union
474474
{
475475
struct
@@ -496,7 +496,7 @@ namespace pcl
496496

497497
struct EIGEN_ALIGN16 _PointXYZL
498498
{
499-
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
499+
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
500500
std::uint32_t label;
501501
PCL_MAKE_ALIGNED_OPERATOR_NEW
502502
};
@@ -527,8 +527,8 @@ namespace pcl
527527

528528
struct EIGEN_ALIGN16 _PointXYZRGBA
529529
{
530-
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
531-
PCL_ADD_RGB;
530+
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
531+
PCL_ADD_RGB
532532
PCL_MAKE_ALIGNED_OPERATOR_NEW
533533
};
534534

@@ -574,15 +574,15 @@ namespace pcl
574574

575575
struct EIGEN_ALIGN16 _PointXYZRGB
576576
{
577-
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
578-
PCL_ADD_RGB;
577+
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
578+
PCL_ADD_RGB
579579
PCL_MAKE_ALIGNED_OPERATOR_NEW
580580
};
581581

582582
struct EIGEN_ALIGN16 _PointXYZRGBL
583583
{
584-
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
585-
PCL_ADD_RGB;
584+
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
585+
PCL_ADD_RGB
586586
std::uint32_t label;
587587
PCL_MAKE_ALIGNED_OPERATOR_NEW
588588
};
@@ -666,7 +666,7 @@ namespace pcl
666666

667667
struct EIGEN_ALIGN16 _PointXYZLAB
668668
{
669-
PCL_ADD_POINT4D; // this adds the members x,y,z
669+
PCL_ADD_POINT4D // this adds the members x,y,z
670670
union
671671
{
672672
struct
@@ -701,7 +701,7 @@ namespace pcl
701701

702702
struct EIGEN_ALIGN16 _PointXYZHSV
703703
{
704-
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
704+
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
705705
union
706706
{
707707
struct
@@ -787,7 +787,7 @@ namespace pcl
787787
// @TODO: inheritance trick like on other PointTypes
788788
struct EIGEN_ALIGN16 InterestPoint
789789
{
790-
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
790+
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
791791
union
792792
{
793793
struct
@@ -803,7 +803,7 @@ namespace pcl
803803

804804
struct EIGEN_ALIGN16 _Normal
805805
{
806-
PCL_ADD_NORMAL4D; // This adds the member normal[3] which can also be accessed using the point (which is float[4])
806+
PCL_ADD_NORMAL4D // This adds the member normal[3] which can also be accessed using the point (which is float[4])
807807
union
808808
{
809809
struct
@@ -835,7 +835,7 @@ namespace pcl
835835

836836
struct EIGEN_ALIGN16 _Axis
837837
{
838-
PCL_ADD_NORMAL4D;
838+
PCL_ADD_NORMAL4D
839839
PCL_MAKE_ALIGNED_OPERATOR_NEW
840840
};
841841

@@ -858,8 +858,8 @@ namespace pcl
858858

859859
struct EIGEN_ALIGN16 _PointNormal
860860
{
861-
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
862-
PCL_ADD_NORMAL4D; // This adds the member normal[3] which can also be accessed using the point (which is float[4])
861+
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
862+
PCL_ADD_NORMAL4D // This adds the member normal[3] which can also be accessed using the point (which is float[4])
863863
union
864864
{
865865
struct
@@ -893,18 +893,18 @@ namespace pcl
893893

894894
struct EIGEN_ALIGN16 _PointXYZRGBNormal
895895
{
896-
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
897-
PCL_ADD_NORMAL4D; // This adds the member normal[3] which can also be accessed using the point (which is float[4])
896+
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
897+
PCL_ADD_NORMAL4D // This adds the member normal[3] which can also be accessed using the point (which is float[4])
898898
union
899899
{
900900
struct
901901
{
902-
PCL_ADD_UNION_RGB;
902+
PCL_ADD_UNION_RGB
903903
float curvature;
904904
};
905905
float data_c[4];
906906
};
907-
PCL_ADD_EIGEN_MAPS_RGB;
907+
PCL_ADD_EIGEN_MAPS_RGB
908908
PCL_MAKE_ALIGNED_OPERATOR_NEW
909909
};
910910

@@ -979,8 +979,8 @@ namespace pcl
979979

980980
struct EIGEN_ALIGN16 _PointXYZINormal
981981
{
982-
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
983-
PCL_ADD_NORMAL4D; // This adds the member normal[3] which can also be accessed using the point (which is float[4])
982+
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
983+
PCL_ADD_NORMAL4D // This adds the member normal[3] which can also be accessed using the point (which is float[4])
984984
union
985985
{
986986
struct
@@ -1022,8 +1022,8 @@ namespace pcl
10221022
//----
10231023
struct EIGEN_ALIGN16 _PointXYZLNormal
10241024
{
1025-
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
1026-
PCL_ADD_NORMAL4D; // This adds the member normal[3] which can also be accessed using the point (which is float[4])
1025+
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
1026+
PCL_ADD_NORMAL4D // This adds the member normal[3] which can also be accessed using the point (which is float[4])
10271027
union
10281028
{
10291029
struct
@@ -1067,7 +1067,7 @@ namespace pcl
10671067

10681068
struct EIGEN_ALIGN16 _PointWithRange
10691069
{
1070-
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
1070+
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
10711071
union
10721072
{
10731073
struct
@@ -1098,7 +1098,7 @@ namespace pcl
10981098

10991099
struct EIGEN_ALIGN16 _PointWithViewpoint
11001100
{
1101-
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
1101+
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
11021102
union
11031103
{
11041104
struct
@@ -1616,7 +1616,6 @@ namespace pcl
16161616
inline constexpr IntensityGradient (): IntensityGradient (0.f, 0.f, 0.f) {}
16171617

16181618
inline constexpr IntensityGradient (float _x, float _y, float _z): gradient_x (_x), gradient_y (_y), gradient_z (_z) {}
1619-
16201619
friend std::ostream& operator << (std::ostream& os, const IntensityGradient& p);
16211620
};
16221621

@@ -1633,7 +1632,7 @@ namespace pcl
16331632

16341633
struct EIGEN_ALIGN16 _PointWithScale
16351634
{
1636-
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
1635+
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
16371636

16381637
union
16391638
{
@@ -1673,20 +1672,20 @@ namespace pcl
16731672

16741673
struct EIGEN_ALIGN16 _PointSurfel
16751674
{
1676-
PCL_ADD_POINT4D; // This adds the members x,y,z which can also be accessed using the point (which is float[4])
1677-
PCL_ADD_NORMAL4D; // This adds the member normal[3] which can also be accessed using the point (which is float[4])
1675+
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
1676+
PCL_ADD_NORMAL4D // This adds the member normal[3] which can also be accessed using the point (which is float[4])
16781677
union
16791678
{
16801679
struct
16811680
{
1682-
PCL_ADD_UNION_RGB;
1681+
PCL_ADD_UNION_RGB
16831682
float radius;
16841683
float confidence;
16851684
float curvature;
16861685
};
16871686
float data_c[4];
16881687
};
1689-
PCL_ADD_EIGEN_MAPS_RGB;
1688+
PCL_ADD_EIGEN_MAPS_RGB
16901689
PCL_MAKE_ALIGNED_OPERATOR_NEW
16911690
};
16921691

@@ -1717,7 +1716,7 @@ namespace pcl
17171716

17181717
struct EIGEN_ALIGN16 _PointDEM
17191718
{
1720-
PCL_ADD_POINT4D;
1719+
PCL_ADD_POINT4D
17211720
float intensity;
17221721
float intensity_variance;
17231722
float height_variance;

‎tracking/include/pcl/tracking/impl/tracking.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace pcl {
1010
namespace tracking {
1111
struct _ParticleXYZRPY {
12-
PCL_ADD_POINT4D;
12+
PCL_ADD_POINT4D
1313
union {
1414
struct {
1515
float roll;
@@ -236,7 +236,7 @@ operator-(const ParticleXYZRPY& a, const ParticleXYZRPY& b)
236236
namespace pcl {
237237
namespace tracking {
238238
struct _ParticleXYZR {
239-
PCL_ADD_POINT4D;
239+
PCL_ADD_POINT4D
240240
union {
241241
struct {
242242
float roll;
@@ -420,7 +420,7 @@ operator-(const ParticleXYZR& a, const ParticleXYZR& b)
420420
namespace pcl {
421421
namespace tracking {
422422
struct _ParticleXYRPY {
423-
PCL_ADD_POINT4D;
423+
PCL_ADD_POINT4D
424424
union {
425425
struct {
426426
float roll;
@@ -610,7 +610,7 @@ operator-(const ParticleXYRPY& a, const ParticleXYRPY& b)
610610
namespace pcl {
611611
namespace tracking {
612612
struct _ParticleXYRP {
613-
PCL_ADD_POINT4D;
613+
PCL_ADD_POINT4D
614614
union {
615615
struct {
616616
float roll;
@@ -797,7 +797,7 @@ operator-(const ParticleXYRP& a, const ParticleXYRP& b)
797797
namespace pcl {
798798
namespace tracking {
799799
struct _ParticleXYR {
800-
PCL_ADD_POINT4D;
800+
PCL_ADD_POINT4D
801801
union {
802802
struct {
803803
float roll;

0 commit comments

Comments
 (0)