Use new enums to replace deprecated forward and backward

mvz · Dec 20, 2013 · fe7643c · fe7643c
1 parent f8caec5
commit fe7643c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/ext/fft.c b/ext/fft.c
@@ -907,10 +907,10 @@ void Init_gsl_fft(VALUE module)
 
   /*****/
 
-  rb_define_const(mgsl_fft, "Forward", INT2FIX(forward));
-  rb_define_const(mgsl_fft, "FORWARD", INT2FIX(forward));
-  rb_define_const(mgsl_fft, "Backward", INT2FIX(backward));
-  rb_define_const(mgsl_fft, "BACKWARD", INT2FIX(backward));
+  rb_define_const(mgsl_fft, "Forward", INT2FIX(gsl_fft_forward));
+  rb_define_const(mgsl_fft, "FORWARD", INT2FIX(gsl_fft_forward));
+  rb_define_const(mgsl_fft, "Backward", INT2FIX(gsl_fft_backward));
+  rb_define_const(mgsl_fft, "BACKWARD", INT2FIX(gsl_fft_backward));
 
   /* Transforms for complex vectors */
   rb_define_method(cgsl_vector_complex, "radix2_forward", 

diff --git a/ext/wavelet.c b/ext/wavelet.c
@@ -152,10 +152,10 @@ static void rb_gsl_wavelet_define_const(VALUE klass)
   rb_define_const(klass, "BSPLINE", INT2FIX(GSL_WAVELET_BSPLINE));
   rb_define_const(klass, "BSPLINE_CENTERED", INT2FIX(GSL_WAVELET_BSPLINE_CENTERED));
   /*****/
-  rb_define_const(klass, "FORWARD", INT2FIX(forward));
-  rb_define_const(klass, "Forward", INT2FIX(forward));
-  rb_define_const(klass, "BACKWARD", INT2FIX(backward));
-  rb_define_const(klass, "Backward", INT2FIX(backward));
+  rb_define_const(klass, "FORWARD", INT2FIX(gsl_wavelet_forward));
+  rb_define_const(klass, "Forward", INT2FIX(gsl_wavelet_forward));
+  rb_define_const(klass, "BACKWARD", INT2FIX(gsl_wavelet_backward));
+  rb_define_const(klass, "Backward", INT2FIX(gsl_wavelet_backward));
 }
 
 static VALUE rb_gsl_wavelet_name(VALUE ww)
@@ -191,7 +191,7 @@ static VALUE rb_gsl_wavelet_transform0(int argc, VALUE *argv, VALUE obj,
 {
   gsl_wavelet *w = NULL;
   gsl_vector *v = NULL, *vnew;
-  gsl_wavelet_direction dir = forward;
+  gsl_wavelet_direction dir = gsl_wavelet_forward;
   gsl_wavelet_workspace *work = NULL;
   int itmp, flag = 0;
   // local variable "status" declared and set, but never used
@@ -531,7 +531,7 @@ static VALUE rb_gsl_wavelet2d(int argc, VALUE *argv, VALUE obj,
 {
   gsl_wavelet *w = NULL;
   gsl_matrix *m = NULL, *mnew;
-  gsl_wavelet_direction dir = forward;
+  gsl_wavelet_direction dir = gsl_wavelet_forward;
   gsl_wavelet_workspace *work = NULL;
   VALUE ary, ret;
   int itmp, flag = 0;