rb-gsl 1.15.3.1 → 1.15.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d0a4a08782d4daa47a3ebdff807ad6b354116bb
-  data.tar.gz: 0f367375af61e42b676b9366b77a4742382ced5c
+  metadata.gz: c2881407d92b5a79d9a59dcef18de757e3b9bc52
+  data.tar.gz: f1c89f8bb663d1c65588d0254575fced093e6b2e
 SHA512:
-  metadata.gz: ad021812eefcfec38ef757de79a9f3c59262397b520d73f91d971f7cbb2865bc30e2aaa7b720a52f30a138d68a4d24175451731dd16b7d720cba3f4125d923ae
-  data.tar.gz: fe016c18cce8b11606ea69ba1cf4a342f541c0add47d22d14525b2b8411418f3927ded1dc8e366b59adba478db71ffedcd0f9a1e8d6a05cb30717a9dcb9018c5
+  metadata.gz: cbe15cdc58dc7e040309e91862b568eb3bd3144da086c9042867e80cf6a2da1a154ba125186dbaea39ce21f8f0a3dae50709b8dd24a4e287dbdddff44f247ddc
+  data.tar.gz: ee64e214328c06f4264adbfc254d408d46261050d3be142bf76bb8bf9e3a4ec6dacda77536634a20ec33d57b9288156ef5920fba4eb22f9c61d1d6cbfd3df3d6

data/AUTHORS

@@ -2,5 +2,5 @@ Yoshiki Tsunesada
   y-tsunesada@mm.em-net.ne.jp
 David MacMahon
   davidm@astro.berkeley.edu
-
-
+Jens Wille
+  jens.wille@gmail.com

data/ChangeLog

@@ -1,3 +1,11 @@
+Fri Jan 24 14:16:30 CET 2014
+  * Ruby/GSL 1.15.3.2
+	  * Windows compatibility.
+	  * Ruby 2.x compatibility.
+	  * Ported tests to Test::Unit.
+		* Silenced compilation warnings.
+		* Switched to rake-compiler for compilation.
+
 Sat Feb 26 08:18:45 PST 2011
   * Ruby/GSL 1.14.7
     * Fix conversion of non-DFLOAT NArray to GSL::Vector and

data/Rakefile

@@ -1,99 +1,42 @@
-require 'rubygems'
-require 'rubygems/package_task'
-require 'rdoc/task'
-
 RB_GSL_VERSION = File.readlines('VERSION')[0].chomp
 
