Commit bc58510e authored by Mostyn Bramley-Moore's avatar Mostyn Bramley-Moore Committed by Commit Bot

[jumbo] avoid GetFusedType/GetSourceType collision

orientation_quaternion_fusion_algorithm_using_euler_angles.cc and
orientation_euler_angles_fusion_algorithm_using_quaternion.cc both
contain GetFusedType and GetSourceType constexpr's with the same
argument type, which conflict in jumbo builds.  Let's rename them
both.

BUG=794692

Change-Id: I707873b5e554dba9a98df27a2a5554e355a275c9
Reviewed-on: https://chromium-review.googlesource.com/825862
Commit-Queue: Mostyn Bramley-Moore <mostynb@vewd.com>
Reviewed-by: default avatarMikhail Pozdnyakov <mikhail.pozdnyakov@intel.com>
Cr-Commit-Position: refs/heads/master@{#524061}
parent 9cee0801
...@@ -62,12 +62,12 @@ void ComputeEulerAnglesFromQuaternion(double x, ...@@ -62,12 +62,12 @@ void ComputeEulerAnglesFromQuaternion(double x,
rotation_matrix, alpha_in_degrees, beta_in_degrees, gamma_in_degrees); rotation_matrix, alpha_in_degrees, beta_in_degrees, gamma_in_degrees);
} }
constexpr mojom::SensorType GetFusedType(bool absolute) { constexpr mojom::SensorType GetEulerAngleFusedType(bool absolute) {
return absolute ? mojom::SensorType::ABSOLUTE_ORIENTATION_EULER_ANGLES return absolute ? mojom::SensorType::ABSOLUTE_ORIENTATION_EULER_ANGLES
: mojom::SensorType::RELATIVE_ORIENTATION_EULER_ANGLES; : mojom::SensorType::RELATIVE_ORIENTATION_EULER_ANGLES;
} }
constexpr mojom::SensorType GetSourceType(bool absolute) { constexpr mojom::SensorType GetQuaternionSourceType(bool absolute) {
return absolute ? mojom::SensorType::ABSOLUTE_ORIENTATION_QUATERNION return absolute ? mojom::SensorType::ABSOLUTE_ORIENTATION_QUATERNION
: mojom::SensorType::RELATIVE_ORIENTATION_QUATERNION; : mojom::SensorType::RELATIVE_ORIENTATION_QUATERNION;
} }
...@@ -76,8 +76,8 @@ constexpr mojom::SensorType GetSourceType(bool absolute) { ...@@ -76,8 +76,8 @@ constexpr mojom::SensorType GetSourceType(bool absolute) {
OrientationEulerAnglesFusionAlgorithmUsingQuaternion:: OrientationEulerAnglesFusionAlgorithmUsingQuaternion::
OrientationEulerAnglesFusionAlgorithmUsingQuaternion(bool absolute) OrientationEulerAnglesFusionAlgorithmUsingQuaternion(bool absolute)
: PlatformSensorFusionAlgorithm(GetFusedType(absolute), : PlatformSensorFusionAlgorithm(GetEulerAngleFusedType(absolute),
{GetSourceType(absolute)}) {} {GetQuaternionSourceType(absolute)}) {}
OrientationEulerAnglesFusionAlgorithmUsingQuaternion:: OrientationEulerAnglesFusionAlgorithmUsingQuaternion::
~OrientationEulerAnglesFusionAlgorithmUsingQuaternion() = default; ~OrientationEulerAnglesFusionAlgorithmUsingQuaternion() = default;
......
...@@ -39,12 +39,12 @@ void ComputeQuaternionFromEulerAngles(double alpha_in_degrees, ...@@ -39,12 +39,12 @@ void ComputeQuaternionFromEulerAngles(double alpha_in_degrees,
*w = cx * cy * cz - sx * sy * sz; *w = cx * cy * cz - sx * sy * sz;
} }
constexpr mojom::SensorType GetFusedType(bool absolute) { constexpr mojom::SensorType GetQuaternionFusedType(bool absolute) {
return absolute ? mojom::SensorType::ABSOLUTE_ORIENTATION_QUATERNION return absolute ? mojom::SensorType::ABSOLUTE_ORIENTATION_QUATERNION
: mojom::SensorType::RELATIVE_ORIENTATION_QUATERNION; : mojom::SensorType::RELATIVE_ORIENTATION_QUATERNION;
} }
constexpr mojom::SensorType GetSourceType(bool absolute) { constexpr mojom::SensorType GetEulerAngleSourceType(bool absolute) {
return absolute ? mojom::SensorType::ABSOLUTE_ORIENTATION_EULER_ANGLES return absolute ? mojom::SensorType::ABSOLUTE_ORIENTATION_EULER_ANGLES
: mojom::SensorType::RELATIVE_ORIENTATION_EULER_ANGLES; : mojom::SensorType::RELATIVE_ORIENTATION_EULER_ANGLES;
} }
...@@ -53,8 +53,8 @@ constexpr mojom::SensorType GetSourceType(bool absolute) { ...@@ -53,8 +53,8 @@ constexpr mojom::SensorType GetSourceType(bool absolute) {
OrientationQuaternionFusionAlgorithmUsingEulerAngles:: OrientationQuaternionFusionAlgorithmUsingEulerAngles::
OrientationQuaternionFusionAlgorithmUsingEulerAngles(bool absolute) OrientationQuaternionFusionAlgorithmUsingEulerAngles(bool absolute)
: PlatformSensorFusionAlgorithm(GetFusedType(absolute), : PlatformSensorFusionAlgorithm(GetQuaternionFusedType(absolute),
{GetSourceType(absolute)}) {} {GetEulerAngleSourceType(absolute)}) {}
OrientationQuaternionFusionAlgorithmUsingEulerAngles:: OrientationQuaternionFusionAlgorithmUsingEulerAngles::
~OrientationQuaternionFusionAlgorithmUsingEulerAngles() = default; ~OrientationQuaternionFusionAlgorithmUsingEulerAngles() = default;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment