Merge pull request #6346 from afabri/Shortes_path-not_reference-GF

Surface_mesh_shortest_path: Make data member a copy
This commit is contained in:
Laurent Rineau 2022-02-24 09:49:34 +01:00
commit 291b68a3b8
9 changed files with 6 additions and 19 deletions

View File

@ -7,8 +7,6 @@
#include <CGAL/AABB_traits.h> #include <CGAL/AABB_traits.h>
#include <CGAL/AABB_tree.h> #include <CGAL/AABB_tree.h>
#include <boost/lexical_cast.hpp>
#include <cstdlib> #include <cstdlib>
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>

View File

@ -4,6 +4,9 @@
#include <CGAL/Random.h> #include <CGAL/Random.h>
#include <CGAL/Surface_mesh_shortest_path.h> #include <CGAL/Surface_mesh_shortest_path.h>
#include <boost/lexical_cast.hpp>
#include <cstdlib>
#include <cstdlib> #include <cstdlib>
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>

View File

@ -331,7 +331,7 @@ private:
}; };
private: private:
const Traits& m_traits; const Traits m_traits;
const Triangle_mesh& m_graph; const Triangle_mesh& m_graph;
Vertex_index_map m_vertexIndexMap; Vertex_index_map m_vertexIndexMap;

View File

@ -4,7 +4,6 @@
#include <CGAL/Random.h> #include <CGAL/Random.h>
#include <CGAL/Simple_cartesian.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Polyhedron_3.h> #include <CGAL/Polyhedron_3.h>

View File

@ -18,7 +18,6 @@
#include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h> #include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h>
#include <CGAL/Surface_mesh_shortest_path/function_objects.h> #include <CGAL/Surface_mesh_shortest_path/function_objects.h>
#include <CGAL/Surface_mesh_shortest_path/barycentric.h> #include <CGAL/Surface_mesh_shortest_path/barycentric.h>
#include <CGAL/Surface_mesh_shortest_path/internal/misc_functions.h>
#include <CGAL/test_util.h> #include <CGAL/test_util.h>
#include "check.h" #include "check.h"
@ -269,5 +268,3 @@ int main(int argc, char* argv[])
return 0; return 0;
} }

View File

@ -5,6 +5,7 @@
#include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits.h> #include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits.h>
#include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h> #include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h>
#include <CGAL/Surface_mesh_shortest_path/internal/misc_functions.h>
#include <CGAL/boost/graph/iterator.h> #include <CGAL/boost/graph/iterator.h>
@ -104,6 +105,3 @@ int main(int argc, char* argv[])
return 0; return 0;
} }

View File

@ -5,6 +5,7 @@
#include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits.h> #include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits.h>
#include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h> #include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h>
#include <CGAL/Surface_mesh_shortest_path/internal/misc_functions.h>
#include <CGAL/boost/graph/iterator.h> #include <CGAL/boost/graph/iterator.h>
@ -152,5 +153,3 @@ int main(int argc, char* argv[])
return 0; return 0;
} }

View File

@ -5,7 +5,6 @@
#include <CGAL/Random.h> #include <CGAL/Random.h>
#include <CGAL/Simple_cartesian.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Polyhedron_3.h> #include <CGAL/Polyhedron_3.h>
@ -17,7 +16,6 @@
#include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h> #include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h>
#include <CGAL/Surface_mesh_shortest_path/function_objects.h> #include <CGAL/Surface_mesh_shortest_path/function_objects.h>
#include <CGAL/Surface_mesh_shortest_path/barycentric.h> #include <CGAL/Surface_mesh_shortest_path/barycentric.h>
#include <CGAL/Surface_mesh_shortest_path/internal/misc_functions.h>
#include <CGAL/test_util.h> #include <CGAL/test_util.h>
#include "check.h" #include "check.h"
@ -188,6 +186,3 @@ int main(int argc, char* argv[])
} }
return 0; return 0;
} }

View File

@ -1,4 +1,3 @@
#include <CGAL/Simple_cartesian.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Polyhedron_3.h> #include <CGAL/Polyhedron_3.h>
@ -6,7 +5,6 @@
#include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits.h> #include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits.h>
#include <CGAL/Surface_mesh_shortest_path/function_objects.h> #include <CGAL/Surface_mesh_shortest_path/function_objects.h>
#include <CGAL/Surface_mesh_shortest_path/barycentric.h> #include <CGAL/Surface_mesh_shortest_path/barycentric.h>
#include <CGAL/Surface_mesh_shortest_path/internal/misc_functions.h>
#include <CGAL/boost/graph/iterator.h> #include <CGAL/boost/graph/iterator.h>