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

Deprecate CGAL headers for threads, atomic and result_of, and move their content to config.h as fallback

This commit is contained in:
Maxime Gimeno 2021-05-04 11:45:57 +02:00
parent 56e09b7a7b
commit e9b7595fff
23 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/comparator_profiler.h
View File

@ -19,7 +19,6 @@
#include <CGAL/Apollonius_graph_2/basic.h> #include <CGAL/Apollonius_graph_2/basic.h>
#include <CGAL/atomic.h>
namespace CGAL { namespace CGAL {

1
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/predicate_profiler.h
View File

@ -19,7 +19,6 @@
#include <CGAL/Apollonius_graph_2/basic.h> #include <CGAL/Apollonius_graph_2/basic.h>
#include <CGAL/atomic.h>
#define AG2_PROFILE_PREDICATES #define AG2_PROFILE_PREDICATES

1
Arrangement_on_surface_2/include/CGAL/Arr_circle_segment_traits_2.h
View File

@ -23,7 +23,6 @@
* The header file for the Arr_circle_segment_traits_2<Kenrel> class. * The header file for the Arr_circle_segment_traits_2<Kenrel> class.
*/ */
#include <CGAL/atomic.h>
#include <CGAL/tags.h> #include <CGAL/tags.h>
#include <CGAL/Arr_tags.h> #include <CGAL/Arr_tags.h>
#include <CGAL/Arr_geometry_traits/Circle_segment_2.h> #include <CGAL/Arr_geometry_traits/Circle_segment_2.h>

1
Arrangement_on_surface_2/include/CGAL/Arr_conic_traits_2.h
View File

@ -24,7 +24,6 @@
#include <fstream> #include <fstream>
#include <CGAL/atomic.h>
#include <CGAL/tags.h> #include <CGAL/tags.h>
#include <CGAL/Arr_tags.h> #include <CGAL/Arr_tags.h>
#include <CGAL/Arr_geometry_traits/Conic_arc_2.h> #include <CGAL/Arr_geometry_traits/Conic_arc_2.h>

1
Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h
View File

@ -28,7 +28,6 @@
#include <string.h> #include <string.h>
#include <CGAL/basic.h> #include <CGAL/basic.h>
#include <CGAL/atomic.h>
#include <CGAL/Arr_enums.h> #include <CGAL/Arr_enums.h>
#include <CGAL/Arr_tags.h> #include <CGAL/Arr_tags.h>

1
Box_intersection_d/include/CGAL/Box_intersection_d/Box_d.h
View File

@ -21,7 +21,6 @@
#include <CGAL/Bbox_2.h> #include <CGAL/Bbox_2.h>
#include <CGAL/Bbox_3.h> #include <CGAL/Bbox_3.h>
#include <CGAL/Box_intersection_d/box_limits.h> #include <CGAL/Box_intersection_d/box_limits.h>
#include <CGAL/atomic.h>
#include <algorithm> #include <algorithm>
#include <array> #include <array>

1
CGAL_Core/include/CGAL/CORE/CoreDefs.h
View File

@ -29,7 +29,6 @@
#define _CORE_COREDEFS_H_ #define _CORE_COREDEFS_H_
#include <CGAL/CORE/extLong.h> #include <CGAL/CORE/extLong.h>
#include <CGAL/atomic.h>
#include <CGAL/disable_warnings.h> #include <CGAL/disable_warnings.h>
#ifdef CGAL_HEADER_ONLY #ifdef CGAL_HEADER_ONLY

3
Installation/include/CGAL/atomic.h
View File

@ -10,6 +10,9 @@
#ifndef CGAL_ATOMIC_H #ifndef CGAL_ATOMIC_H
#define CGAL_ATOMIC_H #define CGAL_ATOMIC_H
#define CGAL_DEPRECATED_HEADER "<CGAL/atomic.h>"
#define CGAL_REPLACEMENT_HEADER "<CGAL/config.h>"
#include <CGAL/config.h> #include <CGAL/config.h>
#ifdef CGAL_HAS_THREADS #ifdef CGAL_HAS_THREADS

13
Installation/include/CGAL/config.h
View File

@ -645,6 +645,9 @@ using std::max;
# include <unordered_set> # include <unordered_set>
# include <unordered_map> # include <unordered_map>
# include <functional> # include <functional>
# include <thread>
# include <chrono>
# include <atomic>
// //
namespace CGAL { namespace CGAL {
// //
@ -663,6 +666,16 @@ namespace CGAL {
using std::is_enum; using std::is_enum;
using std::unordered_set; using std::unordered_set;
using std::unordered_map; using std::unordered_map;
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;
using std::thread;
} }
// //
namespace cpp0x = cpp11; namespace cpp0x = cpp11;

1
Mesh_3/include/CGAL/Mesh_3/Mesher_3.h
View File

@ -36,7 +36,6 @@
#include <CGAL/Mesher_level_visitors.h> #include <CGAL/Mesher_level_visitors.h>
#include <CGAL/Kernel_traits.h> #include <CGAL/Kernel_traits.h>
#include <CGAL/point_generators_3.h> #include <CGAL/point_generators_3.h>
#include <CGAL/atomic.h>
#ifdef CGAL_MESH_3_USE_OLD_SURFACE_RESTRICTED_DELAUNAY_UPDATE #ifdef CGAL_MESH_3_USE_OLD_SURFACE_RESTRICTED_DELAUNAY_UPDATE
#include <CGAL/Surface_mesher/Surface_mesher_visitor.h> #include <CGAL/Surface_mesher/Surface_mesher_visitor.h>

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

@ -23,7 +23,6 @@
#include <CGAL/Mesh_3/Profiling_tools.h> #include <CGAL/Mesh_3/Profiling_tools.h>
#endif #endif
#include <CGAL/atomic.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

1
Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
View File

@ -46,7 +46,6 @@
#include <CGAL/iterator.h> #include <CGAL/iterator.h>
#include <CGAL/number_utils.h> #include <CGAL/number_utils.h>
#include <CGAL/Delaunay_triangulation_3.h> #include <CGAL/Delaunay_triangulation_3.h>
#include <CGAL/atomic.h>
#include <CGAL/boost/iterator/transform_iterator.hpp> #include <CGAL/boost/iterator/transform_iterator.hpp>

1
Mesh_3/include/CGAL/Mesh_3/Refine_cells_3.h
View File

@ -26,7 +26,6 @@
#include <tbb/blocked_range.h> #include <tbb/blocked_range.h>
#include <tbb/parallel_for.h> #include <tbb/parallel_for.h>
#endif #endif
#include <CGAL/atomic.h>
#include <CGAL/Meshes/Filtered_deque_container.h> #include <CGAL/Meshes/Filtered_deque_container.h>
#include <CGAL/Meshes/Filtered_multimap_container.h> #include <CGAL/Meshes/Filtered_multimap_container.h>

1
Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
View File

@ -41,7 +41,6 @@
#include <CGAL/Mesh_3/Dump_c3t3.h> #include <CGAL/Mesh_3/Dump_c3t3.h>
#include <CGAL/Object.h> #include <CGAL/Object.h>
#include <CGAL/atomic.h>
#include <boost/format.hpp> #include <boost/format.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>

1
Mesh_3/include/CGAL/Mesh_3/Refine_facets_manifold_base.h
View File

@ -19,7 +19,6 @@
#include <CGAL/Mesh_facet_topology.h> #include <CGAL/Mesh_facet_topology.h>
#include <CGAL/atomic.h>
#include <CGAL/utility.h> #include <CGAL/utility.h>
#include <CGAL/Time_stamper.h> #include <CGAL/Time_stamper.h>

1
Mesh_3/include/CGAL/refine_mesh_3.h
View File

@ -28,7 +28,6 @@
#include <CGAL/Mesh_3/Mesher_3.h> #include <CGAL/Mesh_3/Mesher_3.h>
#include <CGAL/Mesh_error_code.h> #include <CGAL/Mesh_error_code.h>
#include <CGAL/optimize_mesh_3.h> #include <CGAL/optimize_mesh_3.h>
#include <CGAL/atomic.h>
#include <boost/parameter/preprocessor.hpp> #include <boost/parameter/preprocessor.hpp>

3
Nef_3/include/CGAL/Nef_3/SNC_indexed_items.h
View File

@ -15,9 +15,6 @@
#include <CGAL/license/Nef_3.h> #include <CGAL/license/Nef_3.h>
#include <CGAL/atomic.h>
#include <CGAL/Nef_3/Vertex.h> #include <CGAL/Nef_3/Vertex.h>
#include <CGAL/Nef_3/Halfedge.h> #include <CGAL/Nef_3/Halfedge.h>
#include <CGAL/Nef_3/Halffacet.h> #include <CGAL/Nef_3/Halffacet.h>

1
Number_types/include/CGAL/Counted_number.h
View File

@ -19,7 +19,6 @@
#define CGAL_COUNTED_NUMBER_H #define CGAL_COUNTED_NUMBER_H
#include <CGAL/number_type_basic.h> #include <CGAL/number_type_basic.h>
#include <CGAL/atomic.h>
#include <CGAL/boost/iterator/transform_iterator.hpp> // for Root_of_selector #include <CGAL/boost/iterator/transform_iterator.hpp> // for Root_of_selector
#include <iostream> #include <iostream>

1
Point_set_processing_3/include/CGAL/Point_set_processing_3/internal/Callback_wrapper.h
View File

@ -16,7 +16,6 @@
#include <functional> #include <functional>
#include <CGAL/thread.h>
namespace CGAL { namespace CGAL {
namespace Point_set_processing_3 { namespace Point_set_processing_3 {

1
Polyhedron/demo/Polyhedron/include/run_with_qprogressdialog.h
View File

@ -3,7 +3,6 @@
#include <QProgressDialog> #include <QProgressDialog>
#include <CGAL/Real_timer.h> #include <CGAL/Real_timer.h>
#include <CGAL/thread.h>
#include "Callback_signaler.h" #include "Callback_signaler.h"

1
STL_Extension/include/CGAL/Concurrent_compact_container.h
View File

@ -31,7 +31,6 @@
#include <CGAL/iterator.h> #include <CGAL/iterator.h>
#include <CGAL/CC_safe_handle.h> #include <CGAL/CC_safe_handle.h>
#include <CGAL/Time_stamper.h> #include <CGAL/Time_stamper.h>
#include <CGAL/atomic.h>
#include <tbb/enumerable_thread_specific.h> #include <tbb/enumerable_thread_specific.h>
#include <tbb/queuing_mutex.h> #include <tbb/queuing_mutex.h>

1
STL_Extension/include/CGAL/Time_stamper.h
View File

@ -13,7 +13,6 @@
#define CGAL_TIME_STAMPER_H #define CGAL_TIME_STAMPER_H
#include <CGAL/Has_timestamp.h> #include <CGAL/Has_timestamp.h>
#include <CGAL/atomic.h>
namespace CGAL { namespace CGAL {

3
STL_Extension/include/CGAL/thread.h
View File

@ -12,6 +12,9 @@
#ifndef CGAL_THREAD_H #ifndef CGAL_THREAD_H
#define CGAL_THREAD_H #define CGAL_THREAD_H
#define CGAL_DEPRECATED_HEADER "<CGAL/thread.h>"
#define CGAL_REPLACEMENT_HEADER "<CGAL/config.h>"
#include <CGAL/config.h> #include <CGAL/config.h>
/* /*