From 05a8314a23dcf4ddaead7d4af5f458c8a82eb871 Mon Sep 17 00:00:00 2001 From: Alexander Belyaev <32522095+pifon2a@users.noreply.github.com> Date: Wed, 18 Jul 2018 09:17:39 +0200 Subject: [PATCH] Fix Clang warnings. (#1292) --- cartographer/cloud/internal/client_server_test.cc | 2 -- cartographer/mapping/3d/submap_3d.h | 1 - cartographer/mapping/internal/3d/pose_graph_3d.cc | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/cartographer/cloud/internal/client_server_test.cc b/cartographer/cloud/internal/client_server_test.cc index 4caaa78..42ab07e 100644 --- a/cartographer/cloud/internal/client_server_test.cc +++ b/cartographer/cloud/internal/client_server_test.cc @@ -53,8 +53,6 @@ constexpr double kTimeStep = 0.1; // Seconds. constexpr double kTravelDistance = 1.2; // Meters. constexpr char kSerializationHeaderProtoString[] = "format_version: 1"; -constexpr char kUnsupportedSerializationHeaderProtoString[] = - "format_version: 123"; constexpr char kPoseGraphProtoString[] = R"(pose_graph { trajectory: { trajectory_id: 0 diff --git a/cartographer/mapping/3d/submap_3d.h b/cartographer/mapping/3d/submap_3d.h index 02dd999..9b24020 100644 --- a/cartographer/mapping/3d/submap_3d.h +++ b/cartographer/mapping/3d/submap_3d.h @@ -102,7 +102,6 @@ class ActiveSubmaps3D { void AddSubmap(const transform::Rigid3d& local_submap_pose); const proto::SubmapsOptions3D options_; - int matching_submap_index_ = 0; std::vector> submaps_; RangeDataInserter3D range_data_inserter_; }; diff --git a/cartographer/mapping/internal/3d/pose_graph_3d.cc b/cartographer/mapping/internal/3d/pose_graph_3d.cc index a1431b6..85c43f7 100644 --- a/cartographer/mapping/internal/3d/pose_graph_3d.cc +++ b/cartographer/mapping/internal/3d/pose_graph_3d.cc @@ -546,7 +546,7 @@ void PoseGraph3D::WaitForAllComputations() { // Now wait for any pending constraint computations to finish. common::MutexLocker locker(&mutex_); - bool notification GUARDED_BY(mutex_) = false; + bool notification = false; constraint_builder_.WhenDone( [this, ¬ification](const constraints::ConstraintBuilder3D::Result& result)