From ddc1c4ea924d1340098dd3be33ac82403d30d083 Mon Sep 17 00:00:00 2001 From: Marc Glisse Date: Sun, 11 Jul 2010 17:28:04 +0000 Subject: [PATCH] Try a fix for the [io]fstream(Qstring) ambiguity in C++0X. If it doesn't break anything, copy everywhere. --- Voronoi_diagram_2/demo/Voronoi_diagram_2/my_window.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/my_window.h b/Voronoi_diagram_2/demo/Voronoi_diagram_2/my_window.h index 6e4dd693311..8e9940ec2ff 100644 --- a/Voronoi_diagram_2/demo/Voronoi_diagram_2/my_window.h +++ b/Voronoi_diagram_2/demo/Voronoi_diagram_2/my_window.h @@ -462,7 +462,7 @@ private slots: CGAL::Timer timer; vvd->clear(); - std::ifstream f(fileName); + std::ifstream f(fileName.ascii()); assert( f ); int counter = 0;