X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gnuradio-core%2Fsrc%2Flib%2Fgeneral%2Fgr_feval.cc;h=e679ef5859600193586264d8092ed171ddc93fb7;hb=ea29b08aeb54227e6628f655ccfdb96fe4d8c378;hp=3be5f47c5a41a38ae626944d3575e3d70270c694;hpb=09a1e803a9e6587c78d20cdf16891e5295874668;p=debian%2Fgnuradio diff --git a/gnuradio-core/src/lib/general/gr_feval.cc b/gnuradio-core/src/lib/general/gr_feval.cc index 3be5f47c..e679ef58 100644 --- a/gnuradio-core/src/lib/general/gr_feval.cc +++ b/gnuradio-core/src/lib/general/gr_feval.cc @@ -34,6 +34,14 @@ gr_feval_dd::eval(double x) return 0; } +double +gr_feval_dd::calleval(double x) +{ + return eval(x); +} + +// ---------------------------------------------------------------- + gr_feval_cc::~gr_feval_cc(){} gr_complex @@ -42,6 +50,14 @@ gr_feval_cc::eval(gr_complex x) return 0; } +gr_complex +gr_feval_cc::calleval(gr_complex x) +{ + return eval(x); +} + +// ---------------------------------------------------------------- + gr_feval_ll::~gr_feval_ll(){} long @@ -50,23 +66,51 @@ gr_feval_ll::eval(long x) return 0; } +long +gr_feval_ll::calleval(long x) +{ + return eval(x); +} + +// ---------------------------------------------------------------- + +gr_feval::~gr_feval(){} + +void +gr_feval::eval(void) +{ + // nop +} + +void +gr_feval::calleval(void) +{ + eval(); +} + /* * Trivial examples showing C++ (transparently) calling Python */ double gr_feval_dd_example(gr_feval_dd *f, double x) { - return f->eval(x); + return f->calleval(x); } gr_complex gr_feval_cc_example(gr_feval_cc *f, gr_complex x) { - return f->eval(x); + return f->calleval(x); } long gr_feval_ll_example(gr_feval_ll *f, long x) { - return f->eval(x); + return f->calleval(x); +} + +void +gr_feval_example(gr_feval *f) +{ + f->calleval(); }