modifications due to Windows incompatibility

This commit is contained in:
Iordan Iordanov 2016-04-29 20:47:31 +02:00
parent 8d8d97b490
commit 7f65e45cbb
3 changed files with 10 additions and 9 deletions

View File

@ -808,10 +808,10 @@ int main(int argc, char **argv)
// Import resources from libCGALQt4.
// See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
Q_INIT_RESOURCE(File);
Q_INIT_RESOURCE(Triangulation_2);
Q_INIT_RESOURCE(Input);
Q_INIT_RESOURCE(CGAL);
//Q_INIT_RESOURCE(File);
//Q_INIT_RESOURCE(Triangulation_2);
//Q_INIT_RESOURCE(Input);
//Q_INIT_RESOURCE(CGAL);
MainWindow mainWindow;
mainWindow.show();

View File

@ -73,7 +73,7 @@ public:
CGAL_triangulation_postcondition( this->is_valid() );
}
void insert_dummy_points(std::vector<Point>&);
void insert_dummy_points(std::vector<typename Gt::Point_2>&);
};

View File

@ -197,11 +197,12 @@ namespace CGAL {
}
*/
template < class GT, class TDS >
void Periodic_4_hyperbolic_Delaunay_triangulation_2<GT, TDS>::insert_dummy_points(std::vector<typename GT::Point_2>& all_points) {
template < class Gt, class Tds >
void Periodic_4_hyperbolic_Delaunay_triangulation_2<Gt, Tds>::
insert_dummy_points(std::vector<typename Gt::Point_2>& all_points) {
std::vector<typename GT::Point_2> inner_points, points_on_boundary, points_on_vertex;
compute_dummy_points<GT>(inner_points, points_on_boundary, points_on_vertex);
std::vector<typename Gt::Point_2> inner_points, points_on_boundary, points_on_vertex;
compute_dummy_points<Gt>(inner_points, points_on_boundary, points_on_vertex);
all_points = inner_points;