The great merge

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@4141 626c5289-ae23-0410-ae9c-e8d60b6d4f22

Examples/python/class/example.h

@@ -10,8 +10,8 @@ public:
   };
   double  x, y;   
   void    move(double dx, double dy);
-  virtual double area() = 0;
-  virtual double perimeter() = 0;
+  virtual double area(void) = 0;
+  virtual double perimeter(void) = 0;
   static  int nshapes;
 };
 
@@ -20,17 +20,17 @@ private:
   double radius;
 public:
   Circle(double r) : radius(r) { };
-  virtual double area();
-  virtual double perimeter();
+  virtual double area(void);
+  virtual double perimeter(void);
 };
-  
+
 class Square : public Shape {
 private:
   double width;
 public:
   Square(double w) : width(w) { };
-  virtual double area();
-  virtual double perimeter();
+  virtual double area(void);
+  virtual double perimeter(void);
 };