From 0456d7acd458cc6c1927266c842e8cea61a6d81e Mon Sep 17 00:00:00 2001 From: Sergey Alexandrov Date: Sat, 9 Mar 2019 18:31:30 +0100 Subject: [PATCH 1/7] Remove redundant typename in non-dependent typedefs (apps) --- .../feature_wrapper/global/crh_estimator.h | 2 +- .../feature_wrapper/global/cvfh_estimator.h | 2 +- .../feature_wrapper/global/esf_estimator.h | 2 +- .../feature_wrapper/global/ourcvfh_estimator.h | 2 +- .../feature_wrapper/global/vfh_estimator.h | 2 +- .../feature_wrapper/local/colorshot_local_estimator.h | 2 +- .../feature_wrapper/local/fpfh_local_estimator.h | 2 +- .../feature_wrapper/local/fpfh_local_estimator_omp.h | 2 +- .../feature_wrapper/local/shot_local_estimator.h | 2 +- .../feature_wrapper/local/shot_local_estimator_omp.h | 2 +- .../3d_rec_framework/feature_wrapper/normal_estimator.h | 6 ++---- apps/src/openni_tracking.cpp | 8 ++++---- 12 files changed, 16 insertions(+), 18 deletions(-) diff --git a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/crh_estimator.h b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/crh_estimator.h index 97a7f2759c2..ba259c5ed0e 100644 --- a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/crh_estimator.h +++ b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/crh_estimator.h @@ -62,7 +62,7 @@ namespace pcl crh_histograms_.resize(signatures.size()); - typedef typename pcl::CRHEstimation > CRHEstimation; + typedef pcl::CRHEstimation > CRHEstimation; CRHEstimation crh; crh.setInputCloud(processed); crh.setInputNormals(normals_); diff --git a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/cvfh_estimator.h b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/cvfh_estimator.h index b6aa5ec5e49..6ea2049a3e4 100644 --- a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/cvfh_estimator.h +++ b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/cvfh_estimator.h @@ -97,7 +97,7 @@ namespace pcl /*normals_.reset(new pcl::PointCloud); normal_estimator_->estimate (in, processed, normals_);*/ - typedef typename pcl::CVFHEstimation CVFHEstimation; + typedef pcl::CVFHEstimation CVFHEstimation; pcl::PointCloud cvfh_signatures; typename pcl::search::KdTree::Ptr cvfh_tree (new pcl::search::KdTree); diff --git a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/esf_estimator.h b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/esf_estimator.h index bba59246be5..7e0ddd705f9 100644 --- a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/esf_estimator.h +++ b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/esf_estimator.h @@ -27,7 +27,7 @@ namespace pcl std::vector > & centroids) override { - typedef typename pcl::ESFEstimation ESFEstimation; + typedef pcl::ESFEstimation ESFEstimation; pcl::PointCloud ESF_signature; ESFEstimation esf; diff --git a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/ourcvfh_estimator.h b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/ourcvfh_estimator.h index 5d7b2543b4e..97b02bdf5ef 100644 --- a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/ourcvfh_estimator.h +++ b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/ourcvfh_estimator.h @@ -130,7 +130,7 @@ namespace pcl /*normals_.reset(new pcl::PointCloud); normal_estimator_->estimate (in, processed, normals_);*/ - typedef typename pcl::OURCVFHEstimation OURCVFHEstimation; + typedef pcl::OURCVFHEstimation OURCVFHEstimation; pcl::PointCloud cvfh_signatures; typename pcl::search::KdTree::Ptr cvfh_tree (new pcl::search::KdTree); diff --git a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/vfh_estimator.h b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/vfh_estimator.h index f57c2a24864..4079cf3e9da 100644 --- a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/vfh_estimator.h +++ b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/global/vfh_estimator.h @@ -39,7 +39,7 @@ namespace pcl normals_.reset(new pcl::PointCloud); normal_estimator_->estimate (in, processed, normals_); - typedef typename pcl::VFHEstimation VFHEstimation; + typedef pcl::VFHEstimation VFHEstimation; pcl::PointCloud vfh_signature; VFHEstimation vfh; diff --git a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/local/colorshot_local_estimator.h b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/local/colorshot_local_estimator.h index 4348ed2ee65..7dfc8594b4b 100644 --- a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/local/colorshot_local_estimator.h +++ b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/local/colorshot_local_estimator.h @@ -61,7 +61,7 @@ namespace pcl } //compute signatures - typedef typename pcl::SHOTColorEstimation SHOTEstimator; + typedef pcl::SHOTColorEstimation SHOTEstimator; typename pcl::search::KdTree::Ptr tree (new pcl::search::KdTree); pcl::PointCloud::Ptr shots (new pcl::PointCloud); diff --git a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/local/fpfh_local_estimator.h b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/local/fpfh_local_estimator.h index a59582fbdda..5afd83bb905 100644 --- a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/local/fpfh_local_estimator.h +++ b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/local/fpfh_local_estimator.h @@ -60,7 +60,7 @@ namespace pcl assert (processed->points.size () == normals->points.size ()); //compute signatures - typedef typename pcl::FPFHEstimation FPFHEstimator; + typedef pcl::FPFHEstimation FPFHEstimator; typename pcl::search::KdTree::Ptr tree (new pcl::search::KdTree); pcl::PointCloud::Ptr fpfhs (new pcl::PointCloud); diff --git a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/local/fpfh_local_estimator_omp.h b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/local/fpfh_local_estimator_omp.h index 7c993e2f33f..b728cdc5fe6 100644 --- a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/local/fpfh_local_estimator_omp.h +++ b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/local/fpfh_local_estimator_omp.h @@ -61,7 +61,7 @@ namespace pcl assert (processed->points.size () == normals->points.size ()); //compute signatures - typedef typename pcl::FPFHEstimationOMP FPFHEstimator; + typedef pcl::FPFHEstimationOMP FPFHEstimator; typename pcl::search::KdTree::Ptr tree (new pcl::search::KdTree); pcl::PointCloud::Ptr fpfhs (new pcl::PointCloud); diff --git a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/local/shot_local_estimator.h b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/local/shot_local_estimator.h index 8c1ace31efe..14a6d4745cb 100644 --- a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/local/shot_local_estimator.h +++ b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/local/shot_local_estimator.h @@ -107,7 +107,7 @@ namespace pcl std::cout << keypoints->points.size() << " " << normals->points.size() << " " << processed->points.size() << std::endl; //compute signatures - typedef typename pcl::SHOTEstimation SHOTEstimator; + typedef pcl::SHOTEstimation SHOTEstimator; typename pcl::search::KdTree::Ptr tree (new pcl::search::KdTree); pcl::PointCloud::Ptr shots (new pcl::PointCloud); diff --git a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/local/shot_local_estimator_omp.h b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/local/shot_local_estimator_omp.h index ee83b32be81..fff02f28cda 100644 --- a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/local/shot_local_estimator_omp.h +++ b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/local/shot_local_estimator_omp.h @@ -95,7 +95,7 @@ namespace pcl } //compute signatures - typedef typename pcl::SHOTEstimationOMP SHOTEstimator; + typedef pcl::SHOTEstimationOMP SHOTEstimator; typename pcl::search::KdTree::Ptr tree (new pcl::search::KdTree); tree->setInputCloud (processed); diff --git a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/normal_estimator.h b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/normal_estimator.h index c8c4432149a..504c11fe827 100644 --- a/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/normal_estimator.h +++ b/apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/feature_wrapper/normal_estimator.h @@ -183,8 +183,7 @@ namespace pcl if (out->isOrganized ()) { - typedef typename pcl::IntegralImageNormalEstimation NormalEstimator_; - NormalEstimator_ n3d; + pcl::IntegralImageNormalEstimation n3d; n3d.setNormalEstimationMethod (n3d.COVARIANCE_MATRIX); //n3d.setNormalEstimationMethod (n3d.AVERAGE_3D_GRADIENT); n3d.setInputCloud (out); @@ -223,8 +222,7 @@ namespace pcl out->height = 1; } - typedef typename pcl::NormalEstimation NormalEstimator_; - NormalEstimator_ n3d; + pcl::NormalEstimation n3d; typename pcl::search::KdTree::Ptr normals_tree (new pcl::search::KdTree); normals_tree->setInputCloud (out); n3d.setRadiusSearch (radius); diff --git a/apps/src/openni_tracking.cpp b/apps/src/openni_tracking.cpp index ec5ea98c685..63bf265bb25 100644 --- a/apps/src/openni_tracking.cpp +++ b/apps/src/openni_tracking.cpp @@ -116,16 +116,16 @@ class OpenNISegmentTracking typedef pcl::PointCloud Cloud; typedef pcl::PointCloud RefCloud; - typedef typename RefCloud::Ptr RefCloudPtr; - typedef typename RefCloud::ConstPtr RefCloudConstPtr; + typedef RefCloud::Ptr RefCloudPtr; + typedef RefCloud::ConstPtr RefCloudConstPtr; typedef typename Cloud::Ptr CloudPtr; typedef typename Cloud::ConstPtr CloudConstPtr; //typedef KLDAdaptiveParticleFilterTracker ParticleFilter; //typedef KLDAdaptiveParticleFilterOMPTracker ParticleFilter; //typedef ParticleFilterOMPTracker ParticleFilter; typedef ParticleFilterTracker ParticleFilter; - typedef typename ParticleFilter::CoherencePtr CoherencePtr; - typedef typename pcl::search::KdTree KdTree; + typedef ParticleFilter::CoherencePtr CoherencePtr; + typedef pcl::search::KdTree KdTree; typedef typename KdTree::Ptr KdTreePtr; OpenNISegmentTracking (const std::string& device_id, int thread_nr, double downsampling_grid_size, bool use_convex_hull, From c99d084de498cd41cd279cd2fe2afbd3ad640e9e Mon Sep 17 00:00:00 2001 From: Sergey Alexandrov Date: Sat, 9 Mar 2019 18:31:42 +0100 Subject: [PATCH 2/7] Remove redundant typename in non-dependent typedefs (2d) --- 2d/include/pcl/2d/edge.h | 2 +- 2d/include/pcl/2d/morphology.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/2d/include/pcl/2d/edge.h b/2d/include/pcl/2d/edge.h index a4cfb0bca6e..4a1d74a1381 100644 --- a/2d/include/pcl/2d/edge.h +++ b/2d/include/pcl/2d/edge.h @@ -47,7 +47,7 @@ namespace pcl class Edge { private: - typedef typename pcl::PointCloud PointCloudIn; + typedef pcl::PointCloud PointCloudIn; typedef typename PointCloudIn::Ptr PointCloudInPtr; PointCloudInPtr input_; diff --git a/2d/include/pcl/2d/morphology.h b/2d/include/pcl/2d/morphology.h index 8f7cc61387c..283e6a07f0d 100644 --- a/2d/include/pcl/2d/morphology.h +++ b/2d/include/pcl/2d/morphology.h @@ -45,7 +45,7 @@ namespace pcl class Morphology : public PCLBase { private: - typedef typename pcl::PointCloud PointCloudIn; + typedef pcl::PointCloud PointCloudIn; typedef typename PointCloudIn::Ptr PointCloudInPtr; PointCloudInPtr structuring_element_; From 319f20364ef35afeaba5b101629b7fc479d7107e Mon Sep 17 00:00:00 2001 From: Sergey Alexandrov Date: Sat, 9 Mar 2019 18:31:56 +0100 Subject: [PATCH 3/7] Remove redundant typename in non-dependent typedefs (tutorials) --- doc/tutorials/content/hdl_grabber.rst | 2 +- .../content/sources/stick_segmentation/stick_segmentation.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tutorials/content/hdl_grabber.rst b/doc/tutorials/content/hdl_grabber.rst index 6748280206c..3592fdd82a5 100644 --- a/doc/tutorials/content/hdl_grabber.rst +++ b/doc/tutorials/content/hdl_grabber.rst @@ -101,7 +101,7 @@ So let's look at the code. The following represents a simplified version of *vis { public: typedef pcl::PointCloud Cloud; - typedef typename Cloud::ConstPtr CloudConstPtr; + typedef Cloud::ConstPtr CloudConstPtr; SimpleHDLViewer (Grabber& grabber, pcl::visualization::PointCloudColorHandler &handler) : diff --git a/doc/tutorials/content/sources/stick_segmentation/stick_segmentation.cpp b/doc/tutorials/content/sources/stick_segmentation/stick_segmentation.cpp index be04c5482f5..22ab9660378 100644 --- a/doc/tutorials/content/sources/stick_segmentation/stick_segmentation.cpp +++ b/doc/tutorials/content/sources/stick_segmentation/stick_segmentation.cpp @@ -18,7 +18,7 @@ template class ConditionThresholdHSV : public pcl::ConditionBase { public: - typedef typename boost::shared_ptr > Ptr; + typedef boost::shared_ptr > Ptr; ConditionThresholdHSV (float min_h, float max_h, float min_s, float max_s, float min_v, float max_v) : min_h_(min_h), max_h_(max_h), min_s_(min_s), max_s_(max_s), min_v_(min_v), max_v_(max_v) From f5439359e31b08df04156a8190facb6593f2f028 Mon Sep 17 00:00:00 2001 From: Sergey Alexandrov Date: Sat, 9 Mar 2019 18:32:04 +0100 Subject: [PATCH 4/7] Remove redundant typename in non-dependent typedefs (cuda) --- cuda/common/include/pcl/cuda/point_cloud.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cuda/common/include/pcl/cuda/point_cloud.h b/cuda/common/include/pcl/cuda/point_cloud.h index 88c583de0f3..f2bcd4be7f0 100644 --- a/cuda/common/include/pcl/cuda/point_cloud.h +++ b/cuda/common/include/pcl/cuda/point_cloud.h @@ -64,7 +64,7 @@ namespace pcl struct Host { // vector type - typedef typename thrust::host_vector type; + typedef thrust::host_vector type; // // iterator type // typedef thrust::detail::normal_iterator type; @@ -93,7 +93,7 @@ namespace pcl struct Device { // vector type - typedef typename thrust::device_vector type; + typedef thrust::device_vector type; // // iterator type // typedef thrust::detail::normal_iterator > iterator_type; From ad9dcfa6cc528d60c61b464a4018ed3426962b8e Mon Sep 17 00:00:00 2001 From: Sergey Alexandrov Date: Sat, 9 Mar 2019 18:32:23 +0100 Subject: [PATCH 5/7] Remove redundant typename in non-dependent typedefs (outofcore) --- .../pcl/outofcore/outofcore_breadth_first_iterator.h | 8 ++++---- .../pcl/outofcore/outofcore_depth_first_iterator.h | 8 ++++---- outofcore/include/pcl/outofcore/outofcore_iterator_base.h | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/outofcore/include/pcl/outofcore/outofcore_breadth_first_iterator.h b/outofcore/include/pcl/outofcore/outofcore_breadth_first_iterator.h index 19efe7d68da..125d0e0f8cb 100644 --- a/outofcore/include/pcl/outofcore/outofcore_breadth_first_iterator.h +++ b/outofcore/include/pcl/outofcore/outofcore_breadth_first_iterator.h @@ -54,11 +54,11 @@ namespace pcl class OutofcoreBreadthFirstIterator : public OutofcoreIteratorBase { public: - typedef typename pcl::outofcore::OutofcoreOctreeBase OctreeDisk; - typedef typename pcl::outofcore::OutofcoreOctreeBaseNode OctreeDiskNode; + typedef pcl::outofcore::OutofcoreOctreeBase OctreeDisk; + typedef pcl::outofcore::OutofcoreOctreeBaseNode OctreeDiskNode; - typedef typename pcl::outofcore::OutofcoreOctreeBaseNode LeafNode; - typedef typename pcl::outofcore::OutofcoreOctreeBaseNode BranchNode; + typedef pcl::outofcore::OutofcoreOctreeBaseNode LeafNode; + typedef pcl::outofcore::OutofcoreOctreeBaseNode BranchNode; explicit diff --git a/outofcore/include/pcl/outofcore/outofcore_depth_first_iterator.h b/outofcore/include/pcl/outofcore/outofcore_depth_first_iterator.h index aee2d2a47db..f5a6650a17f 100644 --- a/outofcore/include/pcl/outofcore/outofcore_depth_first_iterator.h +++ b/outofcore/include/pcl/outofcore/outofcore_depth_first_iterator.h @@ -53,11 +53,11 @@ namespace pcl class OutofcoreDepthFirstIterator : public OutofcoreIteratorBase { public: - typedef typename pcl::outofcore::OutofcoreOctreeBase OctreeDisk; - typedef typename pcl::outofcore::OutofcoreOctreeBaseNode OctreeDiskNode; + typedef pcl::outofcore::OutofcoreOctreeBase OctreeDisk; + typedef pcl::outofcore::OutofcoreOctreeBaseNode OctreeDiskNode; - typedef typename pcl::outofcore::OutofcoreOctreeBaseNode LeafNode; - typedef typename pcl::outofcore::OutofcoreOctreeBaseNode BranchNode; + typedef pcl::outofcore::OutofcoreOctreeBaseNode LeafNode; + typedef pcl::outofcore::OutofcoreOctreeBaseNode BranchNode; explicit OutofcoreDepthFirstIterator (OctreeDisk& octree_arg); diff --git a/outofcore/include/pcl/outofcore/outofcore_iterator_base.h b/outofcore/include/pcl/outofcore/outofcore_iterator_base.h index aeae9841f55..d68f9602058 100644 --- a/outofcore/include/pcl/outofcore/outofcore_iterator_base.h +++ b/outofcore/include/pcl/outofcore/outofcore_iterator_base.h @@ -63,8 +63,8 @@ namespace pcl const OutofcoreOctreeBaseNode&>/*Reference type*/ { public: - typedef typename pcl::outofcore::OutofcoreOctreeBase OctreeDisk; - typedef typename pcl::outofcore::OutofcoreOctreeBaseNode OctreeDiskNode; + typedef pcl::outofcore::OutofcoreOctreeBase OctreeDisk; + typedef pcl::outofcore::OutofcoreOctreeBaseNode OctreeDiskNode; typedef typename pcl::outofcore::OutofcoreOctreeBase::BranchNode BranchNode; typedef typename pcl::outofcore::OutofcoreOctreeBase::LeafNode LeafNode; From 31602c0337d98a4d09e09757f3583094c18a6102 Mon Sep 17 00:00:00 2001 From: Sergey Alexandrov Date: Sat, 9 Mar 2019 18:32:35 +0100 Subject: [PATCH 6/7] Remove redundant typename in non-dependent typedefs (gpu) --- gpu/kinfu/tools/kinfu_app.cpp | 2 +- .../pcl/gpu/kinfu_large_scale/standalone_marching_cubes.h | 4 ++-- gpu/kinfu_large_scale/tools/color_handler.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gpu/kinfu/tools/kinfu_app.cpp b/gpu/kinfu/tools/kinfu_app.cpp index 54754faf4d8..d7043fe680f 100644 --- a/gpu/kinfu/tools/kinfu_app.cpp +++ b/gpu/kinfu/tools/kinfu_app.cpp @@ -111,7 +111,7 @@ namespace pcl using PointCloudColorHandler::cloud_; typedef typename PointCloudColorHandler::PointCloud::ConstPtr PointCloudConstPtr; - typedef typename pcl::PointCloud::ConstPtr RgbCloudConstPtr; + typedef pcl::PointCloud::ConstPtr RgbCloudConstPtr; public: typedef boost::shared_ptr > Ptr; diff --git a/gpu/kinfu_large_scale/include/pcl/gpu/kinfu_large_scale/standalone_marching_cubes.h b/gpu/kinfu_large_scale/include/pcl/gpu/kinfu_large_scale/standalone_marching_cubes.h index 5ee0dbb4260..206b3dc1dc6 100644 --- a/gpu/kinfu_large_scale/include/pcl/gpu/kinfu_large_scale/standalone_marching_cubes.h +++ b/gpu/kinfu_large_scale/include/pcl/gpu/kinfu_large_scale/standalone_marching_cubes.h @@ -77,8 +77,8 @@ namespace pcl class StandaloneMarchingCubes { public: - typedef typename pcl::PointCloud PointCloud; - typedef typename pcl::PointCloud::Ptr PointCloudPtr; + typedef pcl::PointCloud PointCloud; + typedef typename PointCloud::Ptr PointCloudPtr; typedef boost::shared_ptr MeshPtr; /** \brief Constructor diff --git a/gpu/kinfu_large_scale/tools/color_handler.h b/gpu/kinfu_large_scale/tools/color_handler.h index cb5e42155d6..06edda8f337 100644 --- a/gpu/kinfu_large_scale/tools/color_handler.h +++ b/gpu/kinfu_large_scale/tools/color_handler.h @@ -50,8 +50,8 @@ namespace pcl using PointCloudColorHandler::capable_; using PointCloudColorHandler::cloud_; - typedef typename PointCloudColorHandler::PointCloud::ConstPtr PointCloudConstPtr; - typedef typename pcl::PointCloud::ConstPtr RgbCloudConstPtr; + typedef typename PointCloudColorHandler::PointCloud::ConstPtr PointCloudConstPtr; + typedef pcl::PointCloud::ConstPtr RgbCloudConstPtr; public: typedef boost::shared_ptr > Ptr; From 06b1a961400b5d1620c54b618a3c9a21bd08cf91 Mon Sep 17 00:00:00 2001 From: Sergey Alexandrov Date: Sat, 9 Mar 2019 18:32:46 +0100 Subject: [PATCH 7/7] Remove redundant typename in non-dependent typedefs (visualization) --- .../point_cloud_geometry_handlers.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/visualization/include/pcl/visualization/point_cloud_geometry_handlers.h b/visualization/include/pcl/visualization/point_cloud_geometry_handlers.h index aad3d0ce260..a94305a0d40 100644 --- a/visualization/include/pcl/visualization/point_cloud_geometry_handlers.h +++ b/visualization/include/pcl/visualization/point_cloud_geometry_handlers.h @@ -65,8 +65,8 @@ namespace pcl typedef typename PointCloud::Ptr PointCloudPtr; typedef typename PointCloud::ConstPtr PointCloudConstPtr; - typedef typename boost::shared_ptr > Ptr; - typedef typename boost::shared_ptr > ConstPtr; + typedef boost::shared_ptr > Ptr; + typedef boost::shared_ptr > ConstPtr; /** \brief Constructor. */ PointCloudGeometryHandler (const PointCloudConstPtr &cloud) : @@ -143,8 +143,8 @@ namespace pcl typedef typename PointCloud::Ptr PointCloudPtr; typedef typename PointCloud::ConstPtr PointCloudConstPtr; - typedef typename boost::shared_ptr > Ptr; - typedef typename boost::shared_ptr > ConstPtr; + typedef boost::shared_ptr > Ptr; + typedef boost::shared_ptr > ConstPtr; /** \brief Constructor. */ PointCloudGeometryHandlerXYZ (const PointCloudConstPtr &cloud); @@ -191,8 +191,8 @@ namespace pcl typedef typename PointCloud::Ptr PointCloudPtr; typedef typename PointCloud::ConstPtr PointCloudConstPtr; - typedef typename boost::shared_ptr > Ptr; - typedef typename boost::shared_ptr > ConstPtr; + typedef boost::shared_ptr > Ptr; + typedef boost::shared_ptr > ConstPtr; /** \brief Constructor. */ PointCloudGeometryHandlerSurfaceNormal (const PointCloudConstPtr &cloud); @@ -236,8 +236,8 @@ namespace pcl typedef typename PointCloud::Ptr PointCloudPtr; typedef typename PointCloud::ConstPtr PointCloudConstPtr; - typedef typename boost::shared_ptr > Ptr; - typedef typename boost::shared_ptr > ConstPtr; + typedef boost::shared_ptr > Ptr; + typedef boost::shared_ptr > ConstPtr; /** \brief Constructor. */ PointCloudGeometryHandlerCustom (const PointCloudConstPtr &cloud,