resolve merge conflicts

Author: cowboyd

ext/v8/object.cc

@@ -27,7 +27,7 @@ namespace rr {
     Locker lock(isolate);
 
     if (rb_obj_is_kind_of(key, rb_cNumeric)) {
-      return Bool::Maybe(object->Set(context, UInt32_t(key), Value::rubyObjectToHandle(isolate, value)));
+      return Bool::Maybe(object->Set(context, Uint32_t(key), Value::rubyObjectToHandle(isolate, value)));
     } else {
       return Bool::Maybe(object->Set(context, *Value(key), Value::rubyObjectToHandle(isolate, value)));
     }
@@ -40,7 +40,7 @@ namespace rr {
     Locker lock(isolate);
 
     if (rb_obj_is_kind_of(key, rb_cNumeric)) {
-      return Value::Maybe(isolate, object->Get(context, UInt32_t(key)));
+      return Value::Maybe(isolate, object->Get(context, Uint32_t(key)));
     } else {
       return Value::Maybe(isolate, object->Get(context, *Value(key)));
     }

spec/c/function_spec.rb

@@ -26,7 +26,7 @@
 
     expect(@ctx.Global.Get(@ctx, V8::C::String.NewFromUtf8(@isolate, 'one')).FromJust()).to eq one
     expect(@ctx.Global.Get(@ctx, V8::C::String.NewFromUtf8(@isolate, 'two')).FromJust()).to eq two
-    expect(@ctx.Global.Get(@ctx, V8::C::String.NewFromUtf8(@isolate, 'three')).FromJust()).to eq 3
+    expect(@ctx.Global.Get(@ctx, V8::C::String.NewFromUtf8(@isolate, 'three')).FromJust().Value()).to eq 3
   end
 
   it 'can be called as a constructor' do