From 868ecce2347835591690f927c16fddf1ece659bf Mon Sep 17 00:00:00 2001 From: Basile Sauvage Date: Thu, 21 Aug 2014 15:54:46 +0200 Subject: [PATCH] correction des template dans les diag de voronoi --- include/Algo/Geometry/voronoiDiagrams.h | 3 +-- include/Algo/Geometry/voronoiDiagrams.hpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/Algo/Geometry/voronoiDiagrams.h b/include/Algo/Geometry/voronoiDiagrams.h index 7cfff1eb..711f63e6 100644 --- a/include/Algo/Geometry/voronoiDiagrams.h +++ b/include/Algo/Geometry/voronoiDiagrams.h @@ -57,7 +57,7 @@ public : virtual void setSeeds_fromVector (const std::vector&); virtual void setSeeds_random (unsigned int nbseeds); const std::vector& getBorder () { return border; } - void setCost (const EdgeAttribute& c); + void setCost (const EdgeAttribute& c); Dart computeDiagram (); virtual void computeDiagram_incremental (unsigned int nbseeds); @@ -74,7 +74,6 @@ protected : template class CentroidalVoronoiDiagram : public VoronoiDiagram { - typedef typename PFP::MAP MAP; typedef typename PFP::MAP MAP; typedef typename PFP::VEC3 VEC3; typedef typename PFP::REAL REAL; diff --git a/include/Algo/Geometry/voronoiDiagrams.hpp b/include/Algo/Geometry/voronoiDiagrams.hpp index 54d2e14e..26083734 100644 --- a/include/Algo/Geometry/voronoiDiagrams.hpp +++ b/include/Algo/Geometry/voronoiDiagrams.hpp @@ -102,7 +102,7 @@ void VoronoiDiagram::initFrontWithSeeds () } template -void VoronoiDiagram::setCost (const EdgeAttribute& c) +void VoronoiDiagram::setCost (const EdgeAttribute& c) { edgeCost = c; } -- GitLab