jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ruby] should initialize static variables inside %init{}, in which it will not be

Browse source 
excuted concurrently by multiple threads.
This commit is contained in:
Takashi Tamura 2017-02-22 12:25:27 +09:00
commit 04a7c4f8b8
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/ruby/rubywstrings.swg
View file

@ -8,7 +8,7 @@
SWIGINTERN int SWIGINTERN int
SWIG_AsWCharPtrAndSize(VALUE obj, wchar_t **cptr, size_t *psize, int *alloc) SWIG_AsWCharPtrAndSize(VALUE obj, wchar_t **cptr, size_t *psize, int *alloc)
{ {
static rb_encoding* wstr_enc = rb_to_encoding(rb_str_new_cstr( SWIG_RUBY_WSTRING_ENCODING )); rb_encoding* wstr_enc = swig_ruby_wstring_encoding;
if (TYPE(obj) == T_STRING) { if (TYPE(obj) == T_STRING) {
VALUE rstr = rb_str_conv_enc(obj, rb_enc_get(obj), wstr_enc); VALUE rstr = rb_str_conv_enc(obj, rb_enc_get(obj), wstr_enc);
@ -37,8 +37,8 @@ SWIG_AsWCharPtrAndSize(VALUE obj, wchar_t **cptr, size_t *psize, int *alloc)
SWIGINTERNINLINE VALUE SWIGINTERNINLINE VALUE
SWIG_FromWCharPtrAndSize(const wchar_t * carray, size_t size) SWIG_FromWCharPtrAndSize(const wchar_t * carray, size_t size)
{ {
static rb_encoding* wstr_enc = rb_to_encoding(rb_str_new_cstr( SWIG_RUBY_WSTRING_ENCODING )); rb_encoding* wstr_enc = swig_ruby_wstring_encoding;
static rb_encoding* rb_enc = rb_to_encoding(rb_str_new_cstr( SWIG_RUBY_INTERNAL_ENCODING )); rb_encoding* rb_enc = swig_ruby_internal_encoding;
if (carray && size <= LONG_MAX/sizeof(wchar_t)) { if (carray && size <= LONG_MAX/sizeof(wchar_t)) {
VALUE rstr = rb_str_new( (const char*)carray, %numeric_cast(size*sizeof(wchar_t),long) ); VALUE rstr = rb_str_new( (const char*)carray, %numeric_cast(size*sizeof(wchar_t),long) );

8
Lib/ruby/std_wstring.i
View file

@ -32,11 +32,19 @@ extern "C" {
#define SWIG_RUBY_INTERNAL_ENCODING "UTF-8" #define SWIG_RUBY_INTERNAL_ENCODING "UTF-8"
#endif #endif
static rb_encoding *swig_ruby_wstring_encoding;
static rb_encoding *swig_ruby_internal_encoding;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
%} %}
%init{
swig_ruby_wstring_encoding = rb_enc_find( SWIG_RUBY_WSTRING_ENCODING );
swig_ruby_internal_encoding = rb_enc_find( SWIG_RUBY_INTERNAL_ENCODING );
}
%include <rubywstrings.swg> %include <rubywstrings.swg>
%include <typemaps/std_wstring.swg> %include <typemaps/std_wstring.swg>