Skip to content

Commit 0c3c3c1

Browse files
shuffle point tyep definitions to investigate if msvc barfs only on pointxyzi
1 parent c0daf64 commit 0c3c3c1

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

common/include/pcl/impl/point_types.hpp

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,26 @@ namespace pcl
435435
friend std::ostream& operator << (std::ostream& os, const Intensity32u& p);
436436
};
437437

438+
439+
struct EIGEN_ALIGN16 _PointXYZL
440+
{
441+
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
442+
std::uint32_t label;
443+
PCL_MAKE_ALIGNED_OPERATOR_NEW
444+
};
445+
446+
PCL_EXPORTS std::ostream& operator << (std::ostream& os, const PointXYZL& p);
447+
struct PointXYZL : public _PointXYZL
448+
{
449+
inline constexpr PointXYZL (const _PointXYZL &p) : PointXYZL{p.x, p.y, p.z, p.label} {}
450+
451+
inline constexpr PointXYZL (std::uint32_t _label = 0) : PointXYZL(0.f, 0.f, 0.f, _label) {}
452+
453+
inline constexpr PointXYZL (float _x, float _y, float _z, std::uint32_t _label = 0) : _PointXYZL{{{_x, _y, _z, 1.0f}}, _label} {}
454+
455+
friend std::ostream& operator << (std::ostream& os, const PointXYZL& p);
456+
};
457+
438458
/** \brief A point structure representing Euclidean xyz coordinates, and the intensity value.
439459
* \ingroup common
440460
*/
@@ -465,26 +485,6 @@ namespace pcl
465485
};
466486

467487

468-
struct EIGEN_ALIGN16 _PointXYZL
469-
{
470-
PCL_ADD_POINT4D // This adds the members x,y,z which can also be accessed using the point (which is float[4])
471-
std::uint32_t label;
472-
PCL_MAKE_ALIGNED_OPERATOR_NEW
473-
};
474-
475-
PCL_EXPORTS std::ostream& operator << (std::ostream& os, const PointXYZL& p);
476-
struct PointXYZL : public _PointXYZL
477-
{
478-
inline constexpr PointXYZL (const _PointXYZL &p) : PointXYZL{p.x, p.y, p.z, p.label} {}
479-
480-
inline constexpr PointXYZL (std::uint32_t _label = 0) : PointXYZL(0.f, 0.f, 0.f, _label) {}
481-
482-
inline constexpr PointXYZL (float _x, float _y, float _z, std::uint32_t _label = 0) : _PointXYZL{{{_x, _y, _z, 1.0f}}, _label} {}
483-
484-
friend std::ostream& operator << (std::ostream& os, const PointXYZL& p);
485-
};
486-
487-
488488
PCL_EXPORTS std::ostream& operator << (std::ostream& os, const Label& p);
489489
struct Label
490490
{

0 commit comments

Comments
 (0)