-spec = Gem::Specification.new do |s|
-  # Basics
-  s.name = 'rb-gsl'
-  s.version = RB_GSL_VERSION + '.1'
-  s.summary = 'Ruby interface to GNU Scientific Library'
-  s.description = 'Ruby/GSL is a Ruby interface to the GNU Scientific Library, for numerical computing with Ruby'
-  #s.platform = Gem::Platform::Ruby
-  s.required_ruby_version = '>= 1.8.1'
-  s.requirements << 'GSL (http://www.gnu.org/software/gsl/)'
-  # plotlib?
-  s.add_dependency('narray', '>= 0.5.9')
-
-  # About
-  s.authors = ['Yoshiki Tsunesada', 'David MacMahon']
-  s.email = 'y-tsunesada@mm.em-net.ne.jp'
-  s.homepage = 'http://rb-gsl.rubyforge.org/'
-  s.rubyforge_project = 'rb-gsl' 
-
-  # Files, Libraries, and Extensions
-  s.files = FileList[
-    'AUTHORS',
-    'COPYING',
-    'ChangeLog',
-    'README',
-    'Rakefile',
-    'setup.rb',
-    'THANKS',
-    'VERSION',
-    'examples/**/*',
-    'ext/extconf.rb',
-    'ext/*.c',
-    'lib/**/*',
-    'include/*',
-    'rdoc/*',
-    'tests/**/*'
-  ].to_a
-  s.require_paths = ['lib', 'lib/gsl', 'lib/ool', 'ext']
-  #s.autorequire = nil
-  #s.bindir = 'bin'
-  #s.executables = []
-  #s.default_executable = nil
-
-  # C compilation
-  s.extensions = %w[ ext/extconf.rb ]
-
-  # Documentation
-  s.has_rdoc = true
-  s.rdoc_options = [
-    '--title', 'Ruby/GSL',
-    '--main', 'rdoc/index.rdoc',
-    '--exclude', 'ext/',
-    '--exclude', 'include/',
-    '--exclude', 'lib/',
-  ]
-  s.extra_rdoc_files = FileList['rdoc/*'].to_a
-
-  # Testing TODO
-  #s.test_files = []
-end
-
-Rake::PackageTask.new('rb-gsl', RB_GSL_VERSION) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
-  pkg.package_files = spec.files
-end
-
-Gem::PackageTask.new(spec) do |pkg|
-  pkg.need_zip = false
-  pkg.need_tar = false
-end
-
-task :default => [:package, :gem]
-
-# --------------------------------------------------------------------
-# Create a task to build the RDOC documentation tree.
-
-desc "Create the RDoc html files"
-Rake::RDocTask.new("rdoc") { |rdoc|
-  rdoc.rdoc_dir = 'html'
-  rdoc.title    = 'Ruby/GSL'
-  rdoc.main     = 'rdoc/index.rdoc'
-  rdoc.options << '--exclude' << 'ext/'
-  rdoc.options << '--exclude' << 'include/'
-  rdoc.options << '--exclude' << 'lib/'
-  rdoc.rdoc_files.include('rdoc/*.rdoc')
-}
-
-desc "Publish the RDoc files on RubyForge"
-task :pub_rdoc => ["html/index.html"] do
-  mkdir_p "emptydir"
-  sh "scp -rq html/* www.rubyforge.org:/var/www/gforge-projects/rb-gsl/."
-  rm_r "emptydir"
+begin
+  require 'hen'
+
+  Hen.lay! {{
+    :gem => {
+      :name          => %q{rb-gsl},
+      :version       => RB_GSL_VERSION,
+      :summary       => %q{Ruby interface to the GNU Scientific Library [Ruby 2.x compatible fork]},
+      :description   => %q{Ruby/GSL is a Ruby interface to the GNU Scientific Library, for numerical computing with Ruby},
+      :authors       => ['Yoshiki Tsunesada', 'David MacMahon', 'Jens Wille'],
+      :email         => %q{jens.wille@gmail.com},
+      :license       => %q{GPL-2.0},
+      :homepage      => :blackwinter,
+      :dependencies  => [['narray', '>= 0.5.9']],
+      :requirements  => ['GSL (http://www.gnu.org/software/gsl/)'],
+      :require_paths => %w[lib lib/gsl lib/ool ext],
+
+      :extra_files => FileList['examples/**/*', 'include/*', 'rdoc/*'].to_a,
+
+      :extension => {
+        :lib_dir => 'lib',
+        :ext_dir => 'ext',
+        :cross_compile => false
+      },
+
+      :required_ruby_version => '>= 1.8.1'
+    },
+    :rdoc => {
+      :title      => 'Ruby/GSL{version: (v%s)}',
+      :rdoc_files => FileList['rdoc/*'].to_a,
+      :exclude    => %w[ext include lib],
+      :main       => 'rdoc/index.rdoc'
+    },
+    :test => {
+      :libs => %w[lib test]
+    }
+  }}
+rescue LoadError => err
+  warn "Please install the `hen' gem. (#{err})"
 end

data/VERSION

@@ -1 +1 @@
-1.15.3
+1.15.3.2

data/ext/array.c

@@ -487,7 +487,7 @@ VALUE rb_gsl_range2vector(VALUE obj)
 	     rb_class2name(CLASS_OF(obj)));
   get_range_beg_en_n(obj, &beg, &en, &n, &step);
   v = gsl_vector_alloc(n);
-  for (i = 0; i < n; i++) gsl_vector_set(v, i, (double) (beg+i));
+  for (i = 0; i < (int) n; i++) gsl_vector_set(v, i, (double) (beg+i));
   return Data_Wrap_Struct(cgsl_vector, 0, gsl_vector_free, v);
 }
 
@@ -502,7 +502,7 @@ VALUE rb_gsl_range2vector_int(VALUE obj)
 	     rb_class2name(CLASS_OF(obj)));
   get_range_int_beg_en_n(obj, &beg, &en, &n, &step);
   v = gsl_vector_int_alloc(n);
-  for (i = 0; i < n; i++) gsl_vector_int_set(v, i, beg+i);
+  for (i = 0; i < (int) n; i++) gsl_vector_int_set(v, i, beg+i);
   return Data_Wrap_Struct(cgsl_vector_int, 0, gsl_vector_int_free, v);
 }
 

