Skip to content

[math] Remove the pasted ERotation3DMatrixIndex #21592

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.

Sign up for GitHub

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

Merged
guitargeek merged 1 commit into from
Mar 13, 2026
Merged

[math] Remove the pasted ERotation3DMatrixIndex #21592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions math/experimental/genvectorx/src/3DConversions.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ namespace ROOT {
namespace ROOT_MATH_ARCH {
namespace gv_detail {

#if __cplusplus >= 202002L
using enum Rotation3D::ERotation3DMatrixIndex;
#else
enum ERotation3DMatrixIndex {
kXX = Rotation3D::kXX,
kXY = Rotation3D::kXY,
Expand All @@ -53,6 +56,7 @@ enum ERotation3DMatrixIndex {
kZY = Rotation3D::kZY,
kZZ = Rotation3D::kZZ
};
#endif

// ----------------------------------------------------------------------
void convert(Rotation3D const &from, AxisAngle &to)
Expand Down
12 changes: 0 additions & 12 deletions math/experimental/genvectorx/src/3DDistances.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,6 @@ namespace ROOT {
namespace ROOT_MATH_ARCH {
namespace gv_detail {

enum ERotation3DMatrixIndex {
kXX = 0,
kXY = 1,
kXZ = 2,
kYX = 3,
kYY = 4,
kYZ = 5,
kZX = 6,
kZY = 7,
kZZ = 8
};

// ----------------------------------------------------------------------
// distance from Rotation3D

Expand Down
14 changes: 0 additions & 14 deletions math/experimental/genvectorx/src/AxisAngle.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,20 +65,6 @@ void AxisAngle::Rectify()
RectifyAngle();
} // Rectify()

// ======== Transformation to other Rotation Forms ==================

enum ERotation3DMatrixIndex {
kXX = 0,
kXY = 1,
kXZ = 2,
kYX = 3,
kYY = 4,
kYZ = 5,
kZX = 6,
kZY = 7,
kZZ = 8
};

// ========== Operations =====================

DisplacementVector3D<Cartesian3D<double>> AxisAngle::operator()(const XYZVector &v) const
Expand Down
5 changes: 4 additions & 1 deletion math/genvector/src/3DConversions.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,15 @@ namespace ROOT {
namespace Math {
namespace gv_detail {

#if __cplusplus >= 202002L
using enum Rotation3D::ERotation3DMatrixIndex;
#else
enum ERotation3DMatrixIndex
{ kXX = Rotation3D::kXX, kXY = Rotation3D::kXY, kXZ = Rotation3D::kXZ
, kYX = Rotation3D::kYX, kYY = Rotation3D::kYY, kYZ = Rotation3D::kYZ
, kZX = Rotation3D::kZX, kZY = Rotation3D::kZY, kZZ = Rotation3D::kZZ
};

#endif

// ----------------------------------------------------------------------
void convert( Rotation3D const & from, AxisAngle & to)
Expand Down
8 changes: 0 additions & 8 deletions math/genvector/src/3DDistances.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,6 @@ namespace ROOT {
namespace Math {
namespace gv_detail {


enum ERotation3DMatrixIndex
{ kXX = 0, kXY = 1, kXZ = 2
, kYX = 3, kYY = 4, kYZ = 5
, kZX = 6, kZY = 7, kZZ = 8
};


// ----------------------------------------------------------------------
// distance from Rotation3D

Expand Down
10 changes: 0 additions & 10 deletions math/genvector/src/AxisAngle.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,6 @@ void AxisAngle::Rectify()
RectifyAngle();
} // Rectify()

// ======== Transformation to other Rotation Forms ==================

enum ERotation3DMatrixIndex {
kXX = 0, kXY = 1, kXZ = 2
, kYX = 3, kYY = 4, kYZ = 5
, kZX = 6, kZY = 7, kZZ = 8
};



// ========== Operations =====================

DisplacementVector3D< Cartesian3D<double> >
Expand Down
Loading