Fix some issues with deprecated header messages
This commit is contained in:
@@ -14,12 +14,10 @@
|
||||
#ifndef CGAL_READ_VTK_IMAGE_DATA_H
|
||||
#define CGAL_READ_VTK_IMAGE_DATA_H
|
||||
|
||||
#ifndef CGAL_NO_DEPRECATED_CODE
|
||||
#include <CGAL/IO/read_vtk_image_data.h>
|
||||
|
||||
#define CGAL_DEPRECATED_HEADER "<CGAL/read_vtk_image_data.h>"
|
||||
#define CGAL_REPLACEMENT_HEADER "<CGAL/IO/read_vtk_image_data.h>"
|
||||
#include <CGAL/Installation/internal/deprecation_warning.h>
|
||||
#endif
|
||||
|
||||
#include <CGAL/IO/read_vtk_image_data.h>
|
||||
|
||||
#endif // CGAL_READ_VTK_IMAGE_DATA_H
|
||||
|
||||
@@ -12,28 +12,8 @@
|
||||
|
||||
#define CGAL_DEPRECATED_HEADER "<CGAL/atomic.h>"
|
||||
#define CGAL_REPLACEMENT_HEADER "<CGAL/config.h>"
|
||||
#include <CGAL/Installation/internal/deprecation_warning.h>
|
||||
|
||||
#include <CGAL/config.h>
|
||||
|
||||
#ifdef CGAL_HAS_THREADS
|
||||
|
||||
# include <atomic>
|
||||
|
||||
namespace CGAL {
|
||||
namespace cpp11 {
|
||||
using std::atomic;
|
||||
|
||||
using std::memory_order_relaxed;
|
||||
using std::memory_order_consume;
|
||||
using std::memory_order_acquire;
|
||||
using std::memory_order_release;
|
||||
using std::memory_order_acq_rel;
|
||||
using std::memory_order_seq_cst;
|
||||
|
||||
using std::atomic_thread_fence;
|
||||
} }
|
||||
#else
|
||||
# define CGAL_NO_ATOMIC "No atomic because CGAL_HAS_NO_THREADS is defined."
|
||||
#endif // CGAL_HAS_THREADS
|
||||
|
||||
#endif // CGAL_ATOMIC_H
|
||||
|
||||
@@ -17,11 +17,6 @@
|
||||
|
||||
#include <CGAL/license/Mesh_3.h>
|
||||
|
||||
|
||||
// #define CGAL_DEPRECATED_HEADER "<CGAL/Mesh_cell_base_3.h>"
|
||||
// #define CGAL_REPLACEMENT_HEADER "<CGAL/Compact_mesh_cell_base_3.h>"
|
||||
// #include <CGAL/Installation/internal/deprecation_warning.h>
|
||||
|
||||
#include <CGAL/Mesh_3/config.h>
|
||||
|
||||
#include <CGAL/Regular_triangulation_cell_base_3.h>
|
||||
|
||||
@@ -16,12 +16,10 @@
|
||||
|
||||
#include <CGAL/license/SMDS_3.h>
|
||||
|
||||
#ifndef CGAL_NO_DEPRECATED_CODE
|
||||
#include <CGAL/facets_in_complex_3_to_triangle_mesh.h>
|
||||
|
||||
#define CGAL_DEPRECATED_HEADER "<CGAL/IO/facets_in_complex_3_to_triangle_mesh.h>"
|
||||
#define CGAL_REPLACEMENT_HEADER "<CGAL/facets_in_complex_3_to_triangle_mesh.h>"
|
||||
#include <CGAL/Installation/internal/deprecation_warning.h>
|
||||
#endif
|
||||
|
||||
#include <CGAL/facets_in_complex_3_to_triangle_mesh.h>
|
||||
|
||||
#endif // CGAL_IO_FACETS_IN_COMPLEX_3_TO_TRIANGLE_MESH_H
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#define CGAL_DEPRECATED_HEADER "<CGAL/result_of.h>"
|
||||
#define CGAL_REPLACEMENT_HEADER "<CGAL/config.h>"
|
||||
#include <CGAL/Installation/internal/deprecation_warning.h>
|
||||
|
||||
#include <CGAL/config.h>
|
||||
|
||||
|
||||
@@ -14,26 +14,21 @@
|
||||
|
||||
#define CGAL_DEPRECATED_HEADER "<CGAL/thread.h>"
|
||||
#define CGAL_REPLACEMENT_HEADER "<CGAL/config.h>"
|
||||
#include <CGAL/Installation/internal/deprecation_warning.h>
|
||||
|
||||
#include <CGAL/config.h>
|
||||
|
||||
/*
|
||||
This file defines the following:
|
||||
- CGAL::cpp11::thread
|
||||
- CGAL::cpp11::atomic
|
||||
- CGAL::cpp11::sleep_for
|
||||
*/
|
||||
|
||||
#include <thread>
|
||||
#include <chrono>
|
||||
#include <CGAL/atomic.h> // for CGAL::cpp11::atomic
|
||||
|
||||
namespace CGAL {
|
||||
|
||||
namespace cpp11 {
|
||||
|
||||
using std::thread;
|
||||
|
||||
inline void sleep_for (double seconds)
|
||||
{
|
||||
// MSVC2013 cannot call `sleep_for()` with other types than
|
||||
|
||||
Reference in New Issue
Block a user