From 1f92be9a3d937109237a9d7acfa8e123e61d5d05 Mon Sep 17 00:00:00 2001
From: Marcelo Matus <mmatus@acms.arizona.edu>
Date: Mon, 21 Nov 2005 20:29:54 +0000
Subject: [PATCH] adding more cases and suppressing the 470 warning

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7854 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 SWIG/Examples/test-suite/director_basic.i     | 11 +++++++-
 SWIG/Examples/test-suite/director_detect.i    |  1 +
 SWIG/Examples/test-suite/director_exception.i | 25 ++++++++-----------
 SWIG/Examples/test-suite/director_frob.i      |  1 +
 SWIG/Examples/test-suite/director_nested.i    |  6 +++++
 SWIG/Examples/test-suite/director_wombat.i    |  1 +
 SWIG/Examples/test-suite/primitive_types.i    |  5 ++++
 .../Examples/test-suite/python/director_stl.i |  1 +
 8 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/SWIG/Examples/test-suite/director_basic.i b/SWIG/Examples/test-suite/director_basic.i
index 04316faa8..61e9d28cd 100644
--- a/SWIG/Examples/test-suite/director_basic.i
+++ b/SWIG/Examples/test-suite/director_basic.i
@@ -1,4 +1,6 @@
  %module(directors="1") director_basic
+ #pragma SWIG nowarn=470
+
  %{
  #include <string>
 
@@ -32,7 +34,7 @@
  %{
  #include <complex> 
  %}
- %feature("director");
+ %feature("director") A;
 
  // basic renaming
  %rename(rg) A::gg;
@@ -99,11 +101,18 @@ public:
     return b;
   }  
 
+  virtual Bar* pmethod(Bar *b)
+  {
+    b->x += 12;
+    return b;
+  }  
+
   Bar cmethod(const Bar &b)
   {
     return vmethod(b);
   }  
 
+
   static MyClass *get_self(MyClass *c) 
   {
     return c;
diff --git a/SWIG/Examples/test-suite/director_detect.i b/SWIG/Examples/test-suite/director_detect.i
index 85d9cbe35..82e5f1c19 100644
--- a/SWIG/Examples/test-suite/director_detect.i
+++ b/SWIG/Examples/test-suite/director_detect.i
@@ -1,4 +1,5 @@
 %module(directors="1") director_detect
+#pragma SWIG nowarn=470
 
 %warnfilter(822, 842) cloner; /* Java, C# covariant return types */
 
diff --git a/SWIG/Examples/test-suite/director_exception.i b/SWIG/Examples/test-suite/director_exception.i
index 783de806d..b2eff53c6 100644
--- a/SWIG/Examples/test-suite/director_exception.i
+++ b/SWIG/Examples/test-suite/director_exception.i
@@ -3,16 +3,6 @@
 
 #include <string>
 
-class Foo {
-public:
-	virtual ~Foo() {}
-	virtual std::string ping() { return "Foo::ping()"; }
-	virtual std::string pong(int val = 3) { return "Foo::pong();" + ping(); }
-};
-
-Foo *launder(Foo *f) {
-	return f;
-}
 
 // define dummy director exception classes to prevent spurious errors 
 // in target languages that do not support directors.
@@ -61,14 +51,21 @@ class DirectorMethodException: public Swig::DirectorException {};
 
 %feature("director") Foo;
 
+%inline {
+
 class Foo {
 public:
-	virtual ~Foo() {}
-	virtual std::string ping() { return "Foo::ping()"; }
-	virtual std::string pong(int val = 3) { return "Foo::pong();" + ping(); }
+  virtual ~Foo() {}
+  virtual std::string ping() { return "Foo::ping()"; }
+  virtual std::string pong(int val=3) { return "Foo::pong();" + ping(); }
 };
 
-Foo *launder(Foo *f);
+Foo *launder(Foo *f) {
+  return f;
+}
+
+}
+
 
 %{
   struct Unknown1
diff --git a/SWIG/Examples/test-suite/director_frob.i b/SWIG/Examples/test-suite/director_frob.i
index df90b74b6..3692b72fb 100644
--- a/SWIG/Examples/test-suite/director_frob.i
+++ b/SWIG/Examples/test-suite/director_frob.i
@@ -1,4 +1,5 @@
 %module(directors="1") director_frob;
+#pragma SWIG nowarn=470
 
 %header %{
 #include <iostream>
diff --git a/SWIG/Examples/test-suite/director_nested.i b/SWIG/Examples/test-suite/director_nested.i
index 3293ee6b3..518a1700d 100644
--- a/SWIG/Examples/test-suite/director_nested.i
+++ b/SWIG/Examples/test-suite/director_nested.i
@@ -1,4 +1,5 @@
 %module(directors="1",dirprot="1") director_nested
+#pragma SWIG nowarn=470
 
 %{
 #include <string>
@@ -65,6 +66,11 @@
       {
 	return "FooBar::get_name";
       }
+
+      const char *name() 
+      {
+	return get_name();
+      }
       
       static FooBar *get_self(FooBar *a)
       {
diff --git a/SWIG/Examples/test-suite/director_wombat.i b/SWIG/Examples/test-suite/director_wombat.i
index f17a96299..879e76ee0 100644
--- a/SWIG/Examples/test-suite/director_wombat.i
+++ b/SWIG/Examples/test-suite/director_wombat.i
@@ -1,4 +1,5 @@
 %module(directors="1") director_wombat
+#pragma SWIG nowarn=470
 
 %feature(director) Bar;
 %feature(director) Foo<int>;
diff --git a/SWIG/Examples/test-suite/primitive_types.i b/SWIG/Examples/test-suite/primitive_types.i
index a0407dc20..c7152a9fb 100644
--- a/SWIG/Examples/test-suite/primitive_types.i
+++ b/SWIG/Examples/test-suite/primitive_types.i
@@ -120,6 +120,11 @@
     T val;
 
     Param(T v = 0): val(v) {
+      name[0] = 0;
+      name[1] = 0;
+      name[2] = 0;
+      name[3] = 0;
+      name[4] = 0;
     }
     
     operator T() const { return val; }
diff --git a/SWIG/Examples/test-suite/python/director_stl.i b/SWIG/Examples/test-suite/python/director_stl.i
index ac5eb9804..a56010d1d 100644
--- a/SWIG/Examples/test-suite/python/director_stl.i
+++ b/SWIG/Examples/test-suite/python/director_stl.i
@@ -1,4 +1,5 @@
 %module(directors="1") director_stl
+#pragma SWIG nowarn=470
 
 %include "std_string.i"
 %include "std_pair.i"