Visual Studio warning fixes

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@7538 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2005-09-27 20:16:09 +00:00
commit da2a914365
5 changed files with 12 additions and 9 deletions

View file

@ -61,5 +61,5 @@ static void SWIG_AsVal(VALUE obj, int *val)
* ------------------------------------------------------------ */
%typemap(throws) enum SWIGTYPE
"rb_exc_raise(rb_exc_new3(rb_eRuntimeError, rb_obj_as_string(INT2NUM($1))));";
"(void)$1; rb_exc_raise(rb_exc_new3(rb_eRuntimeError, rb_obj_as_string(INT2NUM($1))));"

View file

@ -158,5 +158,5 @@
* ------------------------------------------------------------ */
%typemap(throws) SWIGTYPE, SWIGTYPE *, SWIGTYPE [ANY], SWIGTYPE &
"rb_raise(rb_eRuntimeError, \"$1_type\");";
"(void)$1; rb_raise(rb_eRuntimeError, \"$1_type\");";

View file

@ -4,32 +4,32 @@
#if defined(SWIGJAVA)
%typemap(throws) std::out_of_range %{
SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, _e.what());
SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, $1.what());
return $null; %}
#elif defined(SWIGCSHARP)
%typemap(throws, canthrow=1) std::out_of_range %{
SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, _e.what());
SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, $1.what());
return $null; %}
%typemap(throws, canthrow=1) std::invalid_argument %{
SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, _e.what(), "");
SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, $1.what(), "");
return $null; %}
#elif defined(SWIGPYTHON)
%include "exception.i"
%typemap(throws) std::out_of_range %{
if (!PyErr_Occurred()) {
SWIG_exception(SWIG_IndexError, _e.what());
SWIG_exception(SWIG_IndexError, $1.what());
} else {
SWIG_fail;
} %}
%typemap(throws) std::invalid_argument %{
if (!PyErr_Occurred()) {
SWIG_exception(SWIG_TypeError, _e.what());
SWIG_exception(SWIG_TypeError, $1.what());
} else {
SWIG_fail;
} %}
#elif
%include "exception.i"
%typemap(throws) std::out_of_range %{
SWIG_exception(SWIG_IndexError, _e.what()); %}
SWIG_exception(SWIG_IndexError, $1.what()); %}
#endif

View file

@ -622,16 +622,19 @@
}
%typemap(throws) SWIGTYPE {
(void)$1;
Tcl_SetObjResult(interp, Tcl_NewStringObj((char*) "$1_type", -1));
SWIG_fail;
}
%typemap(throws) SWIGTYPE, SWIGTYPE &, SWIGTYPE *, SWIGTYPE [ANY] {
(void)$1;
Tcl_SetObjResult(interp, Tcl_NewStringObj((char*) "$1_type", -1));
SWIG_fail;
}
%typemap(throws) enum SWIGTYPE {
(void)$1;
Tcl_SetObjResult(interp, Tcl_NewStringObj((char*) "$1_type", -1));
SWIG_fail;
}

View file

@ -920,7 +920,7 @@ public:
"swig_", mangled_classname, "_base_names, &swig_module };\n", NIL);
if( !itcl ) {
Printv(cmd_tab, tab4, "{ SWIG_prefix \"", class_name, "\", (swig_wrapper_func) SWIG_ObjectConstructor, &_wrap_class_", mangled_classname, "},\n", NIL);
Printv(cmd_tab, tab4, "{ SWIG_prefix \"", class_name, "\", (swig_wrapper_func) SWIG_ObjectConstructor, (ClientData)&_wrap_class_", mangled_classname, "},\n", NIL);
};
Delete(t);