Skip to content

Commit

Permalink
Merge pull request PointCloudLibrary#449 from taketwo/fix-vs-c2487
Browse files Browse the repository at this point in the history
Fix compiler error in filter_indices.h
  • Loading branch information
sdmiller committed Jan 16, 2014
2 parents bcd4329 + 5d1fae6 commit 01e5fab
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions filters/include/pcl/filters/filter_indices.h
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@ namespace pcl
}

protected:

using Filter<PointT>::initCompute;
using Filter<PointT>::deinitCompute;
using Filter<PointT>::applyFilter;

/** \brief False = normal filter behavior (default), true = inverted behavior. */
bool negative_;
Expand All @@ -185,6 +185,10 @@ namespace pcl
/** \brief Abstract filter method for point cloud indices. */
virtual void
applyFilter (std::vector<int> &indices) = 0;

/** \brief Abstract filter method for point cloud. */
virtual void
applyFilter (PointCloud &output) = 0;
};

//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -282,8 +286,6 @@ namespace pcl

protected:

using Filter<pcl::PCLPointCloud2>::applyFilter;

/** \brief False = normal filter behavior (default), true = inverted behavior. */
bool negative_;

Expand All @@ -296,6 +298,10 @@ namespace pcl
/** \brief Abstract filter method for point cloud indices. */
virtual void
applyFilter (std::vector<int> &indices) = 0;

/** \brief Abstract filter method for point cloud. */
virtual void
applyFilter (PCLPointCloud2 &output) = 0;
};
}

Expand Down

0 comments on commit 01e5fab

Please sign in to comment.