From 65b917dabb5d0037318da93b78ce028dbb113f07 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 6 Apr 2013 16:19:17 -0700 Subject: [PATCH] Some test-suite warning fixes --- Examples/test-suite/li_std_except_as_class.i | 6 ++++++ Examples/test-suite/typemap_array_qualifiers.i | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/Examples/test-suite/li_std_except_as_class.i b/Examples/test-suite/li_std_except_as_class.i index 00de76eac..0400c9a82 100644 --- a/Examples/test-suite/li_std_except_as_class.i +++ b/Examples/test-suite/li_std_except_as_class.i @@ -5,6 +5,12 @@ * if there were also functions throwing 'std::logic_error' and * 'std::exception' then the bug would not be fully replicated */ +%{ +#if defined(_MSC_VER) + #pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) +#endif +%} + %{ #include #include diff --git a/Examples/test-suite/typemap_array_qualifiers.i b/Examples/test-suite/typemap_array_qualifiers.i index 947721402..14df649d3 100644 --- a/Examples/test-suite/typemap_array_qualifiers.i +++ b/Examples/test-suite/typemap_array_qualifiers.i @@ -39,6 +39,7 @@ CLEAR_SWIGTYPE_TYPEMAPS; %typemap(in) SWIGTYPE [ANY] { +$1 = 0; /* Correct typemap for $symname: $type */ } %inline %{ @@ -48,9 +49,11 @@ CLEAR_SWIGTYPE_TYPEMAPS; CLEAR_SWIGTYPE_TYPEMAPS; %typemap(in) const SWIGTYPE [ANY] { +$1 = 0; /* Correct typemap for $symname: $type */ } %typemap(in) const volatile SWIGTYPE [ANY] { +$1 = 0; /* Correct typemap for $symname: $type */ } %inline %{ @@ -61,9 +64,11 @@ CLEAR_SWIGTYPE_TYPEMAPS; CLEAR_SWIGTYPE_TYPEMAPS; %typemap(in) volatile SWIGTYPE **const [ANY] { +$1 = 0; /* Correct typemap for $symname: $type */ } %typemap(in) volatile SWIGTYPE **const [ANY][ANY] { +$1 = 0; /* Correct typemap for $symname: $type */ } %inline %{ @@ -72,6 +77,7 @@ CLEAR_SWIGTYPE_TYPEMAPS; CLEAR_SWIGTYPE_TYPEMAPS; %typemap(in) SWIGTYPE (*const) (ANY) { +$1 = 0; /* Correct typemap for $symname: $type */ } %inline %{