1.9 compatibility for Deque

Author: kanwei

ext/containers/deque/deque.c

@@ -198,10 +198,9 @@ static VALUE deque_init(int argc, VALUE *argv, VALUE self)
 	else {
 		ary = rb_check_array_type(argv[0]);
 		if(!NIL_P(ary)) {
-			deque *deque = get_deque_from_self(self);
-			len = RARRAY(ary)->len;
+			len = RARRAY_LEN(ary);
 			for (i = 0; i < len; i++) {
-				deque_push_back(self, RARRAY(ary)->ptr[i]);
+				deque_push_back(self, RARRAY_PTR(ary)[i]);
 			}
 		}
 	}

spec/deque_spec.rb

@@ -104,5 +104,5 @@
     end
     it_should_behave_like "(non-empty deque)"
   end
-rescue NameError
+rescue Exception
 end

spec/rb_tree_map_spec.rb

@@ -34,8 +34,7 @@
 describe "non-empty rbtree", :shared => true do
   before(:each) do
     @num_items = 1000
-    @random_array = []
-    @num_items.times { @random_array << rand(@num_items) }
+    @random_array = Array.new(@num_items) { rand(@num_items) }
     @random_array.each { |x| @tree[x] = x }
   end
 
@@ -120,5 +119,5 @@
     end
     it_should_behave_like "non-empty rbtree"
   end
-rescue NameError
+rescue Exception
 end