Remove bogus ; after } in examples

This commit is contained in:
Olly Betts 2014-11-05 10:42:12 +13:00
commit 37cd1474b5
18 changed files with 43 additions and 43 deletions

View file

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

View file

@ -4,8 +4,8 @@ class Vector {
private: private:
double x,y,z; double x,y,z;
public: public:
Vector() : x(0), y(0), z(0) { }; Vector() : x(0), y(0), z(0) { }
Vector(double x, double y, double z) : x(x), y(y), z(z) { }; Vector(double x, double y, double z) : x(x), y(y), z(z) { }
friend Vector operator+(const Vector &a, const Vector &b); friend Vector operator+(const Vector &a, const Vector &b);
char *print(); char *print();
}; };

View file

@ -4,8 +4,8 @@ class Vector {
private: private:
double x,y,z; double x,y,z;
public: public:
Vector() : x(0), y(0), z(0) { }; Vector() : x(0), y(0), z(0) { }
Vector(double x, double y, double z) : x(x), y(y), z(z) { }; Vector(double x, double y, double z) : x(x), y(y), z(z) { }
friend Vector operator+(const Vector &a, const Vector &b); friend Vector operator+(const Vector &a, const Vector &b);
char *print(); char *print();
}; };

View file

@ -4,8 +4,8 @@ class Vector {
private: private:
double x,y,z; double x,y,z;
public: public:
Vector() : x(0), y(0), z(0) { }; Vector() : x(0), y(0), z(0) { }
Vector(double x, double y, double z) : x(x), y(y), z(z) { }; Vector(double x, double y, double z) : x(x), y(y), z(z) { }
friend Vector operator+(const Vector &a, const Vector &b); friend Vector operator+(const Vector &a, const Vector &b);
char *print(); char *print();
}; };

View file

@ -4,8 +4,8 @@ class Vector {
private: private:
double x,y,z; double x,y,z;
public: public:
Vector() : x(0), y(0), z(0) { }; Vector() : x(0), y(0), z(0) { }
Vector(double x, double y, double z) : x(x), y(y), z(z) { }; Vector(double x, double y, double z) : x(x), y(y), z(z) { }
friend Vector operator+(const Vector &a, const Vector &b); friend Vector operator+(const Vector &a, const Vector &b);
char *print(); char *print();
}; };

View file

@ -1,7 +1,7 @@
class Base { class Base {
public: public:
Base() { }; Base() { }
virtual ~Base() { }; virtual ~Base() { }
virtual const char * A() const { virtual const char * A() const {
return "Base::A"; return "Base::A";
} }

View file

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

View file

@ -4,8 +4,8 @@ struct Vector {
private: private:
double x,y,z; double x,y,z;
public: public:
Vector() : x(0), y(0), z(0) { }; Vector() : x(0), y(0), z(0) { }
Vector(double x, double y, double z) : x(x), y(y), z(z) { }; Vector(double x, double y, double z) : x(x), y(y), z(z) { }
Vector operator+(const Vector &b) const; Vector operator+(const Vector &b) const;
char *print(); char *print();
}; };

View file

@ -4,8 +4,8 @@ class Vector {
private: private:
double x,y,z; double x,y,z;
public: public:
Vector() : x(0), y(0), z(0) { }; Vector() : x(0), y(0), z(0) { }
Vector(double x, double y, double z) : x(x), y(y), z(z) { }; Vector(double x, double y, double z) : x(x), y(y), z(z) { }
friend Vector operator+(const Vector &a, const Vector &b); friend Vector operator+(const Vector &a, const Vector &b);
char *print(); char *print();
}; };

View file

@ -2,8 +2,8 @@
class Base { class Base {
public: public:
Base() { }; Base() { }
virtual ~Base() { }; virtual ~Base() { }
virtual void A() { virtual void A() {
printf("I'm Base::A\n"); printf("I'm Base::A\n");
} }

View file

@ -4,8 +4,8 @@ class Vector {
private: private:
double x,y,z; double x,y,z;
public: public:
Vector() : x(0), y(0), z(0) { }; Vector() : x(0), y(0), z(0) { }
Vector(double x, double y, double z) : x(x), y(y), z(z) { }; Vector(double x, double y, double z) : x(x), y(y), z(z) { }
friend Vector operator+(const Vector &a, const Vector &b); friend Vector operator+(const Vector &a, const Vector &b);
char *print(); char *print();
}; };

View file

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

View file

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

View file

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

View file

@ -2,8 +2,8 @@
class Base { class Base {
public: public:
Base() { }; Base() { }
virtual ~Base() { }; virtual ~Base() { }
virtual void A() { virtual void A() {
printf("I'm Base::A\n"); printf("I'm Base::A\n");
} }

View file

@ -2,8 +2,8 @@
template<class T> class Base { template<class T> class Base {
public: public:
Base() { }; Base() { }
virtual ~Base() { }; virtual ~Base() { }
virtual void A() { virtual void A() {
printf("I'm Base::A\n"); printf("I'm Base::A\n");
} }

View file

@ -4,8 +4,8 @@ class Vector {
private: private:
double x,y,z; double x,y,z;
public: public:
Vector() : x(0), y(0), z(0) { }; Vector() : x(0), y(0), z(0) { }
Vector(double x, double y, double z) : x(x), y(y), z(z) { }; Vector(double x, double y, double z) : x(x), y(y), z(z) { }
friend Vector operator+(const Vector &a, const Vector &b); friend Vector operator+(const Vector &a, const Vector &b);
char *print(); char *print();
}; };

View file

@ -7,7 +7,7 @@ public:
} }
virtual ~Shape() { virtual ~Shape() {
nshapes--; nshapes--;
}; }
double x, y; double x, y;
void move(double dx, double dy); void move(double dx, double dy);
virtual double area() = 0; virtual double area() = 0;
@ -19,7 +19,7 @@ class Circle : public Shape {
private: private:
double radius; double radius;
public: public:
Circle(double r) : radius(r) { }; Circle(double r) : radius(r) { }
virtual double area(); virtual double area();
virtual double perimeter(); virtual double perimeter();
}; };