Use CGAL macros for indicating deprecated headers.

aympelle · aympelle · commit 566ad109ebcb · 2014-05-16T13:40:49.000+02:00
diff --git a/Mesh_3/include/CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h b/Mesh_3/include/CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h
@@ -35,11 +35,9 @@
 #  pragma warning(disable:4180) // qualifier applied to function type has no meaning; ignored
 #endif
 
-#ifdef __GNUG__
-#warning deprecated : use <CGAL/Labeled_mesh_domain_3.h> instead.
-#else
-#pragma message("WARNING (deprecated) : use <CGAL/Labeled_mesh_domain_3.h> instead.")
-#endif
+#define CGAL_DEPRECATED_HEADER "<CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h>"
+#define CGAL_REPLACEMENT_HEADER "<CGAL/Implicit_to_labeling_function_wrapper.h>"
+#include <CGAL/internal/deprecation_warning.h>
 
 #include <vector>
 
diff --git a/Mesh_3/include/CGAL/Mesh_3/Labeled_mesh_domain_3.h b/Mesh_3/include/CGAL/Mesh_3/Labeled_mesh_domain_3.h
@@ -26,11 +26,9 @@
 #ifndef CGAL_MESH_3_LABELED_MESH_DOMAIN_3_H
 #define CGAL_MESH_3_LABELED_MESH_DOMAIN_3_H
 
-#ifdef __GNUG__
-#warning deprecated : use <CGAL/Labeled_mesh_domain_3.h> instead.
-#else
-#pragma message("WARNING (deprecated) : use <CGAL/Labeled_mesh_domain_3.h> instead.")
-#endif
+#define CGAL_DEPRECATED_HEADER "<CGAL/Mesh_3/Labeled_mesh_domain_3.h>"
+#define CGAL_REPLACEMENT_HEADER "<CGAL/Labeled_mesh_domain_3.h>"
+#include <CGAL/internal/deprecation_warning.h>
 
 #include <CGAL/Mesh_3/config.h>
 
diff --git a/Mesh_3/test/Mesh_3/test_mesh_3_implicit_vector_to_labeled_function_wrapper.cpp b/Mesh_3/test/Mesh_3/test_mesh_3_implicit_vector_to_labeled_function_wrapper.cpp
@@ -1,3 +1,5 @@
+#define CGAL_NO_DEPRECATION_WARNINGS 1
+
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h>
 
diff --git a/Mesh_3/test/Mesh_3/test_mesh_3_labeled_mesh_domain_3.cpp b/Mesh_3/test/Mesh_3/test_mesh_3_labeled_mesh_domain_3.cpp
@@ -22,11 +22,12 @@
 // File Description : 
 //******************************************************************************
 
+#define CGAL_NO_DEPRECATION_WARNINGS 1
+
 #include "test_meshing_utilities.h"
 #include <CGAL/Mesh_3/Labeled_mesh_domain_3.h>
 #include <CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h>
 
-
 template <typename K>
 struct LM3_tester
 {
diff --git a/Mesh_3/test/Mesh_3/test_mesh_implicit_domains.cpp b/Mesh_3/test/Mesh_3/test_mesh_implicit_domains.cpp
@@ -7,6 +7,7 @@
 //******************************************************************************
 
 
+#define CGAL_NO_DEPRECATION_WARNINGS 1
 
 #include "debug.h"
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#define CGAL_NO_DEPRECATION_WARNINGS 1`
	`2`	`+`
`1`	`3`	`#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>`
`2`	`4`	`#include <CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h>`
`3`	`5`