narray_ffi 0.3 → 0.4

data/ext/narray_ffi_c/extconf.rb

@@ -23,23 +23,4 @@ unless have_header("narray.h")
   end
 end
 
-dir_config("ffi", conf["archdir"])
-unless have_header("Pointer.h")
-  begin
-    require "rubygems"
-    if spec = Gem::Specification.find_all_by_name("ffi").last
-      spec.require_paths.each { |path|
-        $CPPFLAGS = "-I" << spec.full_gem_path << "/" << path << "/ " << $CPPFLAGS
-        $CPPFLAGS = "-I" << spec.full_gem_path << "/" << path << "/" << "libffi-x86_64-linux/include/ " << $CPPFLAGS
-      }
-    end
-  rescue LoadError
-  end
-  puts $CPPFLAGS
-  unless have_header("Pointer.h")
-    abort "missing ffi Pointer.h" unless have_header("Pointer.h")
-  end
-end
-
-
 create_makefile("narray_ffi_c")

data/ext/narray_ffi_c/narray_ffi.c

@@ -1,14 +1,15 @@
 #include "ruby.h"
 #include "narray.h"
-#include "Pointer.h"
 
-VALUE na_to_pointer(VALUE self) {
+VALUE na_address(VALUE self) {
   struct NARRAY *ary;
   void * ptr;
+  VALUE ret;
 
   GetNArray(self,ary);
   ptr = ary->ptr;
-  return rbffi_Pointer_NewInstance(ptr);
+  ret = ULL2NUM( (unsigned long long int) ptr);
+  return ret;
 }
 
 void Init_narray_ffi_c() {
@@ -16,6 +17,6 @@ void Init_narray_ffi_c() {
   VALUE klass;
   id = rb_intern("NArray");
   klass = rb_const_get(rb_cObject, id);
-  rb_define_method(klass, "to_ptr", na_to_pointer, 0);
+  rb_define_private_method(klass, "address", na_address, 0);
 }
 

data/lib/narray_ffi.rb

@@ -1,3 +1,9 @@
 require "narray"
 require "ffi"
 require "narray_ffi_c.so"
+
+class NArray
+  def to_ptr
+    return FFI::Pointer::new( address() )
+  end
+end

data/narray_ffi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'narray_ffi'
-  s.version = "0.3"
+  s.version = "0.4"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://forge.imag.fr/projects/opencl-ruby/"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: narray_ffi
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-23 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray