From 249b5b89f89b6bb236437b3bc5966945536feb94 Mon Sep 17 00:00:00 2001 From: Heiko Thiel Date: Wed, 5 Jun 2019 14:00:07 +0200 Subject: [PATCH] Changes are done by: run-clang-tidy -header-filter='.' -checks='-,modernize-use-using' -fix --- kdtree/include/pcl/kdtree/kdtree.h | 20 +++++----- kdtree/include/pcl/kdtree/kdtree_flann.h | 14 +++---- keypoints/include/pcl/keypoints/agast_2d.h | 28 +++++++------- keypoints/include/pcl/keypoints/brisk_2d.h | 12 +++--- keypoints/include/pcl/keypoints/harris_2d.h | 14 +++---- keypoints/include/pcl/keypoints/harris_3d.h | 20 +++++----- keypoints/include/pcl/keypoints/harris_6d.h | 12 +++--- keypoints/include/pcl/keypoints/iss_3d.h | 18 ++++----- keypoints/include/pcl/keypoints/keypoint.h | 22 +++++------ .../include/pcl/keypoints/narf_keypoint.h | 8 ++-- .../include/pcl/keypoints/sift_keypoint.h | 10 ++--- .../keypoints/smoothed_surfaces_keypoint.h | 16 ++++---- keypoints/include/pcl/keypoints/susan.h | 18 ++++----- .../include/pcl/keypoints/trajkovic_2d.h | 12 +++--- .../include/pcl/keypoints/trajkovic_3d.h | 18 ++++----- keypoints/src/brisk_2d.cpp | 2 +- keypoints/src/narf_keypoint.cpp | 2 +- octree/include/pcl/octree/octree2buf_base.h | 34 ++++++++--------- octree/include/pcl/octree/octree_base.h | 38 +++++++++---------- octree/include/pcl/octree/octree_iterator.h | 24 ++++++------ octree/include/pcl/octree/octree_pointcloud.h | 28 +++++++------- .../pcl/octree/octree_pointcloud_adjacency.h | 32 ++++++++-------- .../octree_pointcloud_adjacency_container.h | 6 +-- .../octree/octree_pointcloud_changedetector.h | 2 +- .../pcl/octree/octree_pointcloud_occupancy.h | 10 ++--- .../octree/octree_pointcloud_pointvector.h | 4 +- .../octree/octree_pointcloud_singlepoint.h | 4 +- .../octree/octree_pointcloud_voxelcentroid.h | 10 ++--- octree/include/pcl/octree/octree_search.h | 22 +++++------ 29 files changed, 230 insertions(+), 230 deletions(-) diff --git a/kdtree/include/pcl/kdtree/kdtree.h b/kdtree/include/pcl/kdtree/kdtree.h index cc398417bf2..84d039578d3 100644 --- a/kdtree/include/pcl/kdtree/kdtree.h +++ b/kdtree/include/pcl/kdtree/kdtree.h @@ -55,20 +55,20 @@ namespace pcl class KdTree { public: - typedef boost::shared_ptr > IndicesPtr; - typedef boost::shared_ptr > IndicesConstPtr; + using IndicesPtr = boost::shared_ptr >; + using IndicesConstPtr = boost::shared_ptr >; - typedef pcl::PointCloud PointCloud; - typedef boost::shared_ptr PointCloudPtr; - typedef boost::shared_ptr PointCloudConstPtr; + using PointCloud = pcl::PointCloud; + using PointCloudPtr = boost::shared_ptr; + using PointCloudConstPtr = boost::shared_ptr; - typedef pcl::PointRepresentation PointRepresentation; - //typedef boost::shared_ptr PointRepresentationPtr; - typedef boost::shared_ptr PointRepresentationConstPtr; + using PointRepresentation = pcl::PointRepresentation; + //using PointRepresentationPtr = boost::shared_ptr; + using PointRepresentationConstPtr = boost::shared_ptr; // Boost shared pointers - typedef boost::shared_ptr > Ptr; - typedef boost::shared_ptr > ConstPtr; + using Ptr = boost::shared_ptr >; + using ConstPtr = boost::shared_ptr >; /** \brief Empty constructor for KdTree. Sets some internal values to their defaults. * \param[in] sorted set to true if the application that the tree will be used for requires sorted nearest neighbor indices (default). False otherwise. diff --git a/kdtree/include/pcl/kdtree/kdtree_flann.h b/kdtree/include/pcl/kdtree/kdtree_flann.h index 1a71d7772df..d7317c0a814 100644 --- a/kdtree/include/pcl/kdtree/kdtree_flann.h +++ b/kdtree/include/pcl/kdtree/kdtree_flann.h @@ -75,17 +75,17 @@ namespace pcl using KdTree::nearestKSearch; using KdTree::radiusSearch; - typedef typename KdTree::PointCloud PointCloud; - typedef typename KdTree::PointCloudConstPtr PointCloudConstPtr; + using PointCloud = typename KdTree::PointCloud; + using PointCloudConstPtr = typename KdTree::PointCloudConstPtr; - typedef boost::shared_ptr > IndicesPtr; - typedef boost::shared_ptr > IndicesConstPtr; + using IndicesPtr = boost::shared_ptr >; + using IndicesConstPtr = boost::shared_ptr >; - typedef ::flann::Index FLANNIndex; + using FLANNIndex = ::flann::Index; // Boost shared pointers - typedef boost::shared_ptr > Ptr; - typedef boost::shared_ptr > ConstPtr; + using Ptr = boost::shared_ptr >; + using ConstPtr = boost::shared_ptr >; /** \brief Default Constructor for KdTreeFLANN. * \param[in] sorted set to true if the application that the tree will be used for requires sorted nearest neighbor indices (default). False otherwise. diff --git a/keypoints/include/pcl/keypoints/agast_2d.h b/keypoints/include/pcl/keypoints/agast_2d.h index b10c63e72d1..1cf6c08ffa8 100644 --- a/keypoints/include/pcl/keypoints/agast_2d.h +++ b/keypoints/include/pcl/keypoints/agast_2d.h @@ -63,8 +63,8 @@ namespace pcl class PCL_EXPORTS AbstractAgastDetector { public: - typedef boost::shared_ptr Ptr; - typedef boost::shared_ptr ConstPtr; + using Ptr = boost::shared_ptr; + using ConstPtr = boost::shared_ptr; /** \brief Constructor. * \param[in] width the width of the image to process @@ -265,8 +265,8 @@ namespace pcl class PCL_EXPORTS AgastDetector7_12s : public AbstractAgastDetector { public: - typedef boost::shared_ptr Ptr; - typedef boost::shared_ptr ConstPtr; + using Ptr = boost::shared_ptr; + using ConstPtr = boost::shared_ptr; /** \brief Constructor. * \param[in] width the width of the image to process @@ -336,8 +336,8 @@ namespace pcl class PCL_EXPORTS AgastDetector5_8 : public AbstractAgastDetector { public: - typedef boost::shared_ptr Ptr; - typedef boost::shared_ptr ConstPtr; + using Ptr = boost::shared_ptr; + using ConstPtr = boost::shared_ptr; /** \brief Constructor. * \param[in] width the width of the image to process @@ -407,8 +407,8 @@ namespace pcl class PCL_EXPORTS OastDetector9_16 : public AbstractAgastDetector { public: - typedef boost::shared_ptr Ptr; - typedef boost::shared_ptr ConstPtr; + using Ptr = boost::shared_ptr; + using ConstPtr = boost::shared_ptr; /** \brief Constructor. * \param[in] width the width of the image to process @@ -555,12 +555,12 @@ namespace pcl class AgastKeypoint2DBase : public Keypoint { public: - typedef typename Keypoint::PointCloudIn PointCloudIn; - typedef typename Keypoint::PointCloudOut PointCloudOut; - typedef typename Keypoint::KdTree KdTree; - typedef typename PointCloudIn::ConstPtr PointCloudInConstPtr; + using PointCloudIn = typename Keypoint::PointCloudIn; + using PointCloudOut = typename Keypoint::PointCloudOut; + using KdTree = typename Keypoint::KdTree; + using PointCloudInConstPtr = typename PointCloudIn::ConstPtr; - typedef pcl::keypoints::agast::AbstractAgastDetector::Ptr AgastDetectorPtr; + using AgastDetectorPtr = pcl::keypoints::agast::AbstractAgastDetector::Ptr; using Keypoint::name_; using Keypoint::input_; @@ -718,7 +718,7 @@ namespace pcl class AgastKeypoint2D : public AgastKeypoint2DBase > { public: - typedef typename Keypoint::PointCloudOut PointCloudOut; + using PointCloudOut = typename Keypoint::PointCloudOut; using Keypoint::name_; using Keypoint::input_; diff --git a/keypoints/include/pcl/keypoints/brisk_2d.h b/keypoints/include/pcl/keypoints/brisk_2d.h index 0895d79f3ff..b8ea8871726 100644 --- a/keypoints/include/pcl/keypoints/brisk_2d.h +++ b/keypoints/include/pcl/keypoints/brisk_2d.h @@ -71,13 +71,13 @@ namespace pcl class BriskKeypoint2D: public Keypoint { public: - typedef boost::shared_ptr > Ptr; - typedef boost::shared_ptr > ConstPtr; + using Ptr = boost::shared_ptr >; + using ConstPtr = boost::shared_ptr >; - typedef typename Keypoint::PointCloudIn PointCloudIn; - typedef typename Keypoint::PointCloudOut PointCloudOut; - typedef typename Keypoint::KdTree KdTree; - typedef typename PointCloudIn::ConstPtr PointCloudInConstPtr; + using PointCloudIn = typename Keypoint::PointCloudIn; + using PointCloudOut = typename Keypoint::PointCloudOut; + using KdTree = typename Keypoint::KdTree; + using PointCloudInConstPtr = typename PointCloudIn::ConstPtr; using Keypoint::name_; using Keypoint::input_; diff --git a/keypoints/include/pcl/keypoints/harris_2d.h b/keypoints/include/pcl/keypoints/harris_2d.h index af1bfc2c564..2e2bae5b804 100644 --- a/keypoints/include/pcl/keypoints/harris_2d.h +++ b/keypoints/include/pcl/keypoints/harris_2d.h @@ -53,20 +53,20 @@ namespace pcl class HarrisKeypoint2D : public Keypoint { public: - typedef boost::shared_ptr > Ptr; - typedef boost::shared_ptr > ConstPtr; + using Ptr = boost::shared_ptr >; + using ConstPtr = boost::shared_ptr >; - typedef typename Keypoint::PointCloudIn PointCloudIn; - typedef typename Keypoint::PointCloudOut PointCloudOut; - typedef typename Keypoint::KdTree KdTree; - typedef typename PointCloudIn::ConstPtr PointCloudInConstPtr; + using PointCloudIn = typename Keypoint::PointCloudIn; + using PointCloudOut = typename Keypoint::PointCloudOut; + using KdTree = typename Keypoint::KdTree; + using PointCloudInConstPtr = typename PointCloudIn::ConstPtr; using Keypoint::name_; using Keypoint::input_; using Keypoint::indices_; using Keypoint::keypoints_indices_; - typedef enum {HARRIS = 1, NOBLE, LOWE, TOMASI} ResponseMethod; + enum ResponseMethod {HARRIS = 1, NOBLE, LOWE, TOMASI}; /** \brief Constructor * \param[in] method the method to be used to determine the corner responses diff --git a/keypoints/include/pcl/keypoints/harris_3d.h b/keypoints/include/pcl/keypoints/harris_3d.h index 174565f0c55..1d2129c2a25 100644 --- a/keypoints/include/pcl/keypoints/harris_3d.h +++ b/keypoints/include/pcl/keypoints/harris_3d.h @@ -51,17 +51,17 @@ namespace pcl class HarrisKeypoint3D : public Keypoint { public: - typedef boost::shared_ptr > Ptr; - typedef boost::shared_ptr > ConstPtr; + using Ptr = boost::shared_ptr >; + using ConstPtr = boost::shared_ptr >; - typedef typename Keypoint::PointCloudIn PointCloudIn; - typedef typename Keypoint::PointCloudOut PointCloudOut; - typedef typename Keypoint::KdTree KdTree; - typedef typename PointCloudIn::ConstPtr PointCloudInConstPtr; + using PointCloudIn = typename Keypoint::PointCloudIn; + using PointCloudOut = typename Keypoint::PointCloudOut; + using KdTree = typename Keypoint::KdTree; + using PointCloudInConstPtr = typename PointCloudIn::ConstPtr; - typedef pcl::PointCloud PointCloudN; - typedef typename PointCloudN::Ptr PointCloudNPtr; - typedef typename PointCloudN::ConstPtr PointCloudNConstPtr; + using PointCloudN = pcl::PointCloud; + using PointCloudNPtr = typename PointCloudN::Ptr; + using PointCloudNConstPtr = typename PointCloudN::ConstPtr; using Keypoint::name_; using Keypoint::input_; @@ -75,7 +75,7 @@ namespace pcl using Keypoint::initCompute; using PCLBase::setInputCloud; - typedef enum {HARRIS = 1, NOBLE, LOWE, TOMASI, CURVATURE} ResponseMethod; + enum ResponseMethod {HARRIS = 1, NOBLE, LOWE, TOMASI, CURVATURE}; /** \brief Constructor * \param[in] method the method to be used to determine the corner responses diff --git a/keypoints/include/pcl/keypoints/harris_6d.h b/keypoints/include/pcl/keypoints/harris_6d.h index 5b0b43fa173..0ab0f5e65da 100644 --- a/keypoints/include/pcl/keypoints/harris_6d.h +++ b/keypoints/include/pcl/keypoints/harris_6d.h @@ -49,13 +49,13 @@ namespace pcl class HarrisKeypoint6D : public Keypoint { public: - typedef boost::shared_ptr > Ptr; - typedef boost::shared_ptr > ConstPtr; + using Ptr = boost::shared_ptr >; + using ConstPtr = boost::shared_ptr >; - typedef typename Keypoint::PointCloudIn PointCloudIn; - typedef typename Keypoint::PointCloudOut PointCloudOut; - typedef typename Keypoint::KdTree KdTree; - typedef typename PointCloudIn::ConstPtr PointCloudInConstPtr; + using PointCloudIn = typename Keypoint::PointCloudIn; + using PointCloudOut = typename Keypoint::PointCloudOut; + using KdTree = typename Keypoint::KdTree; + using PointCloudInConstPtr = typename PointCloudIn::ConstPtr; using Keypoint::name_; using Keypoint::input_; diff --git a/keypoints/include/pcl/keypoints/iss_3d.h b/keypoints/include/pcl/keypoints/iss_3d.h index 7c627f27e1d..8b10812af8c 100644 --- a/keypoints/include/pcl/keypoints/iss_3d.h +++ b/keypoints/include/pcl/keypoints/iss_3d.h @@ -84,18 +84,18 @@ namespace pcl class ISSKeypoint3D : public Keypoint { public: - typedef boost::shared_ptr > Ptr; - typedef boost::shared_ptr > ConstPtr; + using Ptr = boost::shared_ptr >; + using ConstPtr = boost::shared_ptr >; - typedef typename Keypoint::PointCloudIn PointCloudIn; - typedef typename Keypoint::PointCloudOut PointCloudOut; + using PointCloudIn = typename Keypoint::PointCloudIn; + using PointCloudOut = typename Keypoint::PointCloudOut; - typedef pcl::PointCloud PointCloudN; - typedef typename PointCloudN::Ptr PointCloudNPtr; - typedef typename PointCloudN::ConstPtr PointCloudNConstPtr; + using PointCloudN = pcl::PointCloud; + using PointCloudNPtr = typename PointCloudN::Ptr; + using PointCloudNConstPtr = typename PointCloudN::ConstPtr; - typedef pcl::octree::OctreePointCloudSearch OctreeSearchIn; - typedef typename OctreeSearchIn::Ptr OctreeSearchInPtr; + using OctreeSearchIn = pcl::octree::OctreePointCloudSearch; + using OctreeSearchInPtr = typename OctreeSearchIn::Ptr; using Keypoint::name_; using Keypoint::input_; diff --git a/keypoints/include/pcl/keypoints/keypoint.h b/keypoints/include/pcl/keypoints/keypoint.h index ce5d3dc5417..3246934cbd8 100644 --- a/keypoints/include/pcl/keypoints/keypoint.h +++ b/keypoints/include/pcl/keypoints/keypoint.h @@ -54,21 +54,21 @@ namespace pcl class Keypoint : public PCLBase { public: - typedef boost::shared_ptr > Ptr; - typedef boost::shared_ptr > ConstPtr; + using Ptr = boost::shared_ptr >; + using ConstPtr = boost::shared_ptr >; using PCLBase::indices_; using PCLBase::input_; - typedef PCLBase BaseClass; - typedef pcl::search::Search KdTree; - typedef typename KdTree::Ptr KdTreePtr; - typedef pcl::PointCloud PointCloudIn; - typedef typename PointCloudIn::Ptr PointCloudInPtr; - typedef typename PointCloudIn::ConstPtr PointCloudInConstPtr; - typedef pcl::PointCloud PointCloudOut; - typedef std::function &, std::vector &)> SearchMethod; - typedef std::function &, std::vector &)> SearchMethodSurface; + using BaseClass = PCLBase; + using KdTree = pcl::search::Search; + using KdTreePtr = typename KdTree::Ptr; + using PointCloudIn = pcl::PointCloud; + using PointCloudInPtr = typename PointCloudIn::Ptr; + using PointCloudInConstPtr = typename PointCloudIn::ConstPtr; + using PointCloudOut = pcl::PointCloud; + using SearchMethod = std::function &, std::vector &)>; + using SearchMethodSurface = std::function &, std::vector &)>; public: /** \brief Empty constructor. */ diff --git a/keypoints/include/pcl/keypoints/narf_keypoint.h b/keypoints/include/pcl/keypoints/narf_keypoint.h index cf2827ad48d..66d1999142c 100644 --- a/keypoints/include/pcl/keypoints/narf_keypoint.h +++ b/keypoints/include/pcl/keypoints/narf_keypoint.h @@ -59,13 +59,13 @@ class RangeImageBorderExtractor; class PCL_EXPORTS NarfKeypoint : public Keypoint { public: - typedef boost::shared_ptr Ptr; - typedef boost::shared_ptr ConstPtr; + using Ptr = boost::shared_ptr; + using ConstPtr = boost::shared_ptr; // =====TYPEDEFS===== - typedef Keypoint BaseClass; + using BaseClass = Keypoint; - typedef Keypoint::PointCloudOut PointCloudOut; + using PointCloudOut = Keypoint::PointCloudOut; // =====PUBLIC STRUCTS===== //! Parameters used in this class diff --git a/keypoints/include/pcl/keypoints/sift_keypoint.h b/keypoints/include/pcl/keypoints/sift_keypoint.h index e77f58f40d0..2d4f1235ef0 100644 --- a/keypoints/include/pcl/keypoints/sift_keypoint.h +++ b/keypoints/include/pcl/keypoints/sift_keypoint.h @@ -93,12 +93,12 @@ namespace pcl class SIFTKeypoint : public Keypoint { public: - typedef boost::shared_ptr > Ptr; - typedef boost::shared_ptr > ConstPtr; + using Ptr = boost::shared_ptr >; + using ConstPtr = boost::shared_ptr >; - typedef typename Keypoint::PointCloudIn PointCloudIn; - typedef typename Keypoint::PointCloudOut PointCloudOut; - typedef typename Keypoint::KdTree KdTree; + using PointCloudIn = typename Keypoint::PointCloudIn; + using PointCloudOut = typename Keypoint::PointCloudOut; + using KdTree = typename Keypoint::KdTree; using Keypoint::name_; using Keypoint::input_; diff --git a/keypoints/include/pcl/keypoints/smoothed_surfaces_keypoint.h b/keypoints/include/pcl/keypoints/smoothed_surfaces_keypoint.h index 52ab0c6543b..b038263465b 100644 --- a/keypoints/include/pcl/keypoints/smoothed_surfaces_keypoint.h +++ b/keypoints/include/pcl/keypoints/smoothed_surfaces_keypoint.h @@ -54,8 +54,8 @@ namespace pcl class SmoothedSurfacesKeypoint : public Keypoint { public: - typedef boost::shared_ptr > Ptr; - typedef boost::shared_ptr > ConstPtr; + using Ptr = boost::shared_ptr >; + using ConstPtr = boost::shared_ptr >; using PCLBase::input_; using Keypoint::name_; @@ -63,12 +63,12 @@ namespace pcl using Keypoint::keypoints_indices_; using Keypoint::initCompute; - typedef pcl::PointCloud PointCloudT; - typedef typename PointCloudT::ConstPtr PointCloudTConstPtr; - typedef pcl::PointCloud PointCloudNT; - typedef typename PointCloudNT::ConstPtr PointCloudNTConstPtr; - typedef typename PointCloudT::Ptr PointCloudTPtr; - typedef typename Keypoint::KdTreePtr KdTreePtr; + using PointCloudT = pcl::PointCloud; + using PointCloudTConstPtr = typename PointCloudT::ConstPtr; + using PointCloudNT = pcl::PointCloud; + using PointCloudNTConstPtr = typename PointCloudNT::ConstPtr; + using PointCloudTPtr = typename PointCloudT::Ptr; + using KdTreePtr = typename Keypoint::KdTreePtr; SmoothedSurfacesKeypoint () : Keypoint (), diff --git a/keypoints/include/pcl/keypoints/susan.h b/keypoints/include/pcl/keypoints/susan.h index 00339d5a31d..c4ba5e9a46a 100644 --- a/keypoints/include/pcl/keypoints/susan.h +++ b/keypoints/include/pcl/keypoints/susan.h @@ -56,17 +56,17 @@ namespace pcl class SUSANKeypoint : public Keypoint { public: - typedef boost::shared_ptr > Ptr; - typedef boost::shared_ptr > ConstPtr; + using Ptr = boost::shared_ptr >; + using ConstPtr = boost::shared_ptr >; - typedef typename Keypoint::PointCloudIn PointCloudIn; - typedef typename Keypoint::PointCloudOut PointCloudOut; - typedef typename Keypoint::KdTree KdTree; - typedef typename PointCloudIn::ConstPtr PointCloudInConstPtr; + using PointCloudIn = typename Keypoint::PointCloudIn; + using PointCloudOut = typename Keypoint::PointCloudOut; + using KdTree = typename Keypoint::KdTree; + using PointCloudInConstPtr = typename PointCloudIn::ConstPtr; - typedef pcl::PointCloud PointCloudN; - typedef typename PointCloudN::Ptr PointCloudNPtr; - typedef typename PointCloudN::ConstPtr PointCloudNConstPtr; + using PointCloudN = pcl::PointCloud; + using PointCloudNPtr = typename PointCloudN::Ptr; + using PointCloudNConstPtr = typename PointCloudN::ConstPtr; using Keypoint::name_; using Keypoint::input_; diff --git a/keypoints/include/pcl/keypoints/trajkovic_2d.h b/keypoints/include/pcl/keypoints/trajkovic_2d.h index 4d5c7e87bea..b49c96f05fe 100644 --- a/keypoints/include/pcl/keypoints/trajkovic_2d.h +++ b/keypoints/include/pcl/keypoints/trajkovic_2d.h @@ -54,18 +54,18 @@ namespace pcl class TrajkovicKeypoint2D : public Keypoint { public: - typedef boost::shared_ptr > Ptr; - typedef boost::shared_ptr > ConstPtr; - typedef typename Keypoint::PointCloudIn PointCloudIn; - typedef typename Keypoint::PointCloudOut PointCloudOut; - typedef typename PointCloudIn::ConstPtr PointCloudInConstPtr; + using Ptr = boost::shared_ptr >; + using ConstPtr = boost::shared_ptr >; + using PointCloudIn = typename Keypoint::PointCloudIn; + using PointCloudOut = typename Keypoint::PointCloudOut; + using PointCloudInConstPtr = typename PointCloudIn::ConstPtr; using Keypoint::name_; using Keypoint::input_; using Keypoint::indices_; using Keypoint::keypoints_indices_; - typedef enum { FOUR_CORNERS, EIGHT_CORNERS } ComputationMethod; + enum ComputationMethod { FOUR_CORNERS, EIGHT_CORNERS }; /** \brief Constructor * \param[in] method the method to be used to determine the corner responses diff --git a/keypoints/include/pcl/keypoints/trajkovic_3d.h b/keypoints/include/pcl/keypoints/trajkovic_3d.h index 8d31bdebf2c..44f3387675c 100644 --- a/keypoints/include/pcl/keypoints/trajkovic_3d.h +++ b/keypoints/include/pcl/keypoints/trajkovic_3d.h @@ -54,14 +54,14 @@ namespace pcl class TrajkovicKeypoint3D : public Keypoint { public: - typedef boost::shared_ptr > Ptr; - typedef boost::shared_ptr > ConstPtr; - typedef typename Keypoint::PointCloudIn PointCloudIn; - typedef typename Keypoint::PointCloudOut PointCloudOut; - typedef typename PointCloudIn::ConstPtr PointCloudInConstPtr; - typedef pcl::PointCloud Normals; - typedef typename Normals::Ptr NormalsPtr; - typedef typename Normals::ConstPtr NormalsConstPtr; + using Ptr = boost::shared_ptr >; + using ConstPtr = boost::shared_ptr >; + using PointCloudIn = typename Keypoint::PointCloudIn; + using PointCloudOut = typename Keypoint::PointCloudOut; + using PointCloudInConstPtr = typename PointCloudIn::ConstPtr; + using Normals = pcl::PointCloud; + using NormalsPtr = typename Normals::Ptr; + using NormalsConstPtr = typename Normals::ConstPtr; using Keypoint::name_; using Keypoint::input_; @@ -69,7 +69,7 @@ namespace pcl using Keypoint::keypoints_indices_; using Keypoint::initCompute; - typedef enum { FOUR_CORNERS, EIGHT_CORNERS } ComputationMethod; + enum ComputationMethod { FOUR_CORNERS, EIGHT_CORNERS }; /** \brief Constructor * \param[in] method the method to be used to determine the corner responses diff --git a/keypoints/src/brisk_2d.cpp b/keypoints/src/brisk_2d.cpp index 0ba419e4c37..fed425bcfd1 100644 --- a/keypoints/src/brisk_2d.cpp +++ b/keypoints/src/brisk_2d.cpp @@ -1669,7 +1669,7 @@ pcl::keypoints::brisk::Layer::halfsample ( // compute horizontal pairwise average and store p_dest_char = reinterpret_cast (p_dest); #ifdef __GNUC__ - typedef unsigned char __attribute__ ((__may_alias__)) UCHAR_ALIAS; + using UCHAR_ALIAS __attribute__ ((__may_alias__)) = unsigned char; #endif #ifdef _MSC_VER // Todo: find the equivalent to may_alias diff --git a/keypoints/src/narf_keypoint.cpp b/keypoints/src/narf_keypoint.cpp index d93daefc263..7e4d9ca4238 100644 --- a/keypoints/src/narf_keypoint.cpp +++ b/keypoints/src/narf_keypoint.cpp @@ -716,7 +716,7 @@ NarfKeypoint::calculateInterestPoints () is_interest_point_image_.clear (); is_interest_point_image_.resize (size, false); - typedef double RealForPolynomial; + using RealForPolynomial = double; PolynomialCalculationsT polynomial_calculations; BivariatePolynomialT polynomial (2); std::vector, Eigen::aligned_allocator > > sample_points; diff --git a/octree/include/pcl/octree/octree2buf_base.h b/octree/include/pcl/octree/octree2buf_base.h index ed6dff1d6da..eb5b4873c43 100644 --- a/octree/include/pcl/octree/octree2buf_base.h +++ b/octree/include/pcl/octree/octree2buf_base.h @@ -223,7 +223,7 @@ namespace pcl public: - typedef Octree2BufBase OctreeT; + using OctreeT = Octree2BufBase; // iterators are friends friend class OctreeIteratorBase ; @@ -232,15 +232,15 @@ namespace pcl friend class OctreeLeafNodeDepthFirstIterator ; friend class OctreeLeafNodeBreadthFirstIterator ; - typedef BufferedBranchNode BranchNode; - typedef OctreeLeafNode LeafNode; + using BranchNode = BufferedBranchNode; + using LeafNode = OctreeLeafNode; - typedef BranchContainerT BranchContainer; - typedef LeafContainerT LeafContainer; + using BranchContainer = BranchContainerT; + using LeafContainer = LeafContainerT; // Octree default iterators - typedef OctreeDepthFirstIterator Iterator; - typedef const OctreeDepthFirstIterator ConstIterator; + using Iterator = OctreeDepthFirstIterator; + using ConstIterator = const OctreeDepthFirstIterator; Iterator begin(unsigned int max_depth_arg = 0) {return Iterator(this, max_depth_arg);}; const Iterator end() {return Iterator();}; @@ -248,8 +248,8 @@ namespace pcl // The previous deprecated names // LeafNodeIterator and ConstLeafNodeIterator are deprecated. // Please use LeafNodeDepthFirstIterator and ConstLeafNodeDepthFirstIterator instead. - typedef OctreeLeafNodeDepthFirstIterator LeafNodeIterator; - typedef const OctreeLeafNodeDepthFirstIterator ConstLeafNodeIterator; + using LeafNodeIterator = OctreeLeafNodeDepthFirstIterator; + using ConstLeafNodeIterator = const OctreeLeafNodeDepthFirstIterator; [[deprecated("use leaf_depth_begin() instead")]] LeafNodeIterator leaf_begin (unsigned int max_depth_arg = 0) @@ -264,8 +264,8 @@ namespace pcl }; // The currently valide names - typedef OctreeLeafNodeDepthFirstIterator LeafNodeDepthFirstIterator; - typedef const OctreeLeafNodeDepthFirstIterator ConstLeafNodeDepthFirstIterator; + using LeafNodeDepthFirstIterator = OctreeLeafNodeDepthFirstIterator; + using ConstLeafNodeDepthFirstIterator = const OctreeLeafNodeDepthFirstIterator; LeafNodeDepthFirstIterator leaf_depth_begin (unsigned int max_depth_arg = 0) { return LeafNodeDepthFirstIterator (this, max_depth_arg); @@ -277,20 +277,20 @@ namespace pcl }; // Octree depth-first iterators - typedef OctreeDepthFirstIterator DepthFirstIterator; - typedef const OctreeDepthFirstIterator ConstDepthFirstIterator; + using DepthFirstIterator = OctreeDepthFirstIterator; + using ConstDepthFirstIterator = const OctreeDepthFirstIterator; DepthFirstIterator depth_begin(unsigned int maxDepth_arg = 0) {return DepthFirstIterator(this, maxDepth_arg);}; const DepthFirstIterator depth_end() {return DepthFirstIterator();}; // Octree breadth-first iterators - typedef OctreeBreadthFirstIterator BreadthFirstIterator; - typedef const OctreeBreadthFirstIterator ConstBreadthFirstIterator; + using BreadthFirstIterator = OctreeBreadthFirstIterator; + using ConstBreadthFirstIterator = const OctreeBreadthFirstIterator; BreadthFirstIterator breadth_begin(unsigned int max_depth_arg = 0) {return BreadthFirstIterator(this, max_depth_arg);}; const BreadthFirstIterator breadth_end() {return BreadthFirstIterator();}; // Octree leaf node iterators - typedef OctreeLeafNodeBreadthFirstIterator LeafNodeBreadthIterator; - typedef const OctreeLeafNodeBreadthFirstIterator ConstLeafNodeBreadthIterator; + using LeafNodeBreadthIterator = OctreeLeafNodeBreadthFirstIterator; + using ConstLeafNodeBreadthIterator = const OctreeLeafNodeBreadthFirstIterator; LeafNodeBreadthIterator leaf_breadth_begin (unsigned int max_depth_arg = 0u) { diff --git a/octree/include/pcl/octree/octree_base.h b/octree/include/pcl/octree/octree_base.h index 46febeea0e3..69ca9edf8c9 100644 --- a/octree/include/pcl/octree/octree_base.h +++ b/octree/include/pcl/octree/octree_base.h @@ -62,13 +62,13 @@ namespace pcl { public: - typedef OctreeBase OctreeT; + using OctreeT = OctreeBase; - typedef OctreeBranchNode BranchNode; - typedef OctreeLeafNode LeafNode; + using BranchNode = OctreeBranchNode; + using LeafNode = OctreeLeafNode; - typedef BranchContainerT BranchContainer; - typedef LeafContainerT LeafContainer; + using BranchContainer = BranchContainerT; + using LeafContainer = LeafContainerT; protected: @@ -108,8 +108,8 @@ namespace pcl friend class OctreeLeafNodeBreadthFirstIterator ; // Octree default iterators - typedef OctreeDepthFirstIterator Iterator; - typedef const OctreeDepthFirstIterator ConstIterator; + using Iterator = OctreeDepthFirstIterator; + using ConstIterator = const OctreeDepthFirstIterator; Iterator begin (unsigned int max_depth_arg = 0u) { @@ -125,8 +125,8 @@ namespace pcl // The previous deprecated names // LeafNodeIterator and ConstLeafNodeIterator are deprecated. // Please use LeafNodeDepthFirstIterator and ConstLeafNodeDepthFirstIterator instead. - typedef OctreeLeafNodeDepthFirstIterator LeafNodeIterator; - typedef const OctreeLeafNodeDepthFirstIterator ConstLeafNodeIterator; + using LeafNodeIterator = OctreeLeafNodeDepthFirstIterator; + using ConstLeafNodeIterator = const OctreeLeafNodeDepthFirstIterator; [[deprecated("use leaf_depth_begin() instead")]] LeafNodeIterator leaf_begin (unsigned int max_depth_arg = 0u) @@ -141,8 +141,8 @@ namespace pcl }; // The currently valide names - typedef OctreeLeafNodeDepthFirstIterator LeafNodeDepthFirstIterator; - typedef const OctreeLeafNodeDepthFirstIterator ConstLeafNodeDepthFirstIterator; + using LeafNodeDepthFirstIterator = OctreeLeafNodeDepthFirstIterator; + using ConstLeafNodeDepthFirstIterator = const OctreeLeafNodeDepthFirstIterator; LeafNodeDepthFirstIterator leaf_depth_begin (unsigned int max_depth_arg = 0u) { @@ -155,8 +155,8 @@ namespace pcl }; // Octree depth-first iterators - typedef OctreeDepthFirstIterator DepthFirstIterator; - typedef const OctreeDepthFirstIterator ConstDepthFirstIterator; + using DepthFirstIterator = OctreeDepthFirstIterator; + using ConstDepthFirstIterator = const OctreeDepthFirstIterator; DepthFirstIterator depth_begin (unsigned int max_depth_arg = 0u) { @@ -169,8 +169,8 @@ namespace pcl }; // Octree breadth-first iterators - typedef OctreeBreadthFirstIterator BreadthFirstIterator; - typedef const OctreeBreadthFirstIterator ConstBreadthFirstIterator; + using BreadthFirstIterator = OctreeBreadthFirstIterator; + using ConstBreadthFirstIterator = const OctreeBreadthFirstIterator; BreadthFirstIterator breadth_begin (unsigned int max_depth_arg = 0u) { @@ -183,8 +183,8 @@ namespace pcl }; // Octree breadth iterators at a given depth - typedef OctreeFixedDepthIterator FixedDepthIterator; - typedef const OctreeFixedDepthIterator ConstFixedDepthIterator; + using FixedDepthIterator = OctreeFixedDepthIterator; + using ConstFixedDepthIterator = const OctreeFixedDepthIterator; FixedDepthIterator fixed_depth_begin (unsigned int fixed_depth_arg = 0u) { @@ -197,8 +197,8 @@ namespace pcl }; // Octree leaf node iterators - typedef OctreeLeafNodeBreadthFirstIterator LeafNodeBreadthFirstIterator; - typedef const OctreeLeafNodeBreadthFirstIterator ConstLeafNodeBreadthFirstIterator; + using LeafNodeBreadthFirstIterator = OctreeLeafNodeBreadthFirstIterator; + using ConstLeafNodeBreadthFirstIterator = const OctreeLeafNodeBreadthFirstIterator; LeafNodeBreadthFirstIterator leaf_breadth_begin (unsigned int max_depth_arg = 0u) { diff --git a/octree/include/pcl/octree/octree_iterator.h b/octree/include/pcl/octree/octree_iterator.h index e604240718e..9afffc8a5c7 100644 --- a/octree/include/pcl/octree/octree_iterator.h +++ b/octree/include/pcl/octree/octree_iterator.h @@ -77,11 +77,11 @@ namespace pcl { public: - typedef typename OctreeT::LeafNode LeafNode; - typedef typename OctreeT::BranchNode BranchNode; + using LeafNode = typename OctreeT::LeafNode; + using BranchNode = typename OctreeT::BranchNode; - typedef typename OctreeT::LeafContainer LeafContainer; - typedef typename OctreeT::BranchContainer BranchContainer; + using LeafContainer = typename OctreeT::LeafContainer; + using BranchContainer = typename OctreeT::BranchContainer; /** \brief Empty constructor. */ @@ -369,8 +369,8 @@ namespace pcl public: - typedef typename OctreeIteratorBase::LeafNode LeafNode; - typedef typename OctreeIteratorBase::BranchNode BranchNode; + using LeafNode = typename OctreeIteratorBase::LeafNode; + using BranchNode = typename OctreeIteratorBase::BranchNode; /** \brief Empty constructor. * \param[in] max_depth_arg Depth limitation during traversal @@ -476,8 +476,8 @@ namespace pcl { public: // public typedefs - typedef typename OctreeIteratorBase::BranchNode BranchNode; - typedef typename OctreeIteratorBase::LeafNode LeafNode; + using BranchNode = typename OctreeIteratorBase::BranchNode; + using LeafNode = typename OctreeIteratorBase::LeafNode; /** \brief Empty constructor. * \param[in] max_depth_arg Depth limitation during traversal @@ -663,8 +663,8 @@ namespace pcl template class OctreeLeafNodeDepthFirstIterator : public OctreeDepthFirstIterator { - typedef typename OctreeDepthFirstIterator::BranchNode BranchNode; - typedef typename OctreeDepthFirstIterator::LeafNode LeafNode; + using BranchNode = typename OctreeDepthFirstIterator::BranchNode; + using LeafNode = typename OctreeDepthFirstIterator::LeafNode; public: /** \brief Empty constructor. @@ -766,8 +766,8 @@ namespace pcl template class OctreeLeafNodeBreadthFirstIterator : public OctreeBreadthFirstIterator { - typedef typename OctreeBreadthFirstIterator::BranchNode BranchNode; - typedef typename OctreeBreadthFirstIterator::LeafNode LeafNode; + using BranchNode = typename OctreeBreadthFirstIterator::BranchNode; + using LeafNode = typename OctreeBreadthFirstIterator::LeafNode; public: /** \brief Empty constructor. diff --git a/octree/include/pcl/octree/octree_pointcloud.h b/octree/include/pcl/octree/octree_pointcloud.h index e63246b9740..8c83bc7af69 100644 --- a/octree/include/pcl/octree/octree_pointcloud.h +++ b/octree/include/pcl/octree/octree_pointcloud.h @@ -72,10 +72,10 @@ namespace pcl class OctreePointCloud : public OctreeT { public: - typedef OctreeT Base; + using Base = OctreeT; - typedef typename OctreeT::LeafNode LeafNode; - typedef typename OctreeT::BranchNode BranchNode; + using LeafNode = typename OctreeT::LeafNode; + using BranchNode = typename OctreeT::BranchNode; /** \brief Octree pointcloud constructor. * \param[in] resolution_arg octree resolution at lowest octree level @@ -87,24 +87,24 @@ namespace pcl ~OctreePointCloud (); // public typedefs - typedef boost::shared_ptr > IndicesPtr; - typedef boost::shared_ptr > IndicesConstPtr; + using IndicesPtr = boost::shared_ptr >; + using IndicesConstPtr = boost::shared_ptr >; - typedef pcl::PointCloud PointCloud; - typedef boost::shared_ptr PointCloudPtr; - typedef boost::shared_ptr PointCloudConstPtr; + using PointCloud = pcl::PointCloud; + using PointCloudPtr = boost::shared_ptr; + using PointCloudConstPtr = boost::shared_ptr; // public typedefs for single/double buffering - typedef OctreePointCloud > SingleBuffer; - // typedef OctreePointCloud > DoubleBuffer; + using SingleBuffer = OctreePointCloud >; + // using DoubleBuffer = OctreePointCloud >; // Boost shared pointers - typedef boost::shared_ptr > Ptr; - typedef boost::shared_ptr > ConstPtr; + using Ptr = boost::shared_ptr >; + using ConstPtr = boost::shared_ptr >; // Eigen aligned allocator - typedef std::vector > AlignedPointTVector; - typedef std::vector > AlignedPointXYZVector; + using AlignedPointTVector = std::vector >; + using AlignedPointXYZVector = std::vector >; /** \brief Provide a pointer to the input data set. * \param[in] cloud_arg the const boost shared pointer to a PointCloud message diff --git a/octree/include/pcl/octree/octree_pointcloud_adjacency.h b/octree/include/pcl/octree/octree_pointcloud_adjacency.h index 47ada826b39..a27647b9a72 100644 --- a/octree/include/pcl/octree/octree_pointcloud_adjacency.h +++ b/octree/include/pcl/octree/octree_pointcloud_adjacency.h @@ -80,31 +80,31 @@ namespace pcl public: - typedef OctreeBase OctreeBaseT; + using OctreeBaseT = OctreeBase; - typedef OctreePointCloudAdjacency OctreeAdjacencyT; - typedef boost::shared_ptr Ptr; - typedef boost::shared_ptr ConstPtr; + using OctreeAdjacencyT = OctreePointCloudAdjacency; + using Ptr = boost::shared_ptr; + using ConstPtr = boost::shared_ptr; - typedef OctreePointCloud OctreePointCloudT; - typedef typename OctreePointCloudT::LeafNode LeafNode; - typedef typename OctreePointCloudT::BranchNode BranchNode; + using OctreePointCloudT = OctreePointCloud; + using LeafNode = typename OctreePointCloudT::LeafNode; + using BranchNode = typename OctreePointCloudT::BranchNode; - typedef pcl::PointCloud PointCloud; - typedef boost::shared_ptr PointCloudPtr; - typedef boost::shared_ptr PointCloudConstPtr; + using PointCloud = pcl::PointCloud; + using PointCloudPtr = boost::shared_ptr; + using PointCloudConstPtr = boost::shared_ptr; // BGL graph - typedef boost::adjacency_list VoxelAdjacencyList; - typedef typename VoxelAdjacencyList::vertex_descriptor VoxelID; - typedef typename VoxelAdjacencyList::edge_descriptor EdgeID; + using VoxelAdjacencyList = boost::adjacency_list; + using VoxelID = typename VoxelAdjacencyList::vertex_descriptor; + using EdgeID = typename VoxelAdjacencyList::edge_descriptor; // Leaf vector - pointers to all leaves - typedef std::vector LeafVectorT; + using LeafVectorT = std::vector; // Fast leaf iterators that don't require traversing tree - typedef typename LeafVectorT::iterator iterator; - typedef typename LeafVectorT::const_iterator const_iterator; + using iterator = typename LeafVectorT::iterator; + using const_iterator = typename LeafVectorT::const_iterator; inline iterator begin () { return (leaf_vector_.begin ()); } inline iterator end () { return (leaf_vector_.end ()); } diff --git a/octree/include/pcl/octree/octree_pointcloud_adjacency_container.h b/octree/include/pcl/octree/octree_pointcloud_adjacency_container.h index 1d38734baa1..3f4890b3e28 100644 --- a/octree/include/pcl/octree/octree_pointcloud_adjacency_container.h +++ b/octree/include/pcl/octree/octree_pointcloud_adjacency_container.h @@ -55,8 +55,8 @@ namespace pcl template friend class OctreePointCloudAdjacency; public: - typedef std::list NeighborListT; - typedef typename NeighborListT::const_iterator const_iterator; + using NeighborListT = std::list *>; + using const_iterator = typename NeighborListT::const_iterator; //const iterators to neighbors inline const_iterator cbegin () const { return (neighbors_.begin ()); } inline const_iterator cend () const { return (neighbors_.end ()); } @@ -108,7 +108,7 @@ namespace pcl } protected: //iterators to neighbors - typedef typename NeighborListT::iterator iterator; + using iterator = typename NeighborListT::iterator; inline iterator begin () { return (neighbors_.begin ()); } inline iterator end () { return (neighbors_.end ()); } diff --git a/octree/include/pcl/octree/octree_pointcloud_changedetector.h b/octree/include/pcl/octree/octree_pointcloud_changedetector.h index 42cab24f2c0..59e9ca66fd5 100644 --- a/octree/include/pcl/octree/octree_pointcloud_changedetector.h +++ b/octree/include/pcl/octree/octree_pointcloud_changedetector.h @@ -69,7 +69,7 @@ namespace pcl public: - typedef boost::shared_ptr> Ptr; + using Ptr = boost::shared_ptr>; /** \brief Constructor. * \param resolution_arg: octree resolution at lowest octree level diff --git a/octree/include/pcl/octree/octree_pointcloud_occupancy.h b/octree/include/pcl/octree/octree_pointcloud_occupancy.h index 649b4d9d054..6b2b595583c 100644 --- a/octree/include/pcl/octree/octree_pointcloud_occupancy.h +++ b/octree/include/pcl/octree/octree_pointcloud_occupancy.h @@ -65,13 +65,13 @@ namespace pcl public: // public typedefs for single/double buffering - typedef OctreePointCloudOccupancy SingleBuffer; - typedef OctreePointCloudOccupancy DoubleBuffer; + using SingleBuffer = OctreePointCloudOccupancy; + using DoubleBuffer = OctreePointCloudOccupancy; // public point cloud typedefs - typedef typename OctreePointCloud::PointCloud PointCloud; - typedef typename OctreePointCloud::PointCloudPtr PointCloudPtr; - typedef typename OctreePointCloud::PointCloudConstPtr PointCloudConstPtr; + using PointCloud = typename OctreePointCloud::PointCloud; + using PointCloudPtr = typename OctreePointCloud::PointCloudPtr; + using PointCloudConstPtr = typename OctreePointCloud::PointCloudConstPtr; /** \brief Constructor. * \param resolution_arg: octree resolution at lowest octree level diff --git a/octree/include/pcl/octree/octree_pointcloud_pointvector.h b/octree/include/pcl/octree/octree_pointcloud_pointvector.h index 67136ce2b49..ea9c1c2cf0f 100644 --- a/octree/include/pcl/octree/octree_pointcloud_pointvector.h +++ b/octree/include/pcl/octree/octree_pointcloud_pointvector.h @@ -64,8 +64,8 @@ namespace pcl public: // public typedefs for single/double buffering - typedef OctreePointCloudPointVector > SingleBuffer; + using SingleBuffer = OctreePointCloudPointVector >; // typedef OctreePointCloudPointVector > DoubleBuffer; diff --git a/octree/include/pcl/octree/octree_pointcloud_singlepoint.h b/octree/include/pcl/octree/octree_pointcloud_singlepoint.h index a0f77208d80..9e5ba8d27b7 100644 --- a/octree/include/pcl/octree/octree_pointcloud_singlepoint.h +++ b/octree/include/pcl/octree/octree_pointcloud_singlepoint.h @@ -64,8 +64,8 @@ namespace pcl public: // public typedefs for single/double buffering - typedef OctreePointCloudSinglePoint > SingleBuffer; + using SingleBuffer = OctreePointCloudSinglePoint >; // typedef OctreePointCloudSinglePoint > DoubleBuffer; diff --git a/octree/include/pcl/octree/octree_pointcloud_voxelcentroid.h b/octree/include/pcl/octree/octree_pointcloud_voxelcentroid.h index c1ef6226052..6e2dc87bdbe 100644 --- a/octree/include/pcl/octree/octree_pointcloud_voxelcentroid.h +++ b/octree/include/pcl/octree/octree_pointcloud_voxelcentroid.h @@ -141,12 +141,12 @@ namespace pcl class OctreePointCloudVoxelCentroid : public OctreePointCloud { public: - typedef boost::shared_ptr > Ptr; - typedef boost::shared_ptr > ConstPtr; + using Ptr = boost::shared_ptr >; + using ConstPtr = boost::shared_ptr >; - typedef OctreePointCloud OctreeT; - typedef typename OctreeT::LeafNode LeafNode; - typedef typename OctreeT::BranchNode BranchNode; + using OctreeT = OctreePointCloud; + using LeafNode = typename OctreeT::LeafNode; + using BranchNode = typename OctreeT::BranchNode; /** \brief OctreePointCloudVoxelCentroids class constructor. * \param[in] resolution_arg octree resolution at lowest octree level diff --git a/octree/include/pcl/octree/octree_search.h b/octree/include/pcl/octree/octree_search.h index a36d53fc29f..f4316544b17 100644 --- a/octree/include/pcl/octree/octree_search.h +++ b/octree/include/pcl/octree/octree_search.h @@ -57,23 +57,23 @@ namespace pcl { public: // public typedefs - typedef boost::shared_ptr > IndicesPtr; - typedef boost::shared_ptr > IndicesConstPtr; + using IndicesPtr = boost::shared_ptr >; + using IndicesConstPtr = boost::shared_ptr >; - typedef pcl::PointCloud PointCloud; - typedef boost::shared_ptr PointCloudPtr; - typedef boost::shared_ptr PointCloudConstPtr; + using PointCloud = pcl::PointCloud; + using PointCloudPtr = boost::shared_ptr; + using PointCloudConstPtr = boost::shared_ptr; // Boost shared pointers - typedef boost::shared_ptr > Ptr; - typedef boost::shared_ptr > ConstPtr; + using Ptr = boost::shared_ptr >; + using ConstPtr = boost::shared_ptr >; // Eigen aligned allocator - typedef std::vector > AlignedPointTVector; + using AlignedPointTVector = std::vector >; - typedef OctreePointCloud OctreeT; - typedef typename OctreeT::LeafNode LeafNode; - typedef typename OctreeT::BranchNode BranchNode; + using OctreeT = OctreePointCloud; + using LeafNode = typename OctreeT::LeafNode; + using BranchNode = typename OctreeT::BranchNode; /** \brief Constructor. * \param[in] resolution octree resolution at lowest octree level