data/ext/block_source.c

@@ -230,7 +230,7 @@ static VALUE FUNCTION(rb_gsl_block,get)(int argc, VALUE *argv, VALUE obj)
     break;
   default:
     bnew = FUNCTION(gsl_block,alloc)(argc);
-    for (j = 0; j < argc; j++) {
+    for (j = 0; (int) j < argc; j++) {
       i = FIX2INT(argv[j]);
       if (i < 0) k = b->size + i; else k = i;
       bnew->data[j] = b->data[k];

data/ext/dirac.c

@@ -338,7 +338,7 @@ static VALUE rb_Dirac_matrix_whoami(int argc, VALUE *argv, VALUE obj)
 		      VLambda[0], VLambda[1], VLambda[2], VLambda[3],
 		      VLambda[4], VLambda[5], VLambda[6], VLambda[7]};
 
-  char *name[NUM] = {"Pauli1", "Pauli2", "Pauli3", 
+  const char *name[NUM] = {"Pauli1", "Pauli2", "Pauli3", 
 		     "Gamma0", "Gamma1", "Gamma2", "Gamma3", "Gamma5",
 		     "Eye2", "Eye4", "IEye2", "IEye4", "Lambda1", "Lambda2",
 		     "Lambda3", "Lambda4", "Lambda5", "Lambda6",

data/ext/eigen.c

@@ -1060,8 +1060,8 @@ static VALUE rb_gsl_eigen_nonsymmv_narray(int argc, VALUE *argv, VALUE obj);
 static VALUE rb_gsl_eigen_nonsymmv(int argc, VALUE *argv, VALUE obj)
 {
   gsl_matrix *m;
-  gsl_vector_complex *v;
-  gsl_matrix_complex *evec;
+  gsl_vector_complex *v = NULL;
+  gsl_matrix_complex *evec = NULL;
   gsl_eigen_nonsymmv_workspace *w;
   int vflag = 0, wflag = 0;
   int istart = 0;
@@ -1196,9 +1196,9 @@ static VALUE rb_gsl_eigen_nonsymmv_narray(int argc, VALUE *argv, VALUE obj)
 
 static VALUE rb_gsl_eigen_nonsymmv_Z(int argc, VALUE *argv, VALUE obj)
 {
-  gsl_matrix *m, *Z;
-  gsl_vector_complex *v;
-  gsl_matrix_complex *evec;
+  gsl_matrix *m, *Z = NULL;
+  gsl_vector_complex *v = NULL;
+  gsl_matrix_complex *evec = NULL;
   gsl_eigen_nonsymmv_workspace *w;
   int vflag = 0, wflag = 0;
   int istart = 0;
@@ -1571,7 +1571,7 @@ static VALUE rb_gsl_eigen_gensymm(int argc, VALUE *argv, VALUE obj)
 	gsl_vector *eval = NULL;
 	gsl_eigen_gensymm_workspace *w = NULL;
 	int flag;
-	VALUE veval;
+	VALUE veval = NULL;
 	flag = check_argv_gensymm(argc, argv, obj, &A, &B, &eval, &w);
   Atmp = make_matrix_clone(A);
 //  Btmp = make_matrix_clone(B);  
@@ -1606,7 +1606,7 @@ static VALUE rb_gsl_eigen_gensymmv(int argc, VALUE *argv, VALUE obj)
 	gsl_matrix *evec = NULL;
 	gsl_eigen_gensymmv_workspace *w = NULL;
 	int flag;
-	VALUE veval, vevec;
+	VALUE veval = NULL, vevec = NULL;
 	flag = check_argv_gensymmv(argc, argv, obj, &A, &B, &eval, &evec, &w);
   Atmp = make_matrix_clone(A);
 //  Btmp = make_matrix_clone(B);  	
@@ -1645,7 +1645,7 @@ static VALUE rb_gsl_eigen_genherm(int argc, VALUE *argv, VALUE obj)
 	gsl_vector *eval = NULL;
 	gsl_eigen_genherm_workspace *w = NULL;
 	int flag;
-	VALUE veval;
+	VALUE veval = NULL;
 	flag = check_argv_genherm(argc, argv, obj, &A, &B, &eval, &w);
   Atmp = make_matrix_complex_clone(A);
   Btmp = make_matrix_complex_clone(B);  
@@ -1680,7 +1680,7 @@ static VALUE rb_gsl_eigen_genhermv(int argc, VALUE *argv, VALUE obj)
 	gsl_matrix_complex *evec = NULL;
 	gsl_eigen_genhermv_workspace *w = NULL;
 	int flag;
-	VALUE veval, vevec;
+	VALUE veval = NULL, vevec = NULL;
 	flag = check_argv_genhermv(argc, argv, obj, &A, &B, &eval, &evec, &w);
   Atmp = make_matrix_complex_clone(A);
   Btmp = make_matrix_complex_clone(B);  	
@@ -1833,7 +1833,7 @@ static VALUE rb_gsl_eigen_gen(int argc, VALUE *argv, VALUE obj)
 	gsl_vector *beta = NULL;
 	gsl_eigen_gen_workspace *w = NULL;
 	int flag;
-	VALUE valpha, vbeta;
+	VALUE valpha = NULL, vbeta = NULL;
 	flag = check_argv_gen(argc, argv, obj, &A, &B, &alpha, &beta, &w);
 //  Atmp = make_matrix_clone(A);
 //  Btmp = make_matrix_clone(B);  	
@@ -1874,7 +1874,7 @@ static VALUE rb_gsl_eigen_gen_QZ(int argc, VALUE *argv, VALUE obj)
 	gsl_matrix *Q, *Z;
 	gsl_eigen_gen_workspace *w = NULL;
 	int flag;
-	VALUE valpha, vbeta, vQ, vZ;
+	VALUE valpha = NULL, vbeta = NULL, vQ, vZ;
 	flag = check_argv_gen(argc, argv, obj, &A, &B, &alpha, &beta, &w);
 /*  Atmp = make_matrix_clone(A);
   Btmp = make_matrix_clone(B);  	*/
@@ -1987,7 +1987,7 @@ static VALUE rb_gsl_eigen_genv(int argc, VALUE *argv, VALUE obj)
 	gsl_matrix_complex *evec = NULL;
 	gsl_eigen_genv_workspace *w = NULL;
 	int flag;
-	VALUE valpha, vbeta, vevec;
+	VALUE valpha = NULL, vbeta = NULL, vevec = NULL;
 	flag = check_argv_genv(argc, argv, obj, &A, &B, &alpha, &beta, &evec, &w);
 //  Atmp = make_matrix_clone(A);
 //  Btmp = make_matrix_clone(B);  	
@@ -2035,7 +2035,7 @@ static VALUE rb_gsl_eigen_genv_QZ(int argc, VALUE *argv, VALUE obj)
 	gsl_matrix *Q, *Z;
 	gsl_eigen_genv_workspace *w = NULL;
 	int flag;
-	VALUE valpha, vbeta, vevec, vQ, vZ;
+	VALUE valpha = NULL, vbeta = NULL, vevec = NULL, vQ, vZ;
 	flag = check_argv_genv(argc, argv, obj, &A, &B, &alpha, &beta, &evec, &w);
 /*  Atmp = make_matrix_clone(A);
   Btmp = make_matrix_clone(B);  	*/

data/ext/extconf.rb

@@ -125,7 +125,7 @@ def check_version(configfile)
       configfile.printf("#ifndef GSL_1_11_LATER\n#define GSL_1_11_LATER\n#endif\n")
     end    
 
-   if ver >= "1.12.90"
+    if ver >= "1.12.90"
       configfile.printf("#ifndef GSL_1_13_LATER\n#define GSL_1_13_LATER\n#endif\n")
     end
 
@@ -140,13 +140,17 @@ def check_version(configfile)
   end
 end
 
+def file_path(path = '.')
+  File.expand_path(path, File.dirname(__FILE__))
+end
+
 #####
 
 $CFLAGS ||= ''
-$CFLAGS += " -Wall -I../include "
+$CFLAGS += " -Wall -I#{file_path('../include')} "
 
 begin
-  RB_GSL_CONFIG = File.open("../include/rb_gsl_config.h", "w")
+  RB_GSL_CONFIG = File.open(file_path("../include/rb_gsl_config.h"), "w")
   RB_GSL_CONFIG.printf("#ifndef ___RB_GSL_CONFIG_H___\n")
   RB_GSL_CONFIG.printf("#define ___RB_GSL_CONFIG_H___\n\n")
 
@@ -202,7 +206,7 @@ begin
   
   begin
     print("checking rb-gsl version...")
-    File.open("../VERSION") do |f|
+    File.open(file_path("../VERSION")) do |f|
       ver = GSL::Version.new(f.gets.chomp)
       puts(ver)
       RB_GSL_CONFIG.printf("#ifndef RUBY_GSL_VERSION\n#define RUBY_GSL_VERSION \"#{ver}\"\n#endif\n")
@@ -223,7 +227,7 @@ begin
     flag = 0
     print("checking for GNU graph... ")
     path.each do |dir|    
-      if File.executable?(file = File.join(dir, "graph")) 
+      if File.executable?(File.join(dir, "graph")) 
         puts("yes")
         RB_GSL_CONFIG.printf("#ifndef HAVE_GNU_GRAPH\n#define HAVE_GNU_GRAPH\n#endif\n")
         flag = 1
@@ -254,8 +258,8 @@ begin
   require 'rubygems'
   na_gemspec=Gem::Specification.find_by_path('narray.h')
   if na_gemspec
-    narray_config = File.join(na_gemspec.full_gem_path, na_gemspec.require_path)
-    $CPPFLAGS = " -I#{narray_config} "+$CPPFLAGS
+    narray_config = na_gemspec.full_gem_path
+    $CPPFLAGS = " -I#{File.join(narray_config, na_gemspec.require_path)} "+$CPPFLAGS
     $LOCAL_LIBS = " -L#{File.join(narray_config, 'src')}" + $LOCAL_LIBS
   end
 rescue LoadError
@@ -268,9 +272,9 @@ if narray_config
   end
 end
 
-if enable_config('tamu_anova')
+unless arg_config('--disable-tamu-anova')
 tamu_anova_config = dir_config('tamu_anova',$sitearchdir,$sitearchdir)
-have_tamu_anova_h = have_header("tamu_anova/tamu_anova.h")
+have_header("tamu_anova/tamu_anova.h")
 if tamu_anova_config
   have_library("tamuanova")
 #  if RUBY_PLATFORM =~ /cygwin|mingw/
@@ -279,7 +283,7 @@ if tamu_anova_config
 end
 end
 
-File.open("../lib/gsl.rb", "w") do |file|
+File.open(file_path("../lib/gsl.rb"), "w") do |file|
   if have_narray_h
     file.print("require('narray')\n")
   end
@@ -288,7 +292,7 @@ File.open("../lib/gsl.rb", "w") do |file|
   file.print("require('gsl/oper.rb')\n")
 end
 
-File.open("../lib/rbgsl.rb", "w") do |file|
+File.open(file_path("../lib/rbgsl.rb"), "w") do |file|
   if have_narray_h
     file.print("require('narray')\n")
   end
@@ -296,8 +300,10 @@ File.open("../lib/rbgsl.rb", "w") do |file|
   file.print("require('gsl/oper.rb')\n")
 end
 
+Dir.chdir(file_path) {
 srcs = Dir.glob("*.c") - ["vector_source.c", "matrix_source.c", "tensor_source.c", "poly_source.c", "block_source.c"]
 
 $objs = srcs.collect { |f| f.sub(".c", ".o") }
+}
 
 create_makefile("rb_gsl")

data/ext/function.c

@@ -52,7 +52,7 @@ static VALUE rb_gsl_function_set_f(int argc, VALUE *argv, VALUE obj)
     CHECK_PROC(argv[0]);
     rb_ary_store(ary, 0, argv[0]);
     ary2 = rb_ary_new2(argc-1);
-    for (i = 1; i < argc; i++) rb_ary_store(ary2, i-1, argv[i]);
+    for (i = 1; (int) i < argc; i++) rb_ary_store(ary2, i-1, argv[i]);
     rb_ary_store(ary, 1, ary2);
     break;
   }
@@ -221,7 +221,7 @@ static VALUE rb_gsl_function_set_params(int argc, VALUE *argv, VALUE obj)
     rb_ary_store(ary, 1, argv[0]);
   } else {
     ary2 = rb_ary_new2(argc);
-    for (i = 0; i < argc; i++) rb_ary_store(ary2, i, argv[i]);
+    for (i = 0; (int) i < argc; i++) rb_ary_store(ary2, i, argv[i]);
     rb_ary_store(ary, 1, ary2);
   }
   return obj;
@@ -337,7 +337,7 @@ static VALUE rb_gsl_function_fdf_new(int argc, VALUE *argv, VALUE klass)
   F->params = (void *) ary;
   rb_ary_store(ary, 2, Qnil);
   rb_ary_store(ary, 3, Qnil);
-  for (i = 0; i < argc; i++) setfunc(i, argv, F);
+  for (i = 0; (int) i < argc; i++) setfunc(i, argv, F);
   return Data_Wrap_Struct(klass, gsl_function_fdf_mark, gsl_function_fdf_free, F);
 }
 
@@ -360,7 +360,7 @@ static VALUE rb_gsl_function_fdf_set(int argc, VALUE *argv, VALUE obj)
   ary = (VALUE) F->params;
   rb_ary_store(ary, 2, Qnil);
   rb_ary_store(ary, 3, Qnil);
-  for (i = 0; i < argc; i++) setfunc(i, argv, F);
+  for (i = 0; (int) i < argc; i++) setfunc(i, argv, F);
   return obj;
 }
 
@@ -427,7 +427,7 @@ static VALUE rb_gsl_function_fdf_set_params(int argc, VALUE *argv, VALUE obj)
     rb_ary_store(ary, 3, argv[0]);
   } else {
     ary2 = rb_ary_new2(argc);
-    for (i = 0; i < argc; i++) rb_ary_store(ary2, i, argv[i]);
+    for (i = 0; (int) i < argc; i++) rb_ary_store(ary2, i, argv[i]);
     rb_ary_store(ary, 3, ary2);
   }
   return obj;

