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

DM-29501: replace unary_function, binary_function, deprecated in C++17 #171

Merged
merged 1 commit into from
Apr 2, 2021
Merged

DM-29501: replace unary_function, binary_function, deprecated in C++17 #171

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/SincCoeffs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ class CircularAperture {
};

template <typename CoordT>
class CircApPolar : public std::unary_function<CoordT, CoordT> {
class CircApPolar {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I couldn't find any uses of this code by doing a search, but I guess it doesn't hurt to leave it around? (Same for SincAperture and GaussPowerFunctor below).

public:
CircApPolar(double radius, double taperwidth) : _ap(CircularAperture<CoordT>(0.0, radius, taperwidth)) {}
CoordT operator()(double r) const { return r * _ap(r, 0.0); }
Expand All @@ -159,7 +159,7 @@ class CircApPolar : public std::unary_function<CoordT, CoordT> {
* Define a Sinc functor to be integrated over for Sinc interpolation
*/
template <typename IntegrandT>
class SincAperture : public std::binary_function<IntegrandT, IntegrandT, IntegrandT> {
class SincAperture {
public:
SincAperture(CircularAperture<IntegrandT> const& ap,
int const ix, // sinc center x
Expand All @@ -181,7 +181,7 @@ class SincAperture : public std::binary_function<IntegrandT, IntegrandT, Integra
double _ix, _iy;
};

class GaussPowerFunctor : public std::binary_function<double, double, double> {
class GaussPowerFunctor {
public:
GaussPowerFunctor(double sigma) : _sigma(sigma) {}

Expand Down