summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam S Fulton <wsf@fultondesigns.co.uk>2015-08-02 21:38:53 +0100
committerWilliam S Fulton <wsf@fultondesigns.co.uk>2015-08-02 21:50:32 +0100
commit892aaf577a6fdb663aafe1e6ada178de312d92f2 (patch)
tree4259abff9f401f933fa82ac6971b96840a6e1f51
parentc6f8aadc6471851844c8c6c0cb329a176d30621f (diff)
downloadswig-892aaf577a6fdb663aafe1e6ada178de312d92f2.tar.gz
Test case warning suppression for visual c++
-rw-r--r--Examples/test-suite/array_typedef_memberin.i4
-rw-r--r--Examples/test-suite/default_constructor.i8
2 files changed, 12 insertions, 0 deletions
diff --git a/Examples/test-suite/array_typedef_memberin.i b/Examples/test-suite/array_typedef_memberin.i
index 3618c9305..7301057e9 100644
--- a/Examples/test-suite/array_typedef_memberin.i
+++ b/Examples/test-suite/array_typedef_memberin.i
@@ -1,5 +1,9 @@
%module array_typedef_memberin
+#if defined(_MSC_VER)
+ #pragma warning(disable: 4351) // new behavior: elements of array 'xyz' will be default initialized
+#endif
+
#if defined(SWIGSCILAB)
%rename(ExDetail) ExampleDetail;
#endif
diff --git a/Examples/test-suite/default_constructor.i b/Examples/test-suite/default_constructor.i
index 74673b74a..40a088cc9 100644
--- a/Examples/test-suite/default_constructor.i
+++ b/Examples/test-suite/default_constructor.i
@@ -113,6 +113,10 @@ public:
void bar(F *) { }
+#if defined(_MSC_VER)
+ #pragma warning(disable: 4624) // destructor could not be generated because a base class destructor is inaccessible or deleted
+#endif
+
// Single inheritance, base has private destructor
class FFF : public F {
};
@@ -123,6 +127,10 @@ class GGG : public A, public F {
class HHH : public F, public A {
};
+#if defined(_MSC_VER)
+ #pragma warning(default: 4624) // destructor could not be generated because a base class destructor is inaccessible or deleted
+#endif
+
/* A class with a protected destructor */
class G {
protected: