diff options
| author | Jakob Odersky <jodersky@gmail.com> | 2011-03-24 22:18:55 +0000 |
|---|---|---|
| committer | Jakob Odersky <jodersky@gmail.com> | 2011-03-24 22:18:55 +0000 |
| commit | af3436f5befeeb90ec9cd9e2277176a2881b6f64 (patch) | |
| tree | 07ec61f26a6950006978fc1349a75994c5c567c6 /src/main | |
| parent | 3454558b57f1bebc4c9ccd75e2229b3b29b47e14 (diff) | |
| download | vhc-af3436f5befeeb90ec9cd9e2277176a2881b6f64.tar.gz vhc-af3436f5befeeb90ec9cd9e2277176a2881b6f64.tar.bz2 vhc-af3436f5befeeb90ec9cd9e2277176a2881b6f64.zip | |
Corrige erreurs dans ElectricElement (commit auparavant).
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/ElectricElement.cc | 7 | ||||
| -rw-r--r-- | src/main/ElectricElement.h | 4 | ||||
| -rw-r--r-- | src/main/Makefile | 2 |
3 files changed, 2 insertions, 11 deletions
diff --git a/src/main/ElectricElement.cc b/src/main/ElectricElement.cc index 777bf42..32056b5 100644 --- a/src/main/ElectricElement.cc +++ b/src/main/ElectricElement.cc @@ -9,13 +9,6 @@ namespace vhc { -ElectricElement::ElectricElement() { - // TODO Auto-generated constructor stub -} - -ElectricElement::~ElectricElement() { - // TODO Auto-generated destructor stub -} } diff --git a/src/main/ElectricElement.h b/src/main/ElectricElement.h index 527dc72..9a8e5bf 100644 --- a/src/main/ElectricElement.h +++ b/src/main/ElectricElement.h @@ -17,11 +17,9 @@ class ElectricElement: public Element { public: - ElectricElement(); - virtual ~ElectricElement(); - Vector3D electricField(const Vector3D& position) const = 0; + virtual Vector3D electricField(const Vector3D& position) const = 0; virtual std::string getType() const {return "Electric Element";} diff --git a/src/main/Makefile b/src/main/Makefile index ad550ee..9cb11b0 100644 --- a/src/main/Makefile +++ b/src/main/Makefile @@ -14,7 +14,7 @@ LOCALDIR = main # Si un objet nécessite une compilation non-standard (i.e. pas de règle du style Foo.o : Foo.cc Foo.h), rajouter # cette règle. LOCALOBJS = Vector3D.o Particle.o Printable.o Element.o CurvedElement.o StraightElement.o MagneticElement.o \ - CompositeElement.o + CompositeElement.o ElectricElement.o OBJS=$(addprefix $(BINDIR)/$(LOCALDIR)/,$(LOCALOBJS)) .PHONY = lib |