Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use nullptr in module kdtree #3013

Merged
merged 1 commit into from
Apr 22, 2019
Merged

Use nullptr in module kdtree #3013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kdtree/include/pcl/kdtree/impl/kdtree_flann.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ pcl::KdTreeFLANN<PointT, Dist>::setInputCloud (const PointCloudConstPtr &cloud,
PCL_ERROR ("[pcl::KdTreeFLANN::setInputCloud] Invalid input!\n");
return;
}
if (indices != NULL)
if (indices != nullptr)
{
convertCloudToArray (*input_, *indices_);
}
Expand Down
4 changes: 2 additions & 2 deletions kdtree/include/pcl/kdtree/kdtree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ namespace pcl
nearestKSearch (int index, int k,
std::vector<int> &k_indices, std::vector<float> &k_sqr_distances) const
{
if (indices_ == NULL)
if (indices_ == nullptr)
{
assert (index >= 0 && index < static_cast<int> (input_->points.size ()) && "Out-of-bounds error in nearestKSearch!");
return (nearestKSearch (input_->points[index], k, k_indices, k_sqr_distances));
Expand Down Expand Up @@ -294,7 +294,7 @@ namespace pcl
radiusSearch (int index, double radius, std::vector<int> &k_indices,
std::vector<float> &k_sqr_distances, unsigned int max_nn = 0) const
{
if (indices_ == NULL)
if (indices_ == nullptr)
{
assert (index >= 0 && index < static_cast<int> (input_->points.size ()) && "Out-of-bounds error in radiusSearch!");
return (radiusSearch (input_->points[index], radius, k_indices, k_sqr_distances, max_nn));
Expand Down