Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove std::binary_function from Registration #2599

Merged
merged 2 commits into from
Nov 6, 2018
Merged

Remove std::binary_function from Registration #2599

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02b7b16
Merge pull request #1 from PointCloudLibrary/master
greenbrettmichael Nov 6, 2018
b04936d
remove std::binary_function from correspondance sort
greenbrettmichael Nov 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions registration/include/pcl/registration/correspondence_sorting.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,11 @@ namespace pcl
* \author Dirk Holz
* \ingroup registration
*/
struct sortCorrespondencesByQueryIndex : public std::binary_function<pcl::Correspondence, pcl::Correspondence, bool>
struct sortCorrespondencesByQueryIndex
{
typedef pcl::Correspondence first_argument_type;
typedef pcl::Correspondence second_argument_type;
typedef bool result_type;
bool
operator()( pcl::Correspondence a, pcl::Correspondence b)
{
Expand All @@ -67,8 +70,11 @@ namespace pcl
* \author Dirk Holz
* \ingroup registration
*/
struct sortCorrespondencesByMatchIndex : public std::binary_function<pcl::Correspondence, pcl::Correspondence, bool>
struct sortCorrespondencesByMatchIndex
{
typedef pcl::Correspondence first_argument_type;
typedef pcl::Correspondence second_argument_type;
typedef bool result_type;
bool
operator()( pcl::Correspondence a, pcl::Correspondence b)
{
Expand All @@ -80,8 +86,11 @@ namespace pcl
* \author Dirk Holz
* \ingroup registration
*/
struct sortCorrespondencesByDistance : public std::binary_function<pcl::Correspondence, pcl::Correspondence, bool>
struct sortCorrespondencesByDistance
{
typedef pcl::Correspondence first_argument_type;
typedef pcl::Correspondence second_argument_type;
typedef bool result_type;
bool
operator()( pcl::Correspondence a, pcl::Correspondence b)
{
Expand All @@ -93,8 +102,11 @@ namespace pcl
* \author Dirk Holz
* \ingroup registration
*/
struct sortCorrespondencesByQueryIndexAndDistance : public std::binary_function<pcl::Correspondence, pcl::Correspondence, bool>
struct sortCorrespondencesByQueryIndexAndDistance
{
typedef pcl::Correspondence first_argument_type;
typedef pcl::Correspondence second_argument_type;
typedef bool result_type;
inline bool
operator()( pcl::Correspondence a, pcl::Correspondence b)
{
Expand All @@ -110,8 +122,11 @@ namespace pcl
* \author Dirk Holz
* \ingroup registration
*/
struct sortCorrespondencesByMatchIndexAndDistance : public std::binary_function<pcl::Correspondence, pcl::Correspondence, bool>
struct sortCorrespondencesByMatchIndexAndDistance
{
typedef pcl::Correspondence first_argument_type;
typedef pcl::Correspondence second_argument_type;
typedef bool result_type;
inline bool
operator()( pcl::Correspondence a, pcl::Correspondence b)
{
Expand Down