From 718c1a9f006c34074adf579f7c3f2437a8f79160 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 1 Oct 2008 13:45:08 +0000 Subject: [PATCH] Fix MSVCisms: missing typenames. --- .gitignore | 1 + .../demo/Triangulation_2/RegularTriangulationRemoveVertex.h | 2 +- GraphicsView/include/CGAL/Qt/GraphicsViewCircleInput.h | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e77a6ce74e7..f5b6fbc4b85 100644 --- a/.gitignore +++ b/.gitignore @@ -68,6 +68,7 @@ GraphicsView/demo/Triangulation_2/*.exe GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2 GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2 GraphicsView/demo/Triangulation_2/Makefile +GraphicsView/demo/Triangulation_2/Regular_triangulation_2 GraphicsView/demo/Triangulation_2/qrc_*.cxx GraphicsView/demo/Triangulation_2/ui_*.h GraphicsView/doc_tex/GraphicsView.tex diff --git a/GraphicsView/demo/Triangulation_2/RegularTriangulationRemoveVertex.h b/GraphicsView/demo/Triangulation_2/RegularTriangulationRemoveVertex.h index 39d1af4702c..2afff7e03e9 100644 --- a/GraphicsView/demo/Triangulation_2/RegularTriangulationRemoveVertex.h +++ b/GraphicsView/demo/Triangulation_2/RegularTriangulationRemoveVertex.h @@ -48,7 +48,7 @@ RegularTriangulationRemoveVertex::mousePressEvent(QGraphicsSceneMouseEvent *e if(dt->number_of_vertices() == 0){ dt->clear(); }else { - typedef Kernel_traits::Kernel K; + typedef typename Kernel_traits::Kernel K; Converter convert; typename T::Vertex_handle selected_vertex = dt->nearest_power_vertex(convert(event->scenePos())); dt->remove(selected_vertex); diff --git a/GraphicsView/include/CGAL/Qt/GraphicsViewCircleInput.h b/GraphicsView/include/CGAL/Qt/GraphicsViewCircleInput.h index 9b4573a7d93..cb6943bb2e5 100644 --- a/GraphicsView/include/CGAL/Qt/GraphicsViewCircleInput.h +++ b/GraphicsView/include/CGAL/Qt/GraphicsViewCircleInput.h @@ -96,7 +96,7 @@ GraphicsViewCircleInput::mousePressEvent(QGraphicsSceneMouseEvent *event) qcircle->hide(); q = convert(qq); if(m_pointsOnCircle == 1){ - K::FT sd = squared_distance(p,q); + typename K::FT sd = squared_distance(p,q); emit generate(CGAL::make_object(std::make_pair(p, sd))); } else { emit generate(CGAL::make_object(std::make_pair(p, q))); @@ -145,7 +145,7 @@ GraphicsViewCircleInput::mouseMoveEvent(QGraphicsSceneMouseEvent *event) return; } else { if(m_pointsOnCircle == 1){ - K::FT sd = squared_distance(p,q); + typename K::FT sd = squared_distance(p,q); bb = construct_circle(p, sd).bbox(); } else { bb = construct_circle(p, q).bbox();