Merge latest master into doxygen branch.

Examples/php/disown/example.h

@@ -9,7 +9,7 @@ public:
   }
   virtual ~Shape() {
     nshapes--;
-  };
+  }
   double  x, y;   
   void    move(double dx, double dy);
   virtual double area(void) = 0;
@@ -22,8 +22,8 @@ class Circle : public Shape {
 private:
   double radius;
 public:
-  Circle(double r) : radius(r) { };
-  ~Circle() { };
+  Circle(double r) : radius(r) { }
+  ~Circle() { }
   void set_radius( double r );
   virtual double area(void);
   virtual double perimeter(void);
@@ -33,7 +33,7 @@ class Square : public Shape {
 private:
   double width;
 public:
-  Square(double w) : width(w) { };
+  Square(double w) : width(w) { }
   ~Square() { }
   virtual double area(void);
   virtual double perimeter(void);
@@ -44,7 +44,7 @@ private:
   typedef std::vector<Shape*>::iterator iterator;
   std::vector<Shape*> shapes;
 public:
-  ShapeContainer() : shapes() {};
+  ShapeContainer() : shapes() {}
   ~ShapeContainer();
   void addShape( Shape *s );
 };

Examples/php/proxy/example.h

@@ -9,7 +9,7 @@ public:
   }
   virtual ~Shape() {
     nshapes--;
-  };
+  }
   double  x, y;   
   void    move(double dx, double dy);
   virtual double area(void) = 0;
@@ -22,8 +22,8 @@ class Circle : public Shape {
 private:
   double radius;
 public:
-  Circle(double r) : radius(r) { };
-  ~Circle() { };
+  Circle(double r) : radius(r) { }
+  ~Circle() { }
   void set_radius( double r );
   virtual double area(void);
   virtual double perimeter(void);
@@ -33,7 +33,7 @@ class Square : public Shape {
 private:
   double width;
 public:
-  Square(double w) : width(w) { };
+  Square(double w) : width(w) { }
   ~Square() { }
   virtual double area(void);
   virtual double perimeter(void);

Examples/php/reference/example.h

@@ -4,8 +4,8 @@ class Vector {
 private:
   double x,y,z;
 public:
-  Vector() : x(0), y(0), z(0) { };
-  Vector(double x, double y, double z) : x(x), y(y), z(z) { };
+  Vector() : x(0), y(0), z(0) { }
+  Vector(double x, double y, double z) : x(x), y(y), z(z) { }
   friend Vector operator+(const Vector &a, const Vector &b);
   char *as_string();
 };
@@ -20,7 +20,3 @@ public:
   Vector &operator[](int);
   int size();
 };
-
-
-
-  

Examples/php/reference/example.i

@@ -1,10 +1,6 @@
 /* File : example.i */
 
-/* This example has nothing to do with references but the name is used by all
- * the other languages so it's hard to rename to something more meaningful.
- *
- * Mostly it shows how to use %extend.
- */
+/* This file has a few "typical" uses of C++ references. */
 
 %module example
 
@@ -33,8 +29,8 @@ public:
   VectorArray(int maxsize);
   ~VectorArray();
   int size();
-  
- /*  This wrapper provides an alternative to the [] operator */
+
+  /* This wrapper provides an alternative to the [] operator */
   %extend {
     Vector &get(int index) {
       printf("VectorArray extended get: %p %d\n", (void *)$self, index);