Skip to content

Commit e44f33e

Browse files
committed
Fix compilation with Clang 15
1 parent 113cac6 commit e44f33e

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

wpical/src/main/native/cpp/WPIcal.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,9 @@ void CombineCalibrations() {
441441
if (layoutPath != "") {
442442
auto tagPose = calibratedFieldLayouts[layoutPath].GetTagPose(tagId);
443443
if (tagPose) {
444-
tags.emplace_back(tagId, tagPose.value());
444+
// TODO: remove variable when clang 16 is available on Mac
445+
frc::AprilTag tag{tagId, tagPose.value()};
446+
tags.emplace_back(tag);
445447
}
446448
}
447449
}

wpical/src/main/native/cpp/fieldcalibration.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,8 @@ std::optional<frc::AprilTagFieldLayout> fieldcalibration::calibrate(
417417
// Transformation from world
418418
Eigen::Matrix4d correctedTransform =
419419
pinnedTagTransform * correctionA * transform * correctionB;
420-
tags.emplace_back(tagId, frc::Pose3d{correctedTransform});
420+
frc::AprilTag tag{tagId, frc::Pose3d{correctedTransform}};
421+
tags.emplace_back(tag);
421422
}
422423
return frc::AprilTagFieldLayout{tags, idealLayout.GetFieldLength(),
423424
idealLayout.GetFieldWidth()};

wpical/src/main/native/cpp/fmap.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ Fieldmap::Fieldmap(std::string type, std::vector<Fiducial> fiducials)
1919
Fieldmap::Fieldmap(const frc::AprilTagFieldLayout& layout) : type("frc") {
2020
// https://docs.limelightvision.io/docs/docs-limelight/pipeline-apriltag/apriltag-map-specification
2121
for (auto tag : layout.GetTags()) {
22-
fiducials.emplace_back("apriltag3_36h11_classic", tag.ID, 165.1,
23-
tag.pose.ToMatrix(), 1);
22+
// TODO: remove variable when clang 16 is available on Mac
23+
Fiducial fiducial{"apriltag3_36h11_classic", tag.ID, 165.1,
24+
tag.pose.ToMatrix(), 1};
25+
fiducials.emplace_back(fiducial);
2426
}
2527
}
2628

0 commit comments

Comments
 (0)