data/ext/gsl_narray.c

@@ -31,7 +31,7 @@ static VALUE rb_gsl_vector_to_narray(VALUE obj, VALUE klass)
     memcpy(NA_PTR_TYPE(nary,double*), v->data, shape[0]*sizeof(double));
   } else {
     int i;
-    for(i=0; i < v->size; i++) {
+    for(i=0; i < (int) v->size; i++) {
       (NA_PTR_TYPE(nary,double*))[i] = gsl_vector_get(v, i);
     }
   }
@@ -50,7 +50,7 @@ static VALUE rb_gsl_vector_complex_to_narray(VALUE obj, VALUE klass)
     memcpy(NA_PTR_TYPE(nary,double*), v->data, shape[0]*2*sizeof(double));
   } else {
     int i;
-    for(i=0; i < 2*v->size; i++) {
+    for(i=0; i < (int) (2*v->size); i++) {
       (NA_PTR_TYPE(nary,gsl_complex*))[i] = gsl_vector_complex_get(v, i);
     }
   }
@@ -170,7 +170,7 @@ static VALUE rb_gsl_vector_int_to_narray(VALUE obj, VALUE klass)
     memcpy(NA_PTR_TYPE(nary,int*), v->data, shape[0]*sizeof(int));
   } else {
     int i;
-    for(i=0; i < v->size; i++) {
+    for(i=0; i < (int) v->size; i++) {
       (NA_PTR_TYPE(nary,int*))[i] = gsl_vector_int_get(v, i);
     }
   }
@@ -357,7 +357,7 @@ static VALUE rb_gsl_matrix_to_narray(VALUE obj, VALUE klass)
   shape[0] = m->size2;
   shape[1] = m->size1;
   nary = na_make_object(NA_DFLOAT, 2, shape, klass);
-  for (i = 0; i < shape[1]; i++) {
+  for (i = 0; (int) i < shape[1]; i++) {
     memcpy(NA_PTR_TYPE(nary,double*)+(i*shape[0]), m->data+(i*m->tda), 
            shape[0]*sizeof(double));
   }
@@ -384,7 +384,7 @@ static VALUE rb_gsl_matrix_int_to_narray(VALUE obj, VALUE klass)
   shape[0] = m->size2;
   shape[1] = m->size1;
   nary = na_make_object(NA_LINT, 2, shape, klass);
-  for (i = 0; i < shape[1]; i++) {
+  for (i = 0; (int) i < shape[1]; i++) {
     memcpy(NA_PTR_TYPE(nary,int*)+(i*shape[0]), m->data+(i*m->tda), 
            shape[0]*sizeof(int));
   }
@@ -583,7 +583,7 @@ EXTERN VALUE cgsl_histogram;
 static VALUE rb_gsl_narray_histogram(int argc, VALUE *argv, VALUE obj)
 {
   double *ptr, *ptr_range;
-  gsl_histogram *h;
+  gsl_histogram *h = NULL;
   gsl_vector *ranges;
   gsl_vector_view v;
   double min, max;