Skip to content

Commit e9cd8f7

Browse files
robinstrobinst
committed
Regenerate SWIG wrappers using swig 3.0.7
Compiled against TagLib 1.7.2.
1 parent d03a5dd commit e9cd8f7

File tree

10 files changed

+522
-307
lines changed

10 files changed

+522
-307
lines changed

‎ext/taglib_aiff/taglib_aiff_wrap.cxx‎

Lines changed: 47 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* ----------------------------------------------------------------------------
22
* This file was automatically generated by SWIG (http://www.swig.org).
3-
* Version 2.0.12
3+
* Version 3.0.7
44
*
55
* This file is not intended to be easily readable and contains a number of
66
* coding conventions designed to improve portability and efficiency. Do not make
@@ -145,6 +145,19 @@ template <typename T> T SwigValueInit() {
145145
# define _SCL_SECURE_NO_DEPRECATE
146146
#endif
147147

148+
/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */
149+
#if defined(__APPLE__) && !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)
150+
# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
151+
#endif
152+
153+
/* Intel's compiler complains if a variable which was never initialised is
154+
* cast to void, which is a common idiom which we use to indicate that we
155+
* are aware a variable isn't used. So we just silence that warning.
156+
* See: https://github.com/swig/swig/issues/192 for more discussion.
157+
*/
158+
#ifdef __INTEL_COMPILER
159+
# pragma warning disable 592
160+
#endif
148161

149162
/* -----------------------------------------------------------------------------
150163
* This section contains generic SWIG labels for method/variable
@@ -254,6 +267,19 @@ template <typename T> T SwigValueInit() {
254267
# define _SCL_SECURE_NO_DEPRECATE
255268
#endif
256269

270+
/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */
271+
#if defined(__APPLE__) && !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)
272+
# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
273+
#endif
274+
275+
/* Intel's compiler complains if a variable which was never initialised is
276+
* cast to void, which is a common idiom which we use to indicate that we
277+
* are aware a variable isn't used. So we just silence that warning.
278+
* See: https://github.com/swig/swig/issues/192 for more discussion.
279+
*/
280+
#ifdef __INTEL_COMPILER
281+
# pragma warning disable 592
282+
#endif
257283

258284
/* -----------------------------------------------------------------------------
259285
* swigrun.swg
@@ -661,14 +687,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
661687
swig_module_info *iter = start;
662688
do {
663689
if (iter->size) {
664-
register size_t l = 0;
665-
register size_t r = iter->size - 1;
690+
size_t l = 0;
691+
size_t r = iter->size - 1;
666692
do {
667693
/* since l+r >= 0, we can (>> 1) instead (/ 2) */
668-
register size_t i = (l + r) >> 1;
694+
size_t i = (l + r) >> 1;
669695
const char *iname = iter->types[i]->name;
670696
if (iname) {
671-
register int compare = strcmp(name, iname);
697+
int compare = strcmp(name, iname);
672698
if (compare == 0) {
673699
return iter->types[i];
674700
} else if (compare < 0) {
@@ -712,7 +738,7 @@ SWIG_TypeQueryModule(swig_module_info *start,
712738
of the str field (the human readable name) */
713739
swig_module_info *iter = start;
714740
do {
715-
register size_t i = 0;
741+
size_t i = 0;
716742
for (; i < iter->size; ++i) {
717743
if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name)))
718744
return iter->types[i];
@@ -731,10 +757,10 @@ SWIG_TypeQueryModule(swig_module_info *start,
731757
SWIGRUNTIME char *
732758
SWIG_PackData(char *c, void *ptr, size_t sz) {
733759
static const char hex[17] = "0123456789abcdef";
734-
register const unsigned char *u = (unsigned char *) ptr;
735-
register const unsigned char *eu = u + sz;
760+
const unsigned char *u = (unsigned char *) ptr;
761+
const unsigned char *eu = u + sz;
736762
for (; u != eu; ++u) {
737-
register unsigned char uu = *u;
763+
unsigned char uu = *u;
738764
*(c++) = hex[(uu & 0xf0) >> 4];
739765
*(c++) = hex[uu & 0xf];
740766
}
@@ -746,11 +772,11 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
746772
*/
747773
SWIGRUNTIME const char *
748774
SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
749-
register unsigned char *u = (unsigned char *) ptr;
750-
register const unsigned char *eu = u + sz;
775+
unsigned char *u = (unsigned char *) ptr;
776+
const unsigned char *eu = u + sz;
751777
for (; u != eu; ++u) {
752-
register char d = *(c++);
753-
register unsigned char uu;
778+
char d = *(c++);
779+
unsigned char uu;
754780
if ((d >= '0') && (d <= '9'))
755781
uu = ((d - '0') << 4);
756782
else if ((d >= 'a') && (d <= 'f'))
@@ -1506,14 +1532,13 @@ SWIG_Ruby_InitRuntime(void)
15061532
SWIGRUNTIME void
15071533
SWIG_Ruby_define_class(swig_type_info *type)
15081534
{
1509-
VALUE klass;
15101535
char *klass_name = (char *) malloc(4 + strlen(type->name) + 1);
15111536
sprintf(klass_name, "TYPE%s", type->name);
15121537
if (NIL_P(_cSWIG_Pointer)) {
15131538
_cSWIG_Pointer = rb_define_class_under(_mSWIG, "Pointer", rb_cObject);
15141539
rb_undef_method(CLASS_OF(_cSWIG_Pointer), "new");
15151540
}
1516-
klass = rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer);
1541+
rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer);
15171542
free((void *) klass_name);
15181543
}
15191544

@@ -1830,7 +1855,7 @@ static VALUE mAIFF;
18301855
#define SWIG_RUBY_THREAD_END_BLOCK
18311856

18321857

1833-
#define SWIGVERSION 0x020012
1858+
#define SWIGVERSION 0x030007
18341859
#define SWIG_VERSION SWIGVERSION
18351860

18361861

@@ -1976,7 +2001,7 @@ SWIG_ruby_failed(void)
19762001
}
19772002

19782003

1979-
/*@SWIG:/usr/local/share/swig/2.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
2004+
/*@SWIG:/usr/local/share/swig/3.0.7/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
19802005
SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
19812006
{
19822007
VALUE obj = args[0];
@@ -2648,7 +2673,7 @@ static swig_cast_info *swig_cast_initial[] = {
26482673
* array with the correct data and linking the correct swig_cast_info
26492674
* structures together.
26502675
*
2651-
* The generated swig_type_info structures are assigned staticly to an initial
2676+
* The generated swig_type_info structures are assigned statically to an initial
26522677
* array. We just loop through that array, and handle each type individually.
26532678
* First we lookup if this type has been already loaded, and if so, use the
26542679
* loaded structure instead of the generated one. Then we have to fill in the
@@ -2692,7 +2717,7 @@ SWIGRUNTIME void
26922717
SWIG_InitializeModule(void *clientdata) {
26932718
size_t i;
26942719
swig_module_info *module_head, *iter;
2695-
int found, init;
2720+
int init;
26962721

26972722
/* check to see if the circular list has been setup, if not, set it up */
26982723
if (swig_module.next==0) {
@@ -2711,22 +2736,18 @@ SWIG_InitializeModule(void *clientdata) {
27112736
/* This is the first module loaded for this interpreter */
27122737
/* so set the swig module into the interpreter */
27132738
SWIG_SetModule(clientdata, &swig_module);
2714-
module_head = &swig_module;
27152739
} else {
27162740
/* the interpreter has loaded a SWIG module, but has it loaded this one? */
2717-
found=0;
27182741
iter=module_head;
27192742
do {
27202743
if (iter==&swig_module) {
2721-
found=1;
2722-
break;
2744+
/* Our module is already in the list, so there's nothing more to do. */
2745+
return;
27232746
}
27242747
iter=iter->next;
27252748
} while (iter!= module_head);
27262749

2727-
/* if the is found in the list, then all is done and we may leave */
2728-
if (found) return;
2729-
/* otherwise we must add out module into the list */
2750+
/* otherwise we must add our module into the list */
27302751
swig_module.next = module_head->next;
27312752
module_head->next = &swig_module;
27322753
}

‎ext/taglib_base/taglib_base_wrap.cxx‎

Lines changed: 48 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* ----------------------------------------------------------------------------
22
* This file was automatically generated by SWIG (http://www.swig.org).
3-
* Version 2.0.12
3+
* Version 3.0.7
44
*
55
* This file is not intended to be easily readable and contains a number of
66
* coding conventions designed to improve portability and efficiency. Do not make
@@ -145,6 +145,19 @@ template <typename T> T SwigValueInit() {
145145
# define _SCL_SECURE_NO_DEPRECATE
146146
#endif
147147

148+
/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */
149+
#if defined(__APPLE__) && !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)
150+
# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
151+
#endif
152+
153+
/* Intel's compiler complains if a variable which was never initialised is
154+
* cast to void, which is a common idiom which we use to indicate that we
155+
* are aware a variable isn't used. So we just silence that warning.
156+
* See: https://github.com/swig/swig/issues/192 for more discussion.
157+
*/
158+
#ifdef __INTEL_COMPILER
159+
# pragma warning disable 592
160+
#endif
148161

149162
/* -----------------------------------------------------------------------------
150163
* This section contains generic SWIG labels for method/variable
@@ -254,6 +267,19 @@ template <typename T> T SwigValueInit() {
254267
# define _SCL_SECURE_NO_DEPRECATE
255268
#endif
256269

270+
/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */
271+
#if defined(__APPLE__) && !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)
272+
# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
273+
#endif
274+
275+
/* Intel's compiler complains if a variable which was never initialised is
276+
* cast to void, which is a common idiom which we use to indicate that we
277+
* are aware a variable isn't used. So we just silence that warning.
278+
* See: https://github.com/swig/swig/issues/192 for more discussion.
279+
*/
280+
#ifdef __INTEL_COMPILER
281+
# pragma warning disable 592
282+
#endif
257283

258284
/* -----------------------------------------------------------------------------
259285
* swigrun.swg
@@ -661,14 +687,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
661687
swig_module_info *iter = start;
662688
do {
663689
if (iter->size) {
664-
register size_t l = 0;
665-
register size_t r = iter->size - 1;
690+
size_t l = 0;
691+
size_t r = iter->size - 1;
666692
do {
667693
/* since l+r >= 0, we can (>> 1) instead (/ 2) */
668-
register size_t i = (l + r) >> 1;
694+
size_t i = (l + r) >> 1;
669695
const char *iname = iter->types[i]->name;
670696
if (iname) {
671-
register int compare = strcmp(name, iname);
697+
int compare = strcmp(name, iname);
672698
if (compare == 0) {
673699
return iter->types[i];
674700
} else if (compare < 0) {
@@ -712,7 +738,7 @@ SWIG_TypeQueryModule(swig_module_info *start,
712738
of the str field (the human readable name) */
713739
swig_module_info *iter = start;
714740
do {
715-
register size_t i = 0;
741+
size_t i = 0;
716742
for (; i < iter->size; ++i) {
717743
if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name)))
718744
return iter->types[i];
@@ -731,10 +757,10 @@ SWIG_TypeQueryModule(swig_module_info *start,
731757
SWIGRUNTIME char *
732758
SWIG_PackData(char *c, void *ptr, size_t sz) {
733759
static const char hex[17] = "0123456789abcdef";
734-
register const unsigned char *u = (unsigned char *) ptr;
735-
register const unsigned char *eu = u + sz;
760+
const unsigned char *u = (unsigned char *) ptr;
761+
const unsigned char *eu = u + sz;
736762
for (; u != eu; ++u) {
737-
register unsigned char uu = *u;
763+
unsigned char uu = *u;
738764
*(c++) = hex[(uu & 0xf0) >> 4];
739765
*(c++) = hex[uu & 0xf];
740766
}
@@ -746,11 +772,11 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
746772
*/
747773
SWIGRUNTIME const char *
748774
SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
749-
register unsigned char *u = (unsigned char *) ptr;
750-
register const unsigned char *eu = u + sz;
775+
unsigned char *u = (unsigned char *) ptr;
776+
const unsigned char *eu = u + sz;
751777
for (; u != eu; ++u) {
752-
register char d = *(c++);
753-
register unsigned char uu;
778+
char d = *(c++);
779+
unsigned char uu;
754780
if ((d >= '0') && (d <= '9'))
755781
uu = ((d - '0') << 4);
756782
else if ((d >= 'a') && (d <= 'f'))
@@ -1506,14 +1532,13 @@ SWIG_Ruby_InitRuntime(void)
15061532
SWIGRUNTIME void
15071533
SWIG_Ruby_define_class(swig_type_info *type)
15081534
{
1509-
VALUE klass;
15101535
char *klass_name = (char *) malloc(4 + strlen(type->name) + 1);
15111536
sprintf(klass_name, "TYPE%s", type->name);
15121537
if (NIL_P(_cSWIG_Pointer)) {
15131538
_cSWIG_Pointer = rb_define_class_under(_mSWIG, "Pointer", rb_cObject);
15141539
rb_undef_method(CLASS_OF(_cSWIG_Pointer), "new");
15151540
}
1516-
klass = rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer);
1541+
rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer);
15171542
free((void *) klass_name);
15181543
}
15191544

@@ -1832,7 +1857,7 @@ static VALUE mTagLib;
18321857
#define SWIG_RUBY_THREAD_END_BLOCK
18331858

18341859

1835-
#define SWIGVERSION 0x020012
1860+
#define SWIGVERSION 0x030007
18361861
#define SWIG_VERSION SWIGVERSION
18371862

18381863

@@ -2053,7 +2078,7 @@ SWIG_ruby_failed(void)
20532078
}
20542079

20552080

2056-
/*@SWIG:/usr/local/share/swig/2.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
2081+
/*@SWIG:/usr/local/share/swig/3.0.7/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
20572082
SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
20582083
{
20592084
VALUE obj = args[0];
@@ -2105,7 +2130,7 @@ SWIG_From_bool (bool value)
21052130
}
21062131

21072132

2108-
/*@SWIG:/usr/local/share/swig/2.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
2133+
/*@SWIG:/usr/local/share/swig/3.0.7/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
21092134
SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
21102135
{
21112136
VALUE obj = args[0];
@@ -4811,7 +4836,7 @@ static swig_cast_info *swig_cast_initial[] = {
48114836
* array with the correct data and linking the correct swig_cast_info
48124837
* structures together.
48134838
*
4814-
* The generated swig_type_info structures are assigned staticly to an initial
4839+
* The generated swig_type_info structures are assigned statically to an initial
48154840
* array. We just loop through that array, and handle each type individually.
48164841
* First we lookup if this type has been already loaded, and if so, use the
48174842
* loaded structure instead of the generated one. Then we have to fill in the
@@ -4855,7 +4880,7 @@ SWIGRUNTIME void
48554880
SWIG_InitializeModule(void *clientdata) {
48564881
size_t i;
48574882
swig_module_info *module_head, *iter;
4858-
int found, init;
4883+
int init;
48594884

48604885
/* check to see if the circular list has been setup, if not, set it up */
48614886
if (swig_module.next==0) {
@@ -4874,22 +4899,18 @@ SWIG_InitializeModule(void *clientdata) {
48744899
/* This is the first module loaded for this interpreter */
48754900
/* so set the swig module into the interpreter */
48764901
SWIG_SetModule(clientdata, &swig_module);
4877-
module_head = &swig_module;
48784902
} else {
48794903
/* the interpreter has loaded a SWIG module, but has it loaded this one? */
4880-
found=0;
48814904
iter=module_head;
48824905
do {
48834906
if (iter==&swig_module) {
4884-
found=1;
4885-
break;
4907+
/* Our module is already in the list, so there's nothing more to do. */
4908+
return;
48864909
}
48874910
iter=iter->next;
48884911
} while (iter!= module_head);
48894912

4890-
/* if the is found in the list, then all is done and we may leave */
4891-
if (found) return;
4892-
/* otherwise we must add out module into the list */
4913+
/* otherwise we must add our module into the list */
48934914
swig_module.next = module_head->next;
48944915
module_head->next = &swig_module;
48954916
}

0 commit comments

Comments
 (0)