[Commit-gnuradio] r3700 - gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general

[jcorgan]

Author: jcorgan
Date: 2006-10-03 15:30:01 -0600 (Tue, 03 Oct 2006)
New Revision: 3700

Modified:
   gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_feval.cc
   gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_feval.h
Log:
Applied changeset r3699 on trunk to release branch.

Modified: 
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_feval.cc
===================================================================
--- gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_feval.cc    
2006-10-03 21:28:41 UTC (rev 3699)
+++ gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_feval.cc    
2006-10-03 21:30:01 UTC (rev 3700)
@@ -34,14 +34,6 @@
   return 0;
 }
 
-gr_feval_ff::~gr_feval_ff(){}
-
-float 
-gr_feval_ff::eval(float x)
-{
-  return 0;
-}
-
 gr_feval_cc::~gr_feval_cc(){}
 
 gr_complex
@@ -67,12 +59,6 @@
   return f->eval(x);
 }
 
-float
-gr_feval_ff_example(gr_feval_ff *f, float x)
-{
-  return f->eval(x);
-}
-
 gr_complex
 gr_feval_cc_example(gr_feval_cc *f, gr_complex x)
 {

Modified: 
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_feval.h
===================================================================
--- gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_feval.h     
2006-10-03 21:28:41 UTC (rev 3699)
+++ gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_feval.h     
2006-10-03 21:30:01 UTC (rev 3700)
@@ -45,26 +45,6 @@
 };
 
 /*!
- * \brief base class for evaluating a function: float -> float
- *
- * This class is designed to be subclassed in Python or C++
- * and is callable from both places.  It uses SWIG's
- * "director" feature to implement the magic.
- * It's slow. Don't use it in a performance critical path.
- */
-class gr_feval_ff
-{
-public:
-  gr_feval_ff() {}
-  virtual ~gr_feval_ff();
-
-  /*!
-   * \brief override this to define the function
-   */
-  virtual float eval(float x);
-};
-
-/*!
  * \brief base class for evaluating a function: complex -> complex
  *
  * This class is designed to be subclassed in Python or C++
@@ -108,7 +88,6 @@
  * \brief trivial examples / test cases showing C++ calling Python code
  */
 double     gr_feval_dd_example(gr_feval_dd *f, double x);
-float      gr_feval_ff_example(gr_feval_ff *f, float x);
 gr_complex gr_feval_cc_example(gr_feval_cc *f, gr_complex x);
 long       gr_feval_ll_example(gr_feval_ll *f, long x);