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

Merge remote-tracking branch 'cgal/5.3.x-branch'

This commit is contained in:
Sébastien Loriot 2021-08-25 19:33:46 +02:00
parent 04a3f683ec 3d77cbd804
commit 1a65f4ca0a
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Mesh_3/include/CGAL/Mesh_3/Mesher_level.h
View File

@ -23,6 +23,7 @@
#include <CGAL/Mesh_3/Profiling_tools.h> #include <CGAL/Mesh_3/Profiling_tools.h>
#endif #endif
#include <CGAL/Mesher_level.h>
#include <CGAL/Mesh_3/Worksharing_data_structures.h> #include <CGAL/Mesh_3/Worksharing_data_structures.h>
#ifdef CGAL_CONCURRENT_MESH_3_PROFILING #ifdef CGAL_CONCURRENT_MESH_3_PROFILING
@ -40,16 +41,6 @@
namespace CGAL { namespace Mesh_3 { namespace CGAL { namespace Mesh_3 {
enum Mesher_level_conflict_status {
NO_CONFLICT = 0
, CONFLICT_BUT_ELEMENT_CAN_BE_RECONSIDERED
, CONFLICT_AND_ELEMENT_SHOULD_BE_DROPPED
, THE_FACET_TO_REFINE_IS_NOT_IN_ITS_CONFLICT_ZONE
, ELEMENT_WAS_A_ZOMBIE
, COULD_NOT_LOCK_ZONE
, COULD_NOT_LOCK_ELEMENT
};
/************************************************ /************************************************
* *
* Null_mesher_level class * Null_mesher_level class

10
Mesher_level/include/CGAL/Mesher_level.h
View File

@ -18,9 +18,13 @@
namespace CGAL { namespace CGAL {
enum Mesher_level_conflict_status { enum Mesher_level_conflict_status {
NO_CONFLICT = 0, NO_CONFLICT = 0
CONFLICT_BUT_ELEMENT_CAN_BE_RECONSIDERED, , CONFLICT_BUT_ELEMENT_CAN_BE_RECONSIDERED
CONFLICT_AND_ELEMENT_SHOULD_BE_DROPPED , CONFLICT_AND_ELEMENT_SHOULD_BE_DROPPED
, THE_FACET_TO_REFINE_IS_NOT_IN_ITS_CONFLICT_ZONE
, ELEMENT_WAS_A_ZOMBIE
, COULD_NOT_LOCK_ZONE
, COULD_NOT_LOCK_ELEMENT
}; };
struct Null_mesher_level { struct Null_mesher_level {