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

throws typemaps for std::wstring using C# patch #1799064 from David Piepgrass

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9956 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2007-09-25 21:35:24 +00:00
commit 23f8a0464c
3 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGES.current
View file

@ -1,6 +1,13 @@
Version 1.3.32 (in progress) Version 1.3.32 (in progress)
============================ ============================
09/25/2007: wsfulton
[C#, Java] throws typemaps for std::wstring using C# patch #1799064 from David Piepgrass
09/24/2007: wsfulton
[Tcl] Apply #1771313 to fix bug #1650229 - fixes long long and unsigned long long
handling.
09/20/2007: olly 09/20/2007: olly
[Java] Eliminate some unnecessary uses of a temporary buffer [Java] Eliminate some unnecessary uses of a temporary buffer
allocated using new[]. SF#1796609. allocated using new[]. SF#1796609.

8
Lib/csharp/std_wstring.i
View file

@ -57,8 +57,8 @@ class wstring;
%typemap(typecheck) wstring = wchar_t *; %typemap(typecheck) wstring = wchar_t *;
%typemap(throws, canthrow=1) wstring %typemap(throws, canthrow=1) wstring
%{ (void)$1; %{ std::string message($1.begin(), $1.end());
SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "wstring exception"); SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, message.c_str());
return $null; %} return $null; %}
// const wstring & // const wstring &
@ -109,8 +109,8 @@ class wstring;
%typemap(typecheck) const wstring & = wchar_t *; %typemap(typecheck) const wstring & = wchar_t *;
%typemap(throws, canthrow=1) const wstring & %typemap(throws, canthrow=1) const wstring &
%{ (void)$1; %{ std::string message($1.begin(), $1.end());
SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, "wstring exception"); SWIG_CSharpSetPendingException(SWIG_CSharpApplicationException, message.c_str());
return $null; %} return $null; %}
} }

14
Lib/java/std_wstring.i
View file

@ -87,6 +87,13 @@ class wstring;
return $jnicall; return $jnicall;
} }
//%typemap(typecheck) wstring = wchar_t *;
%typemap(throws) wstring
%{ std::string message($1.begin(), $1.end());
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, message.c_str());
return $null; %}
// const wstring & // const wstring &
%typemap(jni) const wstring & "jstring" %typemap(jni) const wstring & "jstring"
%typemap(jtype) const wstring & "String" %typemap(jtype) const wstring & "String"
@ -157,5 +164,12 @@ class wstring;
return $jnicall; return $jnicall;
} }
//%typemap(typecheck) const wstring & = wchar_t *;
%typemap(throws) const wstring &
%{ std::string message($1.begin(), $1.end());
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, message.c_str());
return $null; %}
} }