Add more usings.

larshg · larshg · commit e9783c42fbd5 · 2025-06-19T09:30:31.000+02:00
diff --git a/features/include/pcl/features/fpfh_omp.h b/features/include/pcl/features/fpfh_omp.h
@@ -107,6 +107,9 @@ namespace pcl
       void
       setNumberOfThreads (unsigned int num_threads = 0);
 
+    protected:
+      using Base<PointT>::num_threads_;
+
     private:
       /** \brief Estimate the Fast Point Feature Histograms (FPFH) descriptors at a set of points given by
         * <setInputCloud (), setIndices ()> using the surface in setSearchSurface () and the spatial locator in
diff --git a/features/include/pcl/features/intensity_gradient.h b/features/include/pcl/features/intensity_gradient.h
@@ -114,7 +114,8 @@ namespace pcl
                                      const Eigen::Vector3f &normal,
                                      Eigen::Vector3f &gradient);
 
-    protected:
+      using PCLBase<PointInT>::num_threads_;
+
       ///intensity field accessor structure
       IntensitySelectorT intensity_;
   };
diff --git a/features/include/pcl/features/normal_3d_omp.h b/features/include/pcl/features/normal_3d_omp.h
@@ -88,6 +88,7 @@ namespace pcl
       setNumberOfThreads (unsigned int num_threads = 0);
 
     protected:
+      using Base<PointInT>::num_threads_;
       /** \brief Chunk size for (dynamic) scheduling. */
       int chunk_size_;
     private:
diff --git a/features/include/pcl/features/principal_curvatures.h b/features/include/pcl/features/principal_curvatures.h
@@ -111,6 +111,7 @@ namespace pcl
       setNumberOfThreads (unsigned int num_threads = 0);
 
     protected:
+      using Base<PointInT>::num_threads_;
       /** \brief Chunk size for (dynamic) scheduling. */
       int chunk_size_;
 
diff --git a/features/include/pcl/features/shot_lrf_omp.h b/features/include/pcl/features/shot_lrf_omp.h
@@ -86,6 +86,7 @@ namespace pcl
     setNumberOfThreads (unsigned int num_threads = 0);
 
     protected:
+      using Base<PointInT>::num_threads_;
       using Feature<PointInT, PointOutT>::feature_name_;
       using Feature<PointInT, PointOutT>::getClassName;
       //using Feature<PointInT, PointOutT>::searchForNeighbors;
diff --git a/features/include/pcl/features/shot_omp.h b/features/include/pcl/features/shot_omp.h
@@ -189,7 +189,7 @@ namespace pcl
       setNumberOfThreads (unsigned int num_threads = 0);
 
     protected:
-
+      using Base<PointInT>::num_threads_;
       /** \brief Estimate the Signatures of Histograms of OrienTations (SHOT) descriptors at a set of points given by
         * <setInputCloud (), setIndices ()> using the surface in setSearchSurface () and the spatial locator in
         * setSearchMethod ()
diff --git a/filters/include/pcl/filters/convolution.h b/filters/include/pcl/filters/convolution.h
@@ -192,6 +192,8 @@ namespace pcl
           */
         void
         initCompute (PointCloudOut& output);
+
+        using Base<PointIn>::num_threads_;
       private:
         /** \return the result of convolution of point at (\ai, \aj)
           * \note no test on finity is performed
diff --git a/filters/include/pcl/filters/convolution_3d.h b/filters/include/pcl/filters/convolution_3d.h
@@ -269,6 +269,7 @@ namespace pcl
         convolve (PointCloudOut& output);
 
       protected:
+        using Base<PointIn>::num_threads_;
         /** \brief initialize computation */
         bool initCompute ();
 
diff --git a/filters/include/pcl/filters/fast_bilateral_omp.h b/filters/include/pcl/filters/fast_bilateral_omp.h
@@ -57,6 +57,7 @@ namespace pcl
   class FastBilateralFilterOMP : public FastBilateralFilter<PointT>
   {
   protected:
+    using Base<PointT>::num_threads_;
     using FastBilateralFilter<PointT>::input_;
     using FastBilateralFilter<PointT>::sigma_s_;
     using FastBilateralFilter<PointT>::sigma_r_;
diff --git a/filters/include/pcl/filters/pyramid.h b/filters/include/pcl/filters/pyramid.h
@@ -139,6 +139,9 @@ namespace pcl
 
         inline const std::string&
         getClassName () const { return (name_); }
+
+      protected:
+        using PCLBase<PointT>::num_threads_;
       
       private:
 
diff --git a/filters/include/pcl/filters/radius_outlier_removal.h b/filters/include/pcl/filters/radius_outlier_removal.h
@@ -72,6 +72,7 @@ namespace pcl
   class RadiusOutlierRemoval : public FilterIndices<PointT>
   {
     protected:
+      using PCLBase<PointT>::num_threads_;
       using PointCloud = typename FilterIndices<PointT>::PointCloud;
       using PointCloudPtr = typename PointCloud::Ptr;
       using PointCloudConstPtr = typename PointCloud::ConstPtr;
diff --git a/keypoints/include/pcl/keypoints/harris_2d.h b/keypoints/include/pcl/keypoints/harris_2d.h
@@ -142,6 +142,8 @@ namespace pcl
       }
 
     protected:
+      using Base<PointInT>::num_threads_;
+
       bool 
       initCompute () override;
       void 
diff --git a/keypoints/include/pcl/keypoints/harris_3d.h b/keypoints/include/pcl/keypoints/harris_3d.h
@@ -165,6 +165,8 @@ namespace pcl
       }
 
     protected:
+      using PCLBase<PointInT>::num_threads_;
+
       bool
       initCompute () override;
       void detectKeypoints (PointCloudOut &output) override;
diff --git a/keypoints/include/pcl/keypoints/harris_6d.h b/keypoints/include/pcl/keypoints/harris_6d.h
@@ -132,6 +132,7 @@ namespace pcl
       }
 
     protected:
+      using Base<PointInT>::num_threads_;
       void detectKeypoints (PointCloudOut &output);
       void responseTomasi (PointCloudOut &output) const;
       void refineCorners (PointCloudOut &corners) const;
diff --git a/keypoints/include/pcl/keypoints/iss_3d.h b/keypoints/include/pcl/keypoints/iss_3d.h
@@ -196,6 +196,8 @@ namespace pcl
 
     protected:
 
+      using Base<PointInT>::num_threads_;
+
       /** \brief Compute the boundary points for the given input cloud.
         * \param[in] input the input cloud
         * \param[in] border_radius the radius used to compute the boundary points
diff --git a/keypoints/include/pcl/keypoints/susan.h b/keypoints/include/pcl/keypoints/susan.h
@@ -156,6 +156,8 @@ namespace pcl
       setGeometricValidation (bool validate);
     
     protected:
+      using Base<PointInT>::num_threads_;
+
       bool
       initCompute () override;
 
diff --git a/keypoints/include/pcl/keypoints/trajkovic_2d.h b/keypoints/include/pcl/keypoints/trajkovic_2d.h
@@ -149,6 +149,8 @@ namespace pcl
       }
 
     protected:
+      using Base<PointInT>::num_threads_;
+
       bool
       initCompute () override;
 
diff --git a/keypoints/include/pcl/keypoints/trajkovic_3d.h b/keypoints/include/pcl/keypoints/trajkovic_3d.h
@@ -162,6 +162,8 @@ namespace pcl
       }
 
     protected:
+      using Base<PointInT>::num_threads_;
+
       bool
       initCompute () override;
 
diff --git a/registration/include/pcl/registration/correspondence_estimation.h b/registration/include/pcl/registration/correspondence_estimation.h
@@ -69,7 +69,6 @@ class CorrespondenceEstimationBase : public PCLBase<PointSource> {
   using PCLBase<PointSource>::input_;
   using PCLBase<PointSource>::indices_;
   using PCLBase<PointSource>::setIndices;
-  using PCLBase<PointSource>::num_threads_;
 
   using KdTree = pcl::search::KdTree<PointTarget>;
   using KdTreePtr = typename KdTree::Ptr;
@@ -323,6 +322,8 @@ class CorrespondenceEstimationBase : public PCLBase<PointSource> {
   clone() const = 0;
 
 protected:
+  using PCLBase<PointSource>::num_threads_;
+
   /** \brief The correspondence estimation method name. */
   std::string corr_name_;
 
diff --git a/registration/include/pcl/registration/gicp.h b/registration/include/pcl/registration/gicp.h
@@ -75,7 +75,6 @@ template <typename PointSource, typename PointTarget, typename Scalar = float>
 class GeneralizedIterativeClosestPoint
 : public IterativeClosestPoint<PointSource, PointTarget, Scalar> {
 public:
-  using PCLBase<PointSource>::num_threads_;
   using IterativeClosestPoint<PointSource, PointTarget, Scalar>::reg_name_;
   using IterativeClosestPoint<PointSource, PointTarget, Scalar>::getClassName;
   using IterativeClosestPoint<PointSource, PointTarget, Scalar>::indices_;
@@ -380,6 +379,8 @@ class GeneralizedIterativeClosestPoint
   setNumberOfThreads(unsigned int num_threads = 0);
 
 protected:
+  using PCLBase<PointSource>::num_threads_;
+
   /** \brief The number of neighbors used for covariances computation.
    * default: 20
    */
diff --git a/registration/include/pcl/registration/ia_fpcs.h b/registration/include/pcl/registration/ia_fpcs.h
@@ -289,6 +289,7 @@ class FPCSInitialAlignment : public Registration<PointSource, PointTarget, Scala
   };
 
 protected:
+  using PCLBase<PointSource>::num_threads_;
   using PCLBase<PointSource>::deinitCompute;
   using PCLBase<PointSource>::input_;
   using PCLBase<PointSource>::indices_;
diff --git a/segmentation/include/pcl/segmentation/approximate_progressive_morphological_filter.h b/segmentation/include/pcl/segmentation/approximate_progressive_morphological_filter.h
@@ -153,6 +153,8 @@ namespace pcl
 
     protected:
 
+      using PCLBase<PointT>::num_threads_;
+
       /** \brief Maximum window size to be used in filtering ground returns. */
       int max_window_size_{33};
 
diff --git a/segmentation/include/pcl/segmentation/sac_segmentation.h b/segmentation/include/pcl/segmentation/sac_segmentation.h
@@ -69,7 +69,6 @@ namespace pcl
      public:
       using PCLBase<PointT>::input_;
       using PCLBase<PointT>::indices_;
-      using PCLBase<PointT>::num_threads_;
 
       using PointCloud = pcl::PointCloud<PointT>;
       using PointCloudPtr = typename PointCloud::Ptr;
@@ -258,6 +257,8 @@ namespace pcl
       virtual void 
       initSAC (const int method_type);
 
+      using PCLBase<PointT>::num_threads_;
+
       /** \brief The model that needs to be segmented. */
       SampleConsensusModelPtr model_{nullptr};
 
diff --git a/surface/include/pcl/surface/mls.h b/surface/include/pcl/surface/mls.h
@@ -257,7 +257,6 @@ namespace pcl
 
       using PCLBase<PointInT>::input_;
       using PCLBase<PointInT>::indices_;
-      using PCLBase<PointInT>::num_threads_;
       using PCLBase<PointInT>::fake_indices_;
       using PCLBase<PointInT>::initCompute;
       using PCLBase<PointInT>::deinitCompute;
@@ -509,6 +508,8 @@ namespace pcl
       getCorrespondingIndices () const { return (corresponding_input_indices_); }
 
     protected:
+      using PCLBase<PointInT>::num_threads_;
+
       /** \brief The point cloud that will hold the estimated normals, if set. */
       NormalCloudPtr normals_{nullptr};
 
diff --git a/surface/include/pcl/surface/poisson.h b/surface/include/pcl/surface/poisson.h
@@ -231,6 +231,8 @@ namespace pcl
       }
 
     protected:
+      using PCLBase<PointNT>::num_threads_;
+
       /** \brief Class get name method. */
       std::string
       getClassName () const override { return ("Poisson"); }
diff --git a/tracking/include/pcl/tracking/kld_adaptive_particle_filter_omp.h b/tracking/include/pcl/tracking/kld_adaptive_particle_filter_omp.h
@@ -85,6 +85,8 @@ class KLDAdaptiveParticleFilterOMPTracker
   setNumberOfThreads(unsigned int num_threads = 0);
 
 protected:
+  using PCLBase<PointInT>::num_threads_;
+
   /** \brief weighting phase of particle filter method. calculate the likelihood of all
    * of the particles and set the weights.
    */
diff --git a/tracking/include/pcl/tracking/particle_filter_omp.h b/tracking/include/pcl/tracking/particle_filter_omp.h
@@ -73,6 +73,8 @@ class ParticleFilterOMPTracker : public ParticleFilterTracker<PointInT, StateT>
   setNumberOfThreads(unsigned int num_threads = 0);
 
 protected:
+  using PCLBase<PointInT>::num_threads_;
+
   /** \brief weighting phase of particle filter method. calculate the likelihood of all
    * of the particles and set the weights.
    */
diff --git a/tracking/include/pcl/tracking/pyramidal_klt.h b/tracking/include/pcl/tracking/pyramidal_klt.h
@@ -394,6 +394,8 @@ class PyramidalKLTTracker : public Tracker<PointInT, Eigen::Affine3f> {
   void
   computeTracking() override;
 
+  using PCLBase<PointInT>::num_threads_;
+
   /** \brief input pyranid at t-1 */
   std::vector<FloatImageConstPtr> ref_pyramid_;
   /** \brief point cloud at t-1 */

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ namespace pcl`
`57`	`57`	`class FastBilateralFilterOMP : public FastBilateralFilter<PointT>`
`58`	`58`	`{`
`59`	`59`	`protected:`
	`60`	`+ using Base<PointT>::num_threads_;`
`60`	`61`	`using FastBilateralFilter<PointT>::input_;`
`61`	`62`	`using FastBilateralFilter<PointT>::sigma_s_;`
`62`	`63`	`using FastBilateralFilter<PointT>::sigma_r_;`