Merge pull request #68 from robinst/issue-67-ruby-2.3-build-error

robinst · robinst · commit d1ac9bf5ea57 · 2015-12-28T21:38:41.000+11:00
Fix compile error during gem installation on MRI 2.3 (#67)
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ rvm:
   - 1.8.7
   - 2.0.0
   - 2.1.1
+  - 2.3.0
 addons:
   apt:
     packages:
diff --git a/ext/taglib_aiff/taglib_aiff_wrap.cxx b/ext/taglib_aiff/taglib_aiff_wrap.cxx
@@ -1936,7 +1936,7 @@ TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
     return result;
   }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
-    VALUE e = RARRAY_PTR(ary)[i];
+    VALUE e = rb_ary_entry(ary, i);
     TagLib::String s = ruby_string_to_taglib_string(e);
     result.append(s);
   }
diff --git a/ext/taglib_base/includes.i b/ext/taglib_base/includes.i
@@ -81,7 +81,7 @@ TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
     return result;
   }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
-    VALUE e = RARRAY_PTR(ary)[i];
+    VALUE e = rb_ary_entry(ary, i);
     TagLib::String s = ruby_string_to_taglib_string(e);
     result.append(s);
   }
diff --git a/ext/taglib_base/taglib_base_wrap.cxx b/ext/taglib_base/taglib_base_wrap.cxx
@@ -1939,7 +1939,7 @@ TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
     return result;
   }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
-    VALUE e = RARRAY_PTR(ary)[i];
+    VALUE e = rb_ary_entry(ary, i);
     TagLib::String s = ruby_string_to_taglib_string(e);
     result.append(s);
   }
diff --git a/ext/taglib_flac/taglib_flac_wrap.cxx b/ext/taglib_flac/taglib_flac_wrap.cxx
@@ -1947,7 +1947,7 @@ TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
     return result;
   }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
-    VALUE e = RARRAY_PTR(ary)[i];
+    VALUE e = rb_ary_entry(ary, i);
     TagLib::String s = ruby_string_to_taglib_string(e);
     result.append(s);
   }
diff --git a/ext/taglib_id3v1/taglib_id3v1_wrap.cxx b/ext/taglib_id3v1/taglib_id3v1_wrap.cxx
@@ -1930,7 +1930,7 @@ TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
     return result;
   }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
-    VALUE e = RARRAY_PTR(ary)[i];
+    VALUE e = rb_ary_entry(ary, i);
     TagLib::String s = ruby_string_to_taglib_string(e);
     result.append(s);
   }
diff --git a/ext/taglib_id3v2/taglib_id3v2_wrap.cxx b/ext/taglib_id3v2/taglib_id3v2_wrap.cxx
@@ -1968,7 +1968,7 @@ TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
     return result;
   }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
-    VALUE e = RARRAY_PTR(ary)[i];
+    VALUE e = rb_ary_entry(ary, i);
     TagLib::String s = ruby_string_to_taglib_string(e);
     result.append(s);
   }
diff --git a/ext/taglib_mp4/taglib_mp4.i b/ext/taglib_mp4/taglib_mp4.i
@@ -44,7 +44,7 @@ TagLib::MP4::CoverArtList ruby_array_to_taglib_cover_art_list(VALUE ary) {
     return result;
   }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
-    VALUE e = RARRAY_PTR(ary)[i];
+    VALUE e = rb_ary_entry(ary, i);
     TagLib::MP4::CoverArt *c;
     SWIG_ConvertPtr(e, (void **) &c, SWIGTYPE_p_TagLib__MP4__CoverArt, 1);
     result.append(*c);
diff --git a/ext/taglib_mp4/taglib_mp4_wrap.cxx b/ext/taglib_mp4/taglib_mp4_wrap.cxx
@@ -1947,7 +1947,7 @@ TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
     return result;
   }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
-    VALUE e = RARRAY_PTR(ary)[i];
+    VALUE e = rb_ary_entry(ary, i);
     TagLib::String s = ruby_string_to_taglib_string(e);
     result.append(s);
   }
@@ -2027,7 +2027,7 @@ TagLib::MP4::CoverArtList ruby_array_to_taglib_cover_art_list(VALUE ary) {
     return result;
   }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
-    VALUE e = RARRAY_PTR(ary)[i];
+    VALUE e = rb_ary_entry(ary, i);
     TagLib::MP4::CoverArt *c;
     SWIG_ConvertPtr(e, (void **) &c, SWIGTYPE_p_TagLib__MP4__CoverArt, 1);
     result.append(*c);
diff --git a/ext/taglib_mpeg/taglib_mpeg_wrap.cxx b/ext/taglib_mpeg/taglib_mpeg_wrap.cxx
@@ -1947,7 +1947,7 @@ TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
     return result;
   }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
-    VALUE e = RARRAY_PTR(ary)[i];
+    VALUE e = rb_ary_entry(ary, i);
     TagLib::String s = ruby_string_to_taglib_string(e);
     result.append(s);
   }
diff --git a/ext/taglib_ogg/taglib_ogg_wrap.cxx b/ext/taglib_ogg/taglib_ogg_wrap.cxx
@@ -1934,7 +1934,7 @@ TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
     return result;
   }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
-    VALUE e = RARRAY_PTR(ary)[i];
+    VALUE e = rb_ary_entry(ary, i);
     TagLib::String s = ruby_string_to_taglib_string(e);
     result.append(s);
   }
diff --git a/ext/taglib_vorbis/taglib_vorbis_wrap.cxx b/ext/taglib_vorbis/taglib_vorbis_wrap.cxx
@@ -1938,7 +1938,7 @@ TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
     return result;
   }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
-    VALUE e = RARRAY_PTR(ary)[i];
+    VALUE e = rb_ary_entry(ary, i);
     TagLib::String s = ruby_string_to_taglib_string(e);
     result.append(s);
   }
diff --git a/ext/taglib_wav/taglib_wav_wrap.cxx b/ext/taglib_wav/taglib_wav_wrap.cxx
@@ -1936,7 +1936,7 @@ TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
     return result;
   }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
-    VALUE e = RARRAY_PTR(ary)[i];
+    VALUE e = rb_ary_entry(ary, i);
     TagLib::String s = ruby_string_to_taglib_string(e);
     result.append(s);
   }

-Original file line number
+Diff line change
   - 1.8.7
   - 2.0.0
   - 2.1.1
 +  - 2.3.0
 addons:
   apt:
     packages:
Original file line number	Diff line number	Diff line change
`@@ -1936,7 +1936,7 @@ TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {`
`1936`	`1936`	`return result;`
`1937`	`1937`	`}`
`1938`	`1938`	`for (long i = 0; i < RARRAY_LEN(ary); i++) {`
`1939`		`- VALUE e = RARRAY_PTR(ary)[i];`
	`1939`	`+ VALUE e = rb_ary_entry(ary, i);`
`1940`	`1940`	`TagLib::String s = ruby_string_to_taglib_string(e);`
`1941`	`1941`	`result.append(s);`
`1942`	`1942`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {`
`81`	`81`	`return result;`
`82`	`82`	`}`
`83`	`83`	`for (long i = 0; i < RARRAY_LEN(ary); i++) {`
`84`		`- VALUE e = RARRAY_PTR(ary)[i];`
	`84`	`+ VALUE e = rb_ary_entry(ary, i);`
`85`	`85`	`TagLib::String s = ruby_string_to_taglib_string(e);`
`86`	`86`	`result.append(s);`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1939,7 +1939,7 @@ TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {`
`1939`	`1939`	`return result;`
`1940`	`1940`	`}`
`1941`	`1941`	`for (long i = 0; i < RARRAY_LEN(ary); i++) {`
`1942`		`- VALUE e = RARRAY_PTR(ary)[i];`
	`1942`	`+ VALUE e = rb_ary_entry(ary, i);`
`1943`	`1943`	`TagLib::String s = ruby_string_to_taglib_string(e);`
`1944`	`1944`	`result.append(s);`
`1945`	`1945`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1947,7 +1947,7 @@ TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {`
`1947`	`1947`	`return result;`
`1948`	`1948`	`}`
`1949`	`1949`	`for (long i = 0; i < RARRAY_LEN(ary); i++) {`
`1950`		`- VALUE e = RARRAY_PTR(ary)[i];`
	`1950`	`+ VALUE e = rb_ary_entry(ary, i);`
`1951`	`1951`	`TagLib::String s = ruby_string_to_taglib_string(e);`
`1952`	`1952`	`result.append(s);`
`1953`	`1953`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1930,7 +1930,7 @@ TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {`
`1930`	`1930`	`return result;`
`1931`	`1931`	`}`
`1932`	`1932`	`for (long i = 0; i < RARRAY_LEN(ary); i++) {`
`1933`		`- VALUE e = RARRAY_PTR(ary)[i];`
	`1933`	`+ VALUE e = rb_ary_entry(ary, i);`
`1934`	`1934`	`TagLib::String s = ruby_string_to_taglib_string(e);`
`1935`	`1935`	`result.append(s);`
`1936`	`1936`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1968,7 +1968,7 @@ TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {`
`1968`	`1968`	`return result;`
`1969`	`1969`	`}`
`1970`	`1970`	`for (long i = 0; i < RARRAY_LEN(ary); i++) {`
`1971`		`- VALUE e = RARRAY_PTR(ary)[i];`
	`1971`	`+ VALUE e = rb_ary_entry(ary, i);`
`1972`	`1972`	`TagLib::String s = ruby_string_to_taglib_string(e);`
`1973`	`1973`	`result.append(s);`
`1974`	`1974`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ TagLib::MP4::CoverArtList ruby_array_to_taglib_cover_art_list(VALUE ary) {`
`44`	`44`	`return result;`
`45`	`45`	`}`
`46`	`46`	`for (long i = 0; i < RARRAY_LEN(ary); i++) {`
`47`		`- VALUE e = RARRAY_PTR(ary)[i];`
	`47`	`+ VALUE e = rb_ary_entry(ary, i);`
`48`	`48`	`TagLib::MP4::CoverArt *c;`
`49`	`49`	`SWIG_ConvertPtr(e, (void **) &c, SWIGTYPE_p_TagLib__MP4__CoverArt, 1);`
`50`	`50`	`result.append(*c);`