Skip to content

Commit 4573f3a

Browse files
committed
Fix c3t3_plugin after rebase
1 parent f62ead9 commit 4573f3a

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp

+1-6
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,9 @@ Polyhedron_demo_c3t3_binary_io_plugin::load(QFileInfo fileinfo) {
7272
item->setName(fileinfo.baseName());
7373
item->setScene(scene);
7474

75-
7675
if(item->load_binary(in)) {
7776
return item;
7877
}
79-
8078
item->c3t3().clear();
8179
in.seekg(0);
8280
if(try_load_other_binary_format(in, item->c3t3())) {
@@ -85,7 +83,6 @@ Polyhedron_demo_c3t3_binary_io_plugin::load(QFileInfo fileinfo) {
8583
item->resetCutPlane();
8684
return item;
8785
}
88-
8986
item->c3t3().clear();
9087
in.seekg(0);
9188
if(try_load_a_cdt_3(in, item->c3t3())) {
@@ -481,9 +478,8 @@ try_load_other_binary_format(std::istream& is, C3t3& c3t3)
481478
C3t3::Triangulation,
482479
Update_vertex<Fake_c3t3::Triangulation, C3t3::Triangulation>,
483480
Update_cell>(is, c3t3.triangulation(),
484-
Update_vertex(),
481+
Update_vertex<Fake_c3t3::Triangulation, C3t3::Triangulation>(),
485482
Update_cell()
486-
#ifdef CGAL_CXX11
487483
,
488484
/* call_back: a C++11 lambda */
489485
[](std::istream& is,
@@ -526,7 +522,6 @@ try_load_other_binary_format(std::istream& is, C3t3& c3t3)
526522
last_pos = curr;
527523
}
528524
}
529-
#endif // CGAL_CXX11
530525
);
531526
std::cerr << "DONE.\n";
532527

0 commit comments

Comments
 (0)