From 5439dbd07e976c8572396ff378fa9852ac18d833 Mon Sep 17 00:00:00 2001
From: Jane Tournois <jane.tournois@gmail.com>
Date: Tue, 24 Aug 2021 18:04:50 +0200
Subject: [PATCH] fix mismatch between two definitions of
 Mesher_level_conflict_status

that were in different namespaces (CGAL and CGAL::Mesh_3)
---
 Mesh_3/include/CGAL/Mesh_3/Mesher_level.h | 11 +----------
 Mesher_level/include/CGAL/Mesher_level.h  | 10 +++++++---
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Mesh_3/include/CGAL/Mesh_3/Mesher_level.h b/Mesh_3/include/CGAL/Mesh_3/Mesher_level.h
index b0c7e357c96..fc2727797d1 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Mesher_level.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Mesher_level.h
@@ -23,6 +23,7 @@
   #include <CGAL/Mesh_3/Profiling_tools.h>
 #endif
 
+#include <CGAL/Mesher_level.h>
 #include <CGAL/Mesh_3/Worksharing_data_structures.h>
 
 #ifdef CGAL_CONCURRENT_MESH_3_PROFILING
@@ -40,16 +41,6 @@
 
 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
diff --git a/Mesher_level/include/CGAL/Mesher_level.h b/Mesher_level/include/CGAL/Mesher_level.h
index af20ffcca0b..7d8de6fffb4 100644
--- a/Mesher_level/include/CGAL/Mesher_level.h
+++ b/Mesher_level/include/CGAL/Mesher_level.h
@@ -18,9 +18,13 @@
 namespace CGAL {
 
 enum Mesher_level_conflict_status {
-  NO_CONFLICT = 0,
-  CONFLICT_BUT_ELEMENT_CAN_BE_RECONSIDERED,
-  CONFLICT_AND_ELEMENT_SHOULD_BE_DROPPED
+  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
 };
 
 struct Null_mesher_level {