From 5fd5da5dba9a4dbf3f7680a18fad613c53ac101e Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 5 Nov 2004 23:17:59 +0000
Subject: [PATCH] C# fixes

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@6673 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/test-suite/multiple_inheritance.i | 4 ++++
 Examples/test-suite/template_opaque.i      | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Examples/test-suite/multiple_inheritance.i b/Examples/test-suite/multiple_inheritance.i
index 87e5115ea..b4ca19ef8 100644
--- a/Examples/test-suite/multiple_inheritance.i
+++ b/Examples/test-suite/multiple_inheritance.i
@@ -11,6 +11,10 @@ It tests basic multiple inheritance */
 #pragma SWIG nowarn=813; // Java doesn't support multiple  inheritance
 #endif
 
+#ifdef SWIGCSHARP
+#pragma SWIG nowarn=833; // C# doesn't support multiple  inheritance
+#endif
+
 %inline %{
 
 class Bar {
diff --git a/Examples/test-suite/template_opaque.i b/Examples/test-suite/template_opaque.i
index 736385a1b..5918fe069 100644
--- a/Examples/test-suite/template_opaque.i
+++ b/Examples/test-suite/template_opaque.i
@@ -1,5 +1,5 @@
 %module template_opaque
-%include std_vector.i
+%include "std_vector.i"
 
 %{
   namespace A 
@@ -35,4 +35,7 @@ namespace A {
 }
 }
 
+#ifndef SWIGCSHARP
+// C# vector typemaps only ready for simple cases right now
 %template(OpaqueVectorType) std::vector<A::OpaqueType>; 
+#endif