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

fix compilation issues and warnings

This commit is contained in:
Sébastien Loriot 2024-04-23 10:28:56 +02:00
parent 32609b07fd
commit d1688e0151
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Kinetic_space_partition/include/CGAL/KSP_3/Data_structure.h
View File

@ -26,6 +26,8 @@
#include <CGAL/KSP_3/Support_plane.h> #include <CGAL/KSP_3/Support_plane.h>
#include <CGAL/KSP_3/Intersection_graph.h> #include <CGAL/KSP_3/Intersection_graph.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
namespace CGAL { namespace CGAL {
namespace KSP_3 { namespace KSP_3 {
namespace internal { namespace internal {
@ -245,7 +247,7 @@ private:
public: public:
Data_structure(const Parameters& parameters, const std::string &prefix) : to_exact(), from_exact(), m_parameters(parameters), m_prefix(prefix) { Data_structure(const Parameters& parameters, const std::string &prefix) : to_exact(), from_exact(), m_parameters(parameters), m_prefix(prefix) {
bool k = std::is_same<EPECK, Intersection_kernel>(); bool k = std::is_same_v<Exact_predicates_exact_constructions_kernel, Intersection_kernel>;
std::string kern = k ? "EPECK" : "GMPQ"; std::string kern = k ? "EPECK" : "GMPQ";
#if _DEBUG #if _DEBUG
eventlog = std::ofstream("propagation_dbg" + kern + ".txt"); eventlog = std::ofstream("propagation_dbg" + kern + ".txt");
@ -465,7 +467,7 @@ public:
std::size_t num; std::size_t num;
Vector_2 tt = to_target.vector(), ts = to_source.vector(); // Vector_2 tt = to_target.vector(), ts = to_source.vector();
IkVector_2 tt2 = to_target2.vector(), ts2 = to_source2.vector(); IkVector_2 tt2 = to_target2.vector(), ts2 = to_source2.vector();
bool ccw = (tt2.x() * ts2.y() - tt2.y() * ts2.x()) < 0; bool ccw = (tt2.x() * ts2.y() - tt2.y() * ts2.x()) < 0;

2
Kinetic_space_partition/include/CGAL/KSP_3/Initializer.h
View File

@ -138,7 +138,7 @@ public:
/* /*
// What data exists here and needs to be compared? The vertex positions of the igraph are identical and the number of faces too // What data exists here and needs to be compared? The vertex positions of the igraph are identical and the number of faces too
bool k = std::is_same<EPECK, Intersection_kernel>(); bool k = std::is_same_v<EPECK, Intersection_kernel>;
std::string kern = k ? "EPECK" : "GMPQ"; std::string kern = k ? "EPECK" : "GMPQ";
#if _DEBUG #if _DEBUG
std::ofstream fs("after_init_dbg" + kern + ".txt"); std::ofstream fs("after_init_dbg" + kern + ".txt");

2
Kinetic_space_partition/include/CGAL/KSP_3/Support_plane.h
View File

@ -132,7 +132,7 @@ public:
}; };
private: private:
static constexpr bool identical_kernel = !std::is_same<Kernel, Intersection_kernel>(); static constexpr bool identical_kernel = !std::is_same_v<Kernel, Intersection_kernel>;
std::shared_ptr<Data> m_data; std::shared_ptr<Data> m_data;

3
Kinetic_space_partition/include/CGAL/Kinetic_space_partition_3.h
View File

@ -777,13 +777,12 @@ public:
std::vector<typename Intersection_kernel::Point_3> vtx; std::vector<typename Intersection_kernel::Point_3> vtx;
std::vector<Index> vtx_index; std::vector<Index> vtx_index;
using LCC_kernel = CGAL::Kernel_traits<typename LCC::Point>::Kernel; using LCC_kernel = typename CGAL::Kernel_traits<typename LCC::Point>::Kernel;
using To_lcc = CGAL::Cartesian_converter<Intersection_kernel, LCC_kernel>; using To_lcc = CGAL::Cartesian_converter<Intersection_kernel, LCC_kernel>;
To_lcc to_lcc; To_lcc to_lcc;
From_exact from_exact;
To_exact to_exact; To_exact to_exact;
std::vector<Index> faces_of_volume, vtx_of_face; std::vector<Index> faces_of_volume, vtx_of_face;