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

Small fixes needed for focal support. (#1704) 

Signed-off-by: Wolfgang Hess <whess@lyft.com>
master
Wolfgang Hess 2020-06-17 10:09:14 +02:00 committed by GitHub
parent 10e57b0a27
commit e8c1d840e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cartographer/common/lockless_queue.h
View File

@ -64,7 +64,7 @@ class LocklessQueue {
data_list_head_ = data_list_head_->next; data_list_head_ = data_list_head_->next;
std::unique_ptr<T> data = std::move(node->data); std::unique_ptr<T> data = std::move(node->data);
PushNodeToList(&free_list_head_, node); PushNodeToList(&free_list_head_, node);
return std::move(data); return data;
} }
return nullptr; return nullptr;
} }

12
cartographer/mapping/3d/hybrid_grid_test.cc
View File

@ -212,11 +212,15 @@ struct EigenComparator {
TEST_F(RandomHybridGridTest, FromProto) { TEST_F(RandomHybridGridTest, FromProto) {
const HybridGrid constructed_grid(hybrid_grid_.ToProto()); const HybridGrid constructed_grid(hybrid_grid_.ToProto());
std::map<Eigen::Vector3i, float, EigenComparator> member_map( std::map<Eigen::Vector3i, float, EigenComparator> member_map;
hybrid_grid_.begin(), hybrid_grid_.end()); for (const auto& cell : hybrid_grid_) {
member_map.insert(cell);
}
std::map<Eigen::Vector3i, float, EigenComparator> constructed_map( std::map<Eigen::Vector3i, float, EigenComparator> constructed_map;
constructed_grid.begin(), constructed_grid.end()); for (const auto& cell : constructed_grid) {
constructed_map.insert(cell);
}
EXPECT_EQ(member_map, constructed_map); EXPECT_EQ(member_map, constructed_map);
} }

1
cmake/modules/FindAbseil.cmake
View File

@ -52,7 +52,6 @@ if(NOT TARGET standalone_absl)
"${ABSEIL_PROJECT_BUILD_DIR}/absl/meta/${prefix}absl_meta${suffix}" "${ABSEIL_PROJECT_BUILD_DIR}/absl/meta/${prefix}absl_meta${suffix}"
"${ABSEIL_PROJECT_BUILD_DIR}/absl/numeric/${prefix}absl_int128${suffix}" "${ABSEIL_PROJECT_BUILD_DIR}/absl/numeric/${prefix}absl_int128${suffix}"
"${ABSEIL_PROJECT_BUILD_DIR}/absl/numeric/${prefix}absl_numeric${suffix}" "${ABSEIL_PROJECT_BUILD_DIR}/absl/numeric/${prefix}absl_numeric${suffix}"
"${ABSEIL_PROJECT_BUILD_DIR}/absl/synchronization/${prefix}absl_synchronization${suffix}"
"${ABSEIL_PROJECT_BUILD_DIR}/absl/types/${prefix}absl_any${suffix}" "${ABSEIL_PROJECT_BUILD_DIR}/absl/types/${prefix}absl_any${suffix}"
"${ABSEIL_PROJECT_BUILD_DIR}/absl/types/${prefix}absl_bad_any_cast${suffix}" "${ABSEIL_PROJECT_BUILD_DIR}/absl/types/${prefix}absl_bad_any_cast${suffix}"
"${ABSEIL_PROJECT_BUILD_DIR}/absl/types/${prefix}absl_bad_optional_access${suffix}" "${ABSEIL_PROJECT_BUILD_DIR}/absl/types/${prefix}absl_bad_optional_access${suffix}"