diff options
author | Geert Janssens <janssens-geert@telenet.be> | 2013-04-19 18:57:31 +0200 |
---|---|---|
committer | Geert Janssens <janssens-geert@telenet.be> | 2013-04-28 22:06:24 +0200 |
commit | d689d9a860c4565db2e87ffd28e9fbe5bc7e848f (patch) | |
tree | 646717c72b895a58d6e2cbbb2c94efd7c527994b /Lib/guile | |
parent | b819d2a91e951508cf84dc2d78fc7d57391c9dca (diff) | |
download | swig-d689d9a860c4565db2e87ffd28e9fbe5bc7e848f.tar.gz |
Fix deprecation warnings for test suite under guile 2.0
Diffstat (limited to 'Lib/guile')
-rw-r--r-- | Lib/guile/typemaps.i | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Lib/guile/typemaps.i b/Lib/guile/typemaps.i index ab655eb9a..ba447ac28 100644 --- a/Lib/guile/typemaps.i +++ b/Lib/guile/typemaps.i @@ -60,25 +60,25 @@ %typemap(throws) SWIGTYPE { $<ype temp = new $ltype($1); - scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_throw(scm_from_locale_symbol((char *) "swig-exception"), scm_listify(SWIG_NewPointerObj(temp, $&descriptor, 1), SCM_UNDEFINED)); } %typemap(throws) SWIGTYPE & { - scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_throw(scm_from_locale_symbol((char *) "swig-exception"), scm_listify(SWIG_NewPointerObj(&$1, $descriptor, 1), SCM_UNDEFINED)); } %typemap(throws) SWIGTYPE * { - scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_throw(scm_from_locale_symbol((char *) "swig-exception"), scm_listify(SWIG_NewPointerObj($1, $descriptor, 1), SCM_UNDEFINED)); } %typemap(throws) SWIGTYPE [] { - scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_throw(scm_from_locale_symbol((char *) "swig-exception"), scm_listify(SWIG_NewPointerObj($1, $descriptor, 1), SCM_UNDEFINED)); } @@ -151,7 +151,7 @@ enums, which cannot be cast to. */ %typemap(varin) enum SWIGTYPE { if (sizeof(int) != sizeof($1)) { - scm_error(scm_str2symbol("swig-error"), + scm_error(scm_from_locale_symbol("swig-error"), (char *) FUNC_NAME, (char *) "enum variable '$name' cannot be set", SCM_EOL, SCM_BOOL_F); @@ -161,7 +161,7 @@ %typemap(out) enum SWIGTYPE { $result = scm_from_long($1); } %typemap(varout) enum SWIGTYPE { $result = scm_from_long($1); } %typemap(throws) enum SWIGTYPE { - scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_throw(scm_from_locale_symbol((char *) "swig-exception"), scm_listify(scm_from_long($1), SCM_UNDEFINED)); } @@ -210,7 +210,7 @@ /* Throw typemap */ %typemap(throws) C_NAME { C_NAME swig_c_value = $1; - scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_throw(scm_from_locale_symbol((char *) "swig-exception"), scm_listify(C_TO_SCM_EXPR, SCM_UNDEFINED)); } %enddef @@ -254,7 +254,7 @@ } /* Throw typemap */ %typemap(throws) C_NAME { - scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_throw(scm_from_locale_symbol((char *) "swig-exception"), scm_listify(C_TO_SCM($1), SCM_UNDEFINED)); } %enddef @@ -329,7 +329,7 @@ SIMPLE_MAP(unsigned long long, scm_to_ulong_long, scm_from_ulong_long, integer); } %typemap(throws) char * { - scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_throw(scm_from_locale_symbol((char *) "swig-exception"), scm_listify(SWIG_str02scm($1), SCM_UNDEFINED)); } |