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

Transition to standard smart pointers, part 12 #3486

Merged
merged 1 commit into from
Nov 26, 2019
Merged

Transition to standard smart pointers, part 12 #3486

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
8 changes: 4 additions & 4 deletions search/include/pcl/search/flann_search.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ namespace pcl
using PointCloud = typename Search<PointT>::PointCloud;
using PointCloudConstPtr = typename Search<PointT>::PointCloudConstPtr;

using IndicesPtr = boost::shared_ptr<std::vector<int> >;
using IndicesConstPtr = boost::shared_ptr<const std::vector<int> >;
using typename Search<PointT>::IndicesPtr;
using typename Search<PointT>::IndicesConstPtr;

using MatrixPtr = boost::shared_ptr<flann::Matrix<float> >;
using MatrixConstPtr = boost::shared_ptr<const flann::Matrix<float> >;
Expand All @@ -120,8 +120,8 @@ namespace pcl
using IndexPtr = boost::shared_ptr<flann::NNIndex<FlannDistance> >;

using PointRepresentation = pcl::PointRepresentation<PointT>;
using PointRepresentationPtr = boost::shared_ptr<PointRepresentation>;
using PointRepresentationConstPtr = boost::shared_ptr<const PointRepresentation>;
using PointRepresentationPtr = typename PointRepresentation::Ptr;
using PointRepresentationConstPtr = typename PointRepresentation::ConstPtr;

/** \brief Helper class that creates a FLANN index from a given FLANN matrix. To
* use a FLANN index type with FlannSearch, implement this interface and
Expand Down
10 changes: 5 additions & 5 deletions search/include/pcl/search/kdtree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ namespace pcl
using PointCloud = typename Search<PointT>::PointCloud;
using PointCloudConstPtr = typename Search<PointT>::PointCloudConstPtr;

using IndicesPtr = boost::shared_ptr<std::vector<int> >;
using IndicesConstPtr = boost::shared_ptr<const std::vector<int> >;
using typename Search<PointT>::IndicesPtr;
using typename Search<PointT>::IndicesConstPtr;

using pcl::search::Search<PointT>::indices_;
using pcl::search::Search<PointT>::input_;
Expand All @@ -78,9 +78,9 @@ namespace pcl
using Ptr = boost::shared_ptr<KdTree<PointT, Tree> >;
using ConstPtr = boost::shared_ptr<const KdTree<PointT, Tree> >;

using KdTreePtr = boost::shared_ptr<Tree>;
using KdTreeConstPtr = boost::shared_ptr<const Tree>;
using PointRepresentationConstPtr = boost::shared_ptr<const PointRepresentation<PointT> >;
using KdTreePtr = typename Tree::Ptr;
using KdTreeConstPtr = typename Tree::ConstPtr;
using PointRepresentationConstPtr = typename PointRepresentation<PointT>::ConstPtr;

/** \brief Constructor for KdTree.
*
Expand Down
12 changes: 6 additions & 6 deletions search/include/pcl/search/octree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,16 @@ namespace pcl
using Ptr = boost::shared_ptr<pcl::search::Octree<PointT,LeafTWrap,BranchTWrap,OctreeT> >;
using ConstPtr = boost::shared_ptr<const pcl::search::Octree<PointT,LeafTWrap,BranchTWrap,OctreeT> >;

using IndicesPtr = boost::shared_ptr<std::vector<int> >;
using IndicesConstPtr = boost::shared_ptr<const std::vector<int> >;
using typename Search<PointT>::IndicesPtr;
using typename Search<PointT>::IndicesConstPtr;

using PointCloud = pcl::PointCloud<PointT>;
using PointCloudPtr = boost::shared_ptr<PointCloud>;
using PointCloudConstPtr = boost::shared_ptr<const PointCloud>;
using PointCloudPtr = typename PointCloud::Ptr;
using PointCloudConstPtr = typename PointCloud::ConstPtr;

// Boost shared pointers
using OctreePointCloudSearchPtr = boost::shared_ptr<pcl::octree::OctreePointCloudSearch<PointT, LeafTWrap, BranchTWrap> >;
using OctreePointCloudSearchConstPtr = boost::shared_ptr<const pcl::octree::OctreePointCloudSearch<PointT, LeafTWrap, BranchTWrap> >;
using OctreePointCloudSearchPtr = typename pcl::octree::OctreePointCloudSearch<PointT, LeafTWrap, BranchTWrap>::Ptr;
using OctreePointCloudSearchConstPtr = typename pcl::octree::OctreePointCloudSearch<PointT, LeafTWrap, BranchTWrap>::ConstPtr;
OctreePointCloudSearchPtr tree_;

using pcl::search::Search<PointT>::input_;
Expand Down
6 changes: 3 additions & 3 deletions search/include/pcl/search/organized.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ namespace pcl
public:
// public typedefs
using PointCloud = pcl::PointCloud<PointT>;
using PointCloudPtr = boost::shared_ptr<PointCloud>;
using PointCloudPtr = typename PointCloud::Ptr;

using PointCloudConstPtr = boost::shared_ptr<const PointCloud>;
using IndicesConstPtr = boost::shared_ptr<const std::vector<int> >;
using PointCloudConstPtr = typename PointCloud::ConstPtr;
using typename Search<PointT>::IndicesConstPtr;

using Ptr = boost::shared_ptr<pcl::search::OrganizedNeighbor<PointT> >;
using ConstPtr = boost::shared_ptr<const pcl::search::OrganizedNeighbor<PointT> >;
Expand Down