ext/octave_api/or-array.cpp in octave-ruby-1.0.9 vs ext/octave_api/or-array.cpp in octave-ruby-2.0.0

@@ -4,30 +4,30 @@
 OR_Array::~OR_Array() {}
 
 octave_value OR_Array::to_octave()
 {
   int row_index;
-  int number_of_rows = RARRAY(ruby_val)->len;
+  int number_of_rows = RARRAY_LEN(ruby_val);
   VALUE cell;
   
   if (should_convert_to_cell_matrix()) {
     Cell matrix = Cell(number_of_rows, 1);
     
     for (row_index = 0; row_index < number_of_rows; row_index++) {
-      cell = RARRAY(ruby_val)->ptr[row_index];
+      cell = RARRAY_PTR(ruby_val)[row_index];
       matrix(row_index, 0) = OR_Variable(cell).to_octave();
     }
     
     return matrix;
   } else {
     Matrix matrix = Matrix(number_of_rows, 1);
     
     for (row_index = 0; row_index < number_of_rows; row_index++) {
-      cell = RARRAY(ruby_val)->ptr[row_index];
+      cell = RARRAY_PTR(ruby_val)[row_index];
 
       if (rb_type(cell) == T_FLOAT) {
-        matrix(row_index, 0) = RFLOAT(cell)->value;
+        matrix(row_index, 0) = RFLOAT_VALUE(cell);
       } else if (rb_type(cell) == T_FIXNUM) {
         matrix(row_index, 0) = FIX2LONG(cell);
       } else {
         matrix(row_index, 0) = octave_NaN;
       }
@@ -40,13 +40,13 @@
 bool OR_Array::should_convert_to_cell_matrix()
 {
   int row_index;
   VALUE value;
   VALUE type;
-  int number_of_rows = RARRAY(ruby_val)->len;
+  int number_of_rows = RARRAY_LEN(ruby_val);
 
   for (row_index = 0; row_index < number_of_rows; row_index++) {
-    value = RARRAY(ruby_val)->ptr[row_index];
+    value = RARRAY_PTR(ruby_val)[row_index];
     type = rb_type(value);
     if (type != T_FLOAT && type != T_FIXNUM && value != Qnil) {
       return true;
     }
   }