Renamed nr_threads_ to num_threads_

Author: alexnavtt

filters/include/pcl/filters/farthest_point_sampling.h

@@ -80,25 +80,25 @@ namespace pcl
         }
 
         /** \brief Set the number of threads to use when operating in parallel 
-          * \param nr_threads the number of threads to use
+          * \param num_threads the number of threads to use
           */
         inline void
-        setNumberOfThreads (unsigned int nr_threads)
+        setNumberOfThreads (unsigned int num_threads)
         {
           #ifdef _OPENMP
-          nr_threads_ = nr_threads == 0 ? omp_get_num_procs() : nr_threads;
+          num_threads_ = num_threads == 0 ? omp_get_num_procs() : num_threads;
           #else
-          if (nr_threads_ != 1) 
+          if (num_threads_ != 1) 
             PCL_WARN("OpenMP is not available. Keeping number of threads unchanged at 1\n");
           #endif
         }
 
-        /** \brief Get the value of the internal \a nr_threads_ parameter.
+        /** \brief Get the value of the internal \a num_threads_ parameter.
           */
         inline unsigned int 
         getNumberOfThreads () const
         {
-          return nr_threads_;
+          return num_threads_;
         }
 
       protected:
@@ -108,7 +108,7 @@ namespace pcl
         /** \brief Random number seed. */
         unsigned int seed_;
         /** \brief Number of threads */
-        unsigned int nr_threads_{1};
+        unsigned int num_threads_{1};
 
         /** \brief Sample of point indices
           * \param indices indices of the filtered point cloud

filters/include/pcl/filters/impl/farthest_point_sampling.hpp

@@ -56,7 +56,7 @@ pcl::FarthestPointSampling<PointT>::applyFilter (Indices &indices)
     #pragma omp parallel \
     default(none) \
     shared(distances_to_selected_points, max_index, max_index_point, size, toCloudIndex) \
-    num_threads(nr_threads_)
+    num_threads(num_threads_)
     {
       std::ptrdiff_t local_max_index = max_index;