12345qiupeng
/
cartographer_ros
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Clang thread safety guards in drawable_submap.h (#839) 

Fixes a Clang compiler error.
master
Michael Grupp 2018-04-25 11:29:18 +02:00 committed by Wally B. Feed
parent 30694dee26
commit bd428df38f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cartographer_rviz/cartographer_rviz/drawable_submap.h
View File

@ -105,8 +105,8 @@ class DrawableSubmap : public QObject {
::rviz::Axes pose_axes_; ::rviz::Axes pose_axes_;
::rviz::MovableText submap_id_text_; ::rviz::MovableText submap_id_text_;
std::chrono::milliseconds last_query_timestamp_ GUARDED_BY(mutex_); std::chrono::milliseconds last_query_timestamp_ GUARDED_BY(mutex_);
bool query_in_progress_ = false GUARDED_BY(mutex_); bool query_in_progress_ GUARDED_BY(mutex_) = false;
int metadata_version_ = -1 GUARDED_BY(mutex_); int metadata_version_ GUARDED_BY(mutex_) = -1;
std::future<void> rpc_request_future_; std::future<void> rpc_request_future_;
std::unique_ptr<::cartographer::io::SubmapTextures> submap_textures_ std::unique_ptr<::cartographer::io::SubmapTextures> submap_textures_
GUARDED_BY(mutex_); GUARDED_BY(mutex_);