diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2006-01-21 00:02:05 +0000 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2006-01-21 00:02:05 +0000 |
| commit | cf9272fbaed7247edb34afdb39efb25b7fe3baf8 (patch) | |
| tree | 4b21a5eafb707b5c8e29926647bb1f113c954130 /Examples | |
| parent | 8629d7f5136cdbd2d0a9ac99d41c188f0c75b712 (diff) | |
| download | swig-cf9272fbaed7247edb34afdb39efb25b7fe3baf8.tar.gz | |
remove vc++ noise
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@8497 626c5289-ae23-0410-ae9c-e8d60b6d4f22
Diffstat (limited to 'Examples')
| -rw-r--r-- | Examples/test-suite/default_constructor.i | 6 | ||||
| -rw-r--r-- | Examples/test-suite/li_std_wstring.i | 8 | ||||
| -rw-r--r-- | Examples/test-suite/python/li_std_wstring.i | 8 | ||||
| -rw-r--r-- | Examples/test-suite/python/std_containers.i | 3 | ||||
| -rw-r--r-- | Examples/test-suite/using_pointers.i | 6 |
5 files changed, 31 insertions, 0 deletions
diff --git a/Examples/test-suite/default_constructor.i b/Examples/test-suite/default_constructor.i index 8a591db4b..9d6237120 100644 --- a/Examples/test-suite/default_constructor.i +++ b/Examples/test-suite/default_constructor.i @@ -96,8 +96,14 @@ public: void bar(F *) { } +#if defined(_MSC_VER) + #pragma warning(disable: 4624) // : destructor could not be generated because a base class destructor is inaccessible +#endif class FFF : public F { }; +#if defined(_MSC_VER) + #pragma warning(default: 4624) // : destructor could not be generated because a base class destructor is inaccessible +#endif /* A class with a protected destructor */ class G { diff --git a/Examples/test-suite/li_std_wstring.i b/Examples/test-suite/li_std_wstring.i index 906b62b25..51fac7f34 100644 --- a/Examples/test-suite/li_std_wstring.i +++ b/Examples/test-suite/li_std_wstring.i @@ -64,12 +64,20 @@ std::wstring& test_reference_out() { return x; } +#if defined(_MSC_VER) + #pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) +#endif + void test_throw() throw(std::wstring){ static std::wstring x = L"x"; throw x; } +#if defined(_MSC_VER) + #pragma warning(default: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) +#endif + %} diff --git a/Examples/test-suite/python/li_std_wstring.i b/Examples/test-suite/python/li_std_wstring.i index c5cd20576..c809e11ec 100644 --- a/Examples/test-suite/python/li_std_wstring.i +++ b/Examples/test-suite/python/li_std_wstring.i @@ -70,12 +70,20 @@ std::wstring& test_reference_out() { return x; } +#if defined(_MSC_VER) + #pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) +#endif + void test_throw() throw(std::wstring){ static std::wstring x = L"x"; throw x; } +#if defined(_MSC_VER) + #pragma warning(default: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) +#endif + %} diff --git a/Examples/test-suite/python/std_containers.i b/Examples/test-suite/python/std_containers.i index a6b5206ac..a1d39e7ab 100644 --- a/Examples/test-suite/python/std_containers.i +++ b/Examples/test-suite/python/std_containers.i @@ -1,5 +1,8 @@ %module std_containers +%{ +#include <set> +%} %include std_vector.i %include std_string.i %include std_deque.i diff --git a/Examples/test-suite/using_pointers.i b/Examples/test-suite/using_pointers.i index 372057c1a..b2d6abe4d 100644 --- a/Examples/test-suite/using_pointers.i +++ b/Examples/test-suite/using_pointers.i @@ -4,6 +4,12 @@ %csmethodmodifiers x "public new" #endif +%{ +#if defined(_MSC_VER) + #pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) +#endif +%} + %inline %{ class Foo { public: |