songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix c++11 errors

This commit is contained in:
Maxime Gimeno 2020-01-13 16:20:51 +01:00
parent 8ac23b392a
commit 6dccde35ef
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h
View File

@ -1201,7 +1201,7 @@ private:
if (m_debugOutput) if (m_debugOutput)
{ {
std::cout << "\t Distance to target: " << currentNodeDistance << std::endl; std::cout << "\t Distance to target: " << currentNodeDistance << std::endl;
std::cout << "\t Is there a current occupier? " << (currentOccupier.first != nullptr) << std::endl; std::cout << "\t Is there a current occupier? " << (currentOccupier.first != NULL) << std::endl;
} }
// the relative position of the ray between node.source() and node.target_vertex() and the ray // the relative position of the ray between node.source() and node.target_vertex() and the ray
@ -1329,7 +1329,7 @@ private:
} }
// If equal times, give priority to vertex sources since it's cleaner and simpler to handle than interval windows // If equal times, give priority to vertex sources since it's cleaner and simpler to handle than interval windows
if (currentClosest.first == nullptr || if (currentClosest.first == NULL ||
currentClosest.second > currentNodeDistance || currentClosest.second > currentNodeDistance ||
(currentClosest.second == currentNodeDistance && node->node_type() == Cone_tree_node::VERTEX_SOURCE)) (currentClosest.second == currentNodeDistance && node->node_type() == Cone_tree_node::VERTEX_SOURCE))
{ {
@ -2070,7 +2070,7 @@ private:
std::cout << "Prio Queue size = " << m_expansionPriqueue.size() << std::endl; std::cout << "Prio Queue size = " << m_expansionPriqueue.size() << std::endl;
std::cout << "Queue:" << std::endl; std::cout << "Queue:" << std::endl;
auto duplicate_queue = m_expansionPriqueue; Expansion_priqueue duplicate_queue = m_expansionPriqueue;
while(duplicate_queue.size() > 0) while(duplicate_queue.size() > 0)
{ {
Cone_expansion_event* event = duplicate_queue.top(); Cone_expansion_event* event = duplicate_queue.top();

2
Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/function_objects.h
View File

@ -622,7 +622,7 @@ public:
{ {
FT angle_sum = 0; FT angle_sum = 0;
for(halfedge_descriptor h : halfedges_around_target(v, g)) BOOST_FOREACH(halfedge_descriptor h, halfedges_around_target(v, g))
{ {
if(is_border(h, g)) if(is_border(h, g))
continue; continue;

4
Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_6.cpp
View File

@ -22,8 +22,8 @@ int main()
input >> mesh; input >> mesh;
input.close(); input.close();
for (Triangle_mesh::Vertex_index v1 : vertices(mesh)) BOOST_FOREACH(Triangle_mesh::Vertex_index v1, vertices(mesh))
for (Triangle_mesh::Vertex_index v2 : vertices(mesh)) BOOST_FOREACH(Triangle_mesh::Vertex_index v2, vertices(mesh))
{ {
Surface_mesh_shortest_path shortest_paths(mesh); Surface_mesh_shortest_path shortest_paths(mesh);
shortest_paths.add_source_point(v1); shortest_paths.add_source_point(v1);