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

Mesh_3

This commit is contained in:
Andreas Fabri 2018-01-18 08:49:52 +00:00
parent 09f3236d38
commit 5efce459da
47 changed files with 136 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BGL/include/CGAL/boost/graph/named_function_params.h
View File

@ -19,6 +19,8 @@
#ifndef CGAL_BOOST_GRAPH_NAMED_FUNCTION_PARAMS_H #ifndef CGAL_BOOST_GRAPH_NAMED_FUNCTION_PARAMS_H
#define CGAL_BOOST_GRAPH_NAMED_FUNCTION_PARAMS_H #define CGAL_BOOST_GRAPH_NAMED_FUNCTION_PARAMS_H
#include <CGAL/disable_warnings.h>
#include <CGAL/basic.h> #include <CGAL/basic.h>
#include <CGAL/boost/graph/properties.h> #include <CGAL/boost/graph/properties.h>
@ -198,4 +200,6 @@ struct lookup_named_param_def<Tag1, CGAL::cgal_bgl_named_params<T, Tag, Base>, D
}; };
} // boost } // boost
#include <CGAL/enable_warnings.h>
#endif // CGAL_BOOST_GRAPH_NAMED_FUNCTION_PARAMS_HPP #endif // CGAL_BOOST_GRAPH_NAMED_FUNCTION_PARAMS_HPP

4
BGL/include/CGAL/boost/graph/split_graph_into_polylines.h
View File

@ -21,6 +21,8 @@
#ifndef CGAL_SPLIT_GRAPH_INTO_POLYLINES #ifndef CGAL_SPLIT_GRAPH_INTO_POLYLINES
#define CGAL_SPLIT_GRAPH_INTO_POLYLINES #define CGAL_SPLIT_GRAPH_INTO_POLYLINES
#include <CGAL/disable_warnings.h>
#include <map> #include <map>
#include <vector> #include <vector>
#include <utility> #include <utility>
@ -375,4 +377,6 @@ split_graph_into_polylines(const Graph& graph,
} //end of namespace CGAL } //end of namespace CGAL
#include <CGAL/enable_warnings.h>
#endif //CGAL_SPLIT_GRAPH_INTO_POLYLINES #endif //CGAL_SPLIT_GRAPH_INTO_POLYLINES

4
CGAL_ImageIO/include/CGAL/Image_3.h
View File

@ -23,6 +23,8 @@
#ifndef CGAL_IMAGE_3_H #ifndef CGAL_IMAGE_3_H
#define CGAL_IMAGE_3_H #define CGAL_IMAGE_3_H
#include <CGAL/disable_warnings.h>
#include <CGAL/basic.h> #include <CGAL/basic.h>
#include <CGAL/array.h> #include <CGAL/array.h>
@ -532,4 +534,6 @@ Image_3::labellized_trilinear_interpolation
# pragma warning(pop) # pragma warning(pop)
#endif #endif
#include <CGAL/enable_warnings.h>
#endif // CGAL_IMAGE_3_H #endif // CGAL_IMAGE_3_H

1
Installation/include/CGAL/disable_warnings.h
View File

@ -23,6 +23,7 @@
# pragma warning(push) # pragma warning(push)
# pragma warning(disable: 4099) // struct class mixed # pragma warning(disable: 4099) // struct class mixed
# pragma warning(disable: 4127) // conditional expression is constant # pragma warning(disable: 4127) // conditional expression is constant
# pragma warning(disable: 4180) // qualifier applied to function type has no meaning; ignored
# pragma warning(disable: 4355) // 'this' : used in base member initializer list # pragma warning(disable: 4355) // 'this' : used in base member initializer list
# pragma warning(disable: 4510) // default constructor could not be generated # pragma warning(disable: 4510) // default constructor could not be generated
# pragma warning(disable: 4512) // assignment operator could not be generated # pragma warning(disable: 4512) // assignment operator could not be generated

3
Mesh_3/include/CGAL/Gray_image_mesh_domain_3.h
View File

@ -26,6 +26,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Random.h> #include <CGAL/Random.h>
#include <CGAL/Labeled_mesh_domain_3.h> #include <CGAL/Labeled_mesh_domain_3.h>
@ -139,6 +140,6 @@ private:
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_GRAY_IMAGE_MESH_DOMAIN_3_H #endif // CGAL_GRAY_IMAGE_MESH_DOMAIN_3_H

10
Mesh_3/include/CGAL/Implicit_mesh_domain_3.h
View File

@ -29,11 +29,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#if defined(BOOST_MSVC)
# pragma warning(push)
# pragma warning(disable:4180) // qualifier applied to function type has no meaning; ignored
#endif
#include <CGAL/Labeled_mesh_domain_3.h> #include <CGAL/Labeled_mesh_domain_3.h>
#include <CGAL/Implicit_to_labeling_function_wrapper.h> #include <CGAL/Implicit_to_labeling_function_wrapper.h>
@ -91,8 +87,6 @@ private:
} // end namespace CGAL } // end namespace CGAL
#if defined(BOOST_MSVC) #include <CGAL/enable_warnings.h>
# pragma warning(pop)
#endif
#endif // CGAL_IMPLICIT_MESH_DOMAIN_3_H #endif // CGAL_IMPLICIT_MESH_DOMAIN_3_H

4
Mesh_3/include/CGAL/Implicit_to_labeling_function_wrapper.h
View File

@ -33,7 +33,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#if defined(BOOST_MSVC) #if defined(BOOST_MSVC)
# pragma warning(push) # pragma warning(push)
@ -291,4 +291,6 @@ public:
# pragma warning(pop) # pragma warning(pop)
#endif #endif
#include <CGAL/enable_warnings.h>
#endif // CGAL_IMPLICIT_TO_LABELING_FUNCTION_WRAPPER_H #endif // CGAL_IMPLICIT_TO_LABELING_FUNCTION_WRAPPER_H

4
Mesh_3/include/CGAL/Labeled_image_mesh_domain_3.h
View File

@ -30,7 +30,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Random.h> #include <CGAL/Random.h>
#include <CGAL/Labeled_mesh_domain_3.h> #include <CGAL/Labeled_mesh_domain_3.h>
@ -158,6 +158,6 @@ private:
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_LABELED_IMAGE_MESH_DOMAIN_3_H #endif // CGAL_LABELED_IMAGE_MESH_DOMAIN_3_H

3
Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
View File

@ -29,6 +29,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Mesh_3/config.h> #include <CGAL/Mesh_3/config.h>
@ -721,4 +722,6 @@ Labeled_mesh_domain_3<F,BGT,Null>::Construct_initial_points::operator()(
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // LABELLED_MESH_TRAITS_3_H_ #endif // LABELLED_MESH_TRAITS_3_H_

3
Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
View File

@ -28,6 +28,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Mesh_3/config.h> #include <CGAL/Mesh_3/config.h>
#include <CGAL/use.h> #include <CGAL/use.h>
@ -3943,4 +3944,6 @@ check_no_inside_vertices(const Facet_vector& facets) const
} // end namespace Mesh_3 } // end namespace Mesh_3
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESH_3_C3T3_HELPERS_H #endif // CGAL_MESH_3_C3T3_HELPERS_H

3
Mesh_3/include/CGAL/Mesh_3/Dump_c3t3.h
View File

@ -24,6 +24,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <string> #include <string>
#include <CGAL/Mesh_3/io_signature.h> #include <CGAL/Mesh_3/io_signature.h>
@ -133,4 +134,6 @@ void dump_c3t3(const C3t3& c3t3, std::string prefix) {
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESH_3_DUMP_C3T3_H #endif // CGAL_MESH_3_DUMP_C3T3_H

3
Mesh_3/include/CGAL/Mesh_3/Image_to_labeled_function_wrapper.h
View File

@ -30,6 +30,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Image_3.h> #include <CGAL/Image_3.h>
#include <CGAL/function_objects.h> #include <CGAL/function_objects.h>
@ -153,4 +154,6 @@ private:
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESH_3_IMAGE_TO_LABELED_FUNCTION_WRAPPER_H #endif // CGAL_MESH_3_IMAGE_TO_LABELED_FUNCTION_WRAPPER_H

10
Mesh_3/include/CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h
View File

@ -33,11 +33,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#if defined(BOOST_MSVC)
# pragma warning(push)
# pragma warning(disable:4180) // qualifier applied to function type has no meaning; ignored
#endif
#define CGAL_DEPRECATED_HEADER "<CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h>" #define CGAL_DEPRECATED_HEADER "<CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h>"
#define CGAL_REPLACEMENT_HEADER "<CGAL/Implicit_to_labeling_function_wrapper.h>" #define CGAL_REPLACEMENT_HEADER "<CGAL/Implicit_to_labeling_function_wrapper.h>"
@ -153,8 +149,6 @@ private:
#if defined(BOOST_MSVC) #include <CGAL/enable_warnings.h>
# pragma warning(pop)
#endif
#endif // CGAL_MESH_3_IMPLICIT_TO_LABELED_FUNCTION_WRAPPER_H #endif // CGAL_MESH_3_IMPLICIT_TO_LABELED_FUNCTION_WRAPPER_H

3
Mesh_3/include/CGAL/Mesh_3/Labeled_mesh_domain_3.h
View File

@ -29,6 +29,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#define CGAL_DEPRECATED_HEADER "<CGAL/Mesh_3/Labeled_mesh_domain_3.h>" #define CGAL_DEPRECATED_HEADER "<CGAL/Mesh_3/Labeled_mesh_domain_3.h>"
#define CGAL_REPLACEMENT_HEADER "<CGAL/Labeled_mesh_domain_3.h>" #define CGAL_REPLACEMENT_HEADER "<CGAL/Labeled_mesh_domain_3.h>"
@ -630,4 +631,6 @@ Labeled_mesh_domain_3<F,BGT>::Construct_initial_points::operator()(
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // LABELLED_MESH_TRAITS_3_H_ #endif // LABELLED_MESH_TRAITS_3_H_

3
Mesh_3/include/CGAL/Mesh_3/Lloyd_move.h
View File

@ -28,6 +28,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Mesh_3/config.h> #include <CGAL/Mesh_3/config.h>
@ -566,4 +567,6 @@ private:
} //namespace CGAL } //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESH_3_LLOYD_MOVE_H #endif // CGAL_MESH_3_LLOYD_MOVE_H

9
Mesh_3/include/CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h
View File

@ -29,6 +29,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Mesh_3/config.h> #include <CGAL/Mesh_3/config.h>
@ -564,7 +565,7 @@ private:
end = triangulation().finite_vertices_end(); end = triangulation().finite_vertices_end();
vit != end; ++vit) vit != end; ++vit)
{ {
vit->set_c2t3_cache(0, -1); vit->set_c2t3_cache(0, (std::numeric_limits<size_type>::max)());
} }
edge_facet_counter_.clear(); edge_facet_counter_.clear();
@ -595,7 +596,7 @@ private:
#endif // CGAL_LINKED_WITH_TBB #endif // CGAL_LINKED_WITH_TBB
const std::size_t n = edge_va->cached_number_of_incident_facets(); const std::size_t n = edge_va->cached_number_of_incident_facets();
edge_va->set_c2t3_cache(n+1, -1); edge_va->set_c2t3_cache(n+1, (std::numeric_limits<size_type>::max)());
} }
} }
} }
@ -609,7 +610,7 @@ private:
if( v->is_c2t3_cache_valid() ) if( v->is_c2t3_cache_valid() )
{ {
const std::size_t n = v->cached_number_of_components(); const std::size_t n = v->cached_number_of_components();
if(n != std::size_t(-1)) return n; if(n != (std::numeric_limits<size_type>::max)()) return n;
} }
Union_find<Facet> facets; Union_find<Facet> facets;
@ -1076,4 +1077,6 @@ rescan_after_load_of_triangulation() {
} // end namespace Mesh_3 } // end namespace Mesh_3
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESH_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_BASE_H #endif // CGAL_MESH_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_BASE_H

5
Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h
View File

@ -28,6 +28,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Mesh_3/config.h> #include <CGAL/Mesh_3/config.h>
@ -733,7 +734,7 @@ operator()(int nb_iterations, Visitor visitor)
big_moves_size_ = big_moves_size_ =
(std::max)(std::size_t(1), std::size_t(moving_vertices.size()/500)); (std::max)(std::size_t(1), std::size_t(moving_vertices.size()/500));
std::size_t nb_vertices_moved = -1; std::size_t nb_vertices_moved = (std::numeric_limits<size_t>::max)();
bool convergence_stop = false; bool convergence_stop = false;
// Iterate // Iterate
@ -1178,4 +1179,6 @@ sq_circumradius_length(const Cell_handle& cell, const Vertex_handle& v) const
} //namespace CGAL } //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESH_3_MESH_GLOBAL_OPTIMIZER_H #endif // CGAL_MESH_3_MESH_GLOBAL_OPTIMIZER_H

3
Mesh_3/include/CGAL/Mesh_3/Mesh_sizing_field.h
View File

@ -29,6 +29,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#ifdef CGAL_LINKED_WITH_TBB #ifdef CGAL_LINKED_WITH_TBB
# include <tbb/enumerable_thread_specific.h> # include <tbb/enumerable_thread_specific.h>
@ -323,4 +324,6 @@ interpolate_on_facet_vertices(const Bare_point& p, const Cell_handle& cell) cons
} //namespace CGAL } //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESH_3_MESH_SIZING_FIELD_H #endif // CGAL_MESH_3_MESH_SIZING_FIELD_H

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

@ -30,6 +30,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Mesh_3/config.h> #include <CGAL/Mesh_3/config.h>
@ -771,5 +772,6 @@ Mesher_3<C3T3,MC,MD>::debug_info_header() const
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESH_3_MESHER_3_H #endif // CGAL_MESH_3_MESHER_3_H

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

@ -24,6 +24,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <string> #include <string>
@ -1223,4 +1224,6 @@ private:
#include <CGAL/Mesher_level_visitors.h> #include <CGAL/Mesher_level_visitors.h>
#include <CGAL/Mesh_3/Mesher_level_default_implementations.h> #include <CGAL/Mesh_3/Mesher_level_default_implementations.h>
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESH_3_MESHER_LEVEL_H #endif // CGAL_MESH_3_MESHER_LEVEL_H

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

@ -29,6 +29,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Mesh_3/config.h> #include <CGAL/Mesh_3/config.h>
@ -2002,4 +2003,6 @@ repopulate_edges_around_corner(const Vertex_handle& v, ErasedVeOutIt out)
} //namespace CGAL } //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESH_3_PROTECT_EDGES_SIZING_FIELD_H #endif // CGAL_MESH_3_PROTECT_EDGES_SIZING_FIELD_H

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

@ -29,6 +29,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Mesh_3/Mesher_level.h> #include <CGAL/Mesh_3/Mesher_level.h>
#include <CGAL/Mesh_3/Mesher_level_default_implementations.h> #include <CGAL/Mesh_3/Mesher_level_default_implementations.h>
@ -108,10 +109,12 @@ struct Get_Is_facet_bad<Facet_criteria, true> {
Facet, unsigned int, Facet, unsigned int> &f) const Facet, unsigned int, Facet, unsigned int> &f) const
{ {
#ifdef _DEBUG #ifdef _DEBUG
/*
int f1_current_erase_counter = CGAL::cpp11::get<0>(f).first->erase_counter(); int f1_current_erase_counter = CGAL::cpp11::get<0>(f).first->erase_counter();
int f1_saved_erase_counter = CGAL::cpp11::get<1>(f); int f1_saved_erase_counter = CGAL::cpp11::get<1>(f);
int f2_current_erase_counter = CGAL::cpp11::get<2>(f).first->erase_counter(); int f2_current_erase_counter = CGAL::cpp11::get<2>(f).first->erase_counter();
int f2_saved_erase_counter = CGAL::cpp11::get<3>(f); int f2_saved_erase_counter = CGAL::cpp11::get<3>(f);
*/
//f1_current_erase_counter - f1_saved_erase_counter + f2_current_erase_counter - f2_saved_erase_counter == 1 //f1_current_erase_counter - f1_saved_erase_counter + f2_current_erase_counter - f2_saved_erase_counter == 1
/*if (f1_current_erase_counter - f1_saved_erase_counter + f2_current_erase_counter - f2_saved_erase_counter == 1) /*if (f1_current_erase_counter - f1_saved_erase_counter + f2_current_erase_counter - f2_saved_erase_counter == 1)
@ -1861,4 +1864,6 @@ after_insertion_handle_incident_facet(Facet& facet)
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESH_3_REFINE_FACETS_3_H #endif // CGAL_MESH_3_REFINE_FACETS_3_H

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

@ -24,6 +24,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/utility.h> #include <CGAL/utility.h>
#include <set> #include <set>
@ -671,5 +672,6 @@ public:
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESH_3_REFINE_FACETS_MANIFOLD_BASE_H #endif // CGAL_MESH_3_REFINE_FACETS_MANIFOLD_BASE_H

3
Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
View File

@ -28,6 +28,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Mesh_3/config.h> #include <CGAL/Mesh_3/config.h>
@ -1668,4 +1669,6 @@ enqueue_task(const PVertex &pv,
} //namespace CGAL } //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESH_3_SLIVERS_PERTURBER_H #endif // CGAL_MESH_3_SLIVERS_PERTURBER_H

2
Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
View File

@ -26,6 +26,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Mesh_3/config.h> #include <CGAL/Mesh_3/config.h>
#include <CGAL/Mesh_3/Concurrent_mesher_config.h> #include <CGAL/Mesh_3/Concurrent_mesher_config.h>
@ -1874,5 +1875,6 @@ check_ratios(const Sliver_values& criterion_values,
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // end CGAL_MESH_3_SLIVERS_EXUDER_H #endif // end CGAL_MESH_3_SLIVERS_EXUDER_H

3
Mesh_3/include/CGAL/Mesh_3/Worksharing_data_structures.h
View File

@ -23,6 +23,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#ifdef CGAL_LINKED_WITH_TBB #ifdef CGAL_LINKED_WITH_TBB
@ -850,4 +851,6 @@ namespace CGAL { namespace Mesh_3 {
#endif // CGAL_LINKED_WITH_TBB #endif // CGAL_LINKED_WITH_TBB
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESH_3_WORKSHARING_DATA_STRUCTURES_H #endif // CGAL_MESH_3_WORKSHARING_DATA_STRUCTURES_H

4
Mesh_3/include/CGAL/Mesh_3/sliver_criteria.h
View File

@ -28,6 +28,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Mesh_3/min_dihedral_angle.h> #include <CGAL/Mesh_3/min_dihedral_angle.h>
#include <CGAL/Mesh_3/radius_ratio.h> #include <CGAL/Mesh_3/radius_ratio.h>
@ -242,7 +243,6 @@ private:
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESH_3_SLIVER_CRITERIA_H #endif // CGAL_MESH_3_SLIVER_CRITERIA_H

3
Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h
View File

@ -28,6 +28,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Mesh_3/config.h> #include <CGAL/Mesh_3/config.h>
@ -1383,4 +1384,6 @@ private:
} //namespace CGAL } //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESH_3_VERTEX_PERTURBATION_H #endif // CGAL_MESH_3_VERTEX_PERTURBATION_H

4
Mesh_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h
View File

@ -29,7 +29,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/iterator.h> #include <CGAL/iterator.h>
@ -793,4 +793,6 @@ operator>> (std::istream& is,
} //namespace CGAL } //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESH_COMPLEX_3_IN_TRIANGULATION_3_H #endif // CGAL_MESH_COMPLEX_3_IN_TRIANGULATION_3_H

2
Mesh_3/include/CGAL/Mesh_criteria_3.h
View File

@ -30,6 +30,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Mesh_3/config.h> #include <CGAL/Mesh_3/config.h>
#include <CGAL/Mesh_3/global_parameters.h> #include <CGAL/Mesh_3/global_parameters.h>
@ -212,5 +213,6 @@ public:
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESH_CRITERIA_3_H #endif // CGAL_MESH_CRITERIA_3_H

3
Mesh_3/include/CGAL/Mesh_triangulation_3.h
View File

@ -26,6 +26,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Mesh_3/config.h> #include <CGAL/Mesh_3/config.h>
@ -120,4 +121,6 @@ public:
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESH_TRIANGULATION_3_H #endif // CGAL_MESH_TRIANGULATION_3_H

10
Mesh_3/include/CGAL/Meshes/Filtered_multimap_container.h
View File

@ -133,10 +133,6 @@ namespace CGAL {
it_list != m_local_lists.end() ; it_list != m_local_lists.end() ;
++it_list ) ++it_list )
{ {
#ifdef _DEBUG
size_t multimap_size = container.size();
size_t local_list_size = it_list->size();
#endif
container.insert(it_list->begin(), it_list->end()); container.insert(it_list->begin(), it_list->end());
it_list->clear(); it_list->clear();
} }
@ -213,9 +209,6 @@ namespace CGAL {
void splice_local_lists_impl() void splice_local_lists_impl()
{ {
#ifdef _DEBUG
size_t s = size();
#endif
Base::splice_local_lists_impl(container); Base::splice_local_lists_impl(container);
} }
@ -231,9 +224,6 @@ namespace CGAL {
bool no_longer_element_to_refine_impl() bool no_longer_element_to_refine_impl()
{ {
#ifdef _DEBUG
size_t multimap_size = container.size();
#endif
bool is_empty = container.empty(); bool is_empty = container.empty();
while( !is_empty && !test(container.begin()->second) ) while( !is_empty && !test(container.begin()->second) )
{ {

2
Mesh_3/include/CGAL/Polyhedral_complex_mesh_domain_3.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Mesh_3/config.h> #include <CGAL/Mesh_3/config.h>
@ -1142,5 +1143,6 @@ reindex_patches(const std::vector<Surf_p_index>& map)
} //namespace CGAL } //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_POLYHEDRAL_COMPLEX_MESH_DOMAIN_3_H #endif // CGAL_POLYHEDRAL_COMPLEX_MESH_DOMAIN_3_H

3
Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
View File

@ -30,6 +30,8 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Mesh_3/global_parameters.h> #include <CGAL/Mesh_3/global_parameters.h>
#include <CGAL/Mesh_3/Robust_intersection_traits_3.h> #include <CGAL/Mesh_3/Robust_intersection_traits_3.h>
@ -910,5 +912,6 @@ Is_in_domain::operator()(const Point_3& p) const
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // POLYHEDRAL_MESH_TRAITS_3_H_ #endif // POLYHEDRAL_MESH_TRAITS_3_H_

2
Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
View File

@ -30,6 +30,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Mesh_3/config.h> #include <CGAL/Mesh_3/config.h>
@ -602,5 +603,6 @@ add_featured_edges_to_graph(const Polyhedron& p,
} //namespace CGAL } //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_POLYHEDRAL_MESH_DOMAIN_WITH_FEATURES_3_H #endif // CGAL_POLYHEDRAL_MESH_DOMAIN_WITH_FEATURES_3_H

3
Mesh_3/include/CGAL/internal/Mesh_3/Handle_IO_for_pair_of_int.h
View File

@ -24,6 +24,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <utility> #include <utility>
#include <CGAL/Mesh_3/io_signature.h> #include <CGAL/Mesh_3/io_signature.h>
@ -105,4 +106,6 @@ public:
}; };
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_INTERNAL_MESH_3_INTERNAL_HANDLE_IO_FOR_PAIR_OF_INT_H #endif // CGAL_INTERNAL_MESH_3_INTERNAL_HANDLE_IO_FOR_PAIR_OF_INT_H

2
Mesh_3/include/CGAL/make_mesh_3.h
View File

@ -28,6 +28,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/Mesh_3/config.h> #include <CGAL/Mesh_3/config.h>
#include <CGAL/Mesh_3/global_parameters.h> #include <CGAL/Mesh_3/global_parameters.h>
@ -480,5 +481,6 @@ void make_mesh_3_impl(C3T3& c3t3,
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MAKE_MESH_3_H #endif // CGAL_MAKE_MESH_3_H

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

@ -28,6 +28,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
#include <CGAL/config.h> #include <CGAL/config.h>
#include <CGAL/Mesh_3/config.h> #include <CGAL/Mesh_3/config.h>
@ -581,5 +582,6 @@ void refine_mesh_3_impl(C3T3& c3t3,
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_REFINE_MESH_3_H #endif // CGAL_REFINE_MESH_3_H

3
Mesh_3/include/CGAL/remove_far_points_in_mesh_3.h
View File

@ -28,6 +28,7 @@
#include <CGAL/license/Mesh_3.h> #include <CGAL/license/Mesh_3.h>
#include <CGAL/disable_warnings.h>
namespace CGAL { namespace CGAL {
@ -91,4 +92,6 @@ remove_far_points_in_mesh_3(C3T3& c3t3)
} //namespace CGAL } //namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_REMOVE_FAR_POINTS_IN_MESH_3_H #endif // CGAL_REMOVE_FAR_POINTS_IN_MESH_3_H

2
Mesh_3/test/Mesh_3/test_c3t3_io.cpp
View File

@ -8,6 +8,8 @@
#include <string> #include <string>
#include <CGAL/disable_warnings.h>
typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
// //

2
Mesh_3/test/Mesh_3/test_meshing_implicit_function.cpp
View File

@ -26,6 +26,8 @@
#include "test_meshing_utilities.h" #include "test_meshing_utilities.h"
#include <CGAL/Implicit_mesh_domain_3.h> #include <CGAL/Implicit_mesh_domain_3.h>
#include <CGAL/disable_warnings.h>
template <typename K, typename Concurrency_tag = CGAL::Sequential_tag> template <typename K, typename Concurrency_tag = CGAL::Sequential_tag>
struct Implicit_tester : public Tester<K> struct Implicit_tester : public Tester<K>
{ {

2
Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp
View File

@ -33,6 +33,8 @@
#include <CGAL/Mesh_3/Dump_c3t3.h> #include <CGAL/Mesh_3/Dump_c3t3.h>
#include <CGAL/disable_warnings.h>
template <typename K, typename Concurrency_tag = CGAL::Sequential_tag> template <typename K, typename Concurrency_tag = CGAL::Sequential_tag>
struct Polyhedron_tester : public Tester<K> struct Polyhedron_tester : public Tester<K>
{ {

4
Mesh_3/test/Mesh_3/test_meshing_utilities.h
View File

@ -41,6 +41,8 @@
#include <CGAL/AABB_tree.h> #include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h> #include <CGAL/AABB_traits.h>
#include <CGAL/disable_warnings.h>
#include <limits> #include <limits>
#include <vector> #include <vector>
#include <boost/optional/optional_io.hpp> #include <boost/optional/optional_io.hpp>
@ -422,4 +424,6 @@ struct Tester
} }
}; };
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESH_3_TEST_TEST_MESHING_UTILITIES #endif // CGAL_MESH_3_TEST_TEST_MESHING_UTILITIES

5
Mesh_3/test/Mesh_3/test_utilities.h
View File

@ -32,7 +32,8 @@
#include <CGAL/Mesh_triangulation_3.h> #include <CGAL/Mesh_triangulation_3.h>
#include <CGAL/Mesh_complex_3_in_triangulation_3.h> #include <CGAL/Mesh_complex_3_in_triangulation_3.h>
#include <CGAL/Mesh_complex_3_in_triangulation_3.h>
#include <CGAL/disable_warnings.h>
typedef CGAL::Exact_predicates_inexact_constructions_kernel K_e_i; typedef CGAL::Exact_predicates_inexact_constructions_kernel K_e_i;
typedef CGAL::Exact_predicates_exact_constructions_kernel K_e_e; typedef CGAL::Exact_predicates_exact_constructions_kernel K_e_e;
@ -54,4 +55,6 @@ public:
} // end namespace details } // end namespace details
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESH_3_TEST_TEST_UTILITIES_H #endif // CGAL_MESH_3_TEST_TEST_UTILITIES_H

4
Mesher_level/include/CGAL/Mesher_level_default_implementations.h
View File

@ -22,6 +22,8 @@
#ifndef CGAL_MESHER_LEVEL_DEFAULT_IMPLEMENTATIONS_H #ifndef CGAL_MESHER_LEVEL_DEFAULT_IMPLEMENTATIONS_H
#define CGAL_MESHER_LEVEL_DEFAULT_IMPLEMENTATIONS_H #define CGAL_MESHER_LEVEL_DEFAULT_IMPLEMENTATIONS_H
#include <CGAL/disable_warnings.h>
#include <CGAL/Mesher_level.h> #include <CGAL/Mesher_level.h>
namespace CGAL { namespace CGAL {
@ -136,4 +138,6 @@ struct No_before_conflicts {
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESHER_LEVEL_DEFAULT_IMPLEMENTATIONS_H #endif // CGAL_MESHER_LEVEL_DEFAULT_IMPLEMENTATIONS_H

4
Mesher_level/include/CGAL/Mesher_level_visitors.h
View File

@ -22,6 +22,8 @@
#ifndef CGAL_MESHER_LEVEL_VISITORS_H #ifndef CGAL_MESHER_LEVEL_VISITORS_H
#define CGAL_MESHER_LEVEL_VISITORS_H #define CGAL_MESHER_LEVEL_VISITORS_H
#include <CGAL/disable_warnings.h>
namespace CGAL { namespace CGAL {
template <typename Previous_level> template <typename Previous_level>
@ -127,4 +129,6 @@ struct Combine_mesh_visitor {
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESHER_LEVEL_VISITORS_H #endif // CGAL_MESHER_LEVEL_VISITORS_H

4
Mesher_level/include/CGAL/Meshes/Triangulation_mesher_level_traits_3.h
View File

@ -21,6 +21,8 @@
#ifndef CGAL_MESH_2_TRIANGULATION_MESHER_LEVEL_TRAITS_3_H #ifndef CGAL_MESH_2_TRIANGULATION_MESHER_LEVEL_TRAITS_3_H
#define CGAL_MESH_2_TRIANGULATION_MESHER_LEVEL_TRAITS_3_H #define CGAL_MESH_2_TRIANGULATION_MESHER_LEVEL_TRAITS_3_H
#include <CGAL/disable_warnings.h>
#include <vector> #include <vector>
#include <CGAL/Mesher_level.h> #include <CGAL/Mesher_level.h>
#include <CGAL/Mesher_level_default_implementations.h> #include <CGAL/Mesher_level_default_implementations.h>
@ -141,4 +143,6 @@ struct Triangulation_mesher_level_traits_3 :
} // end namespace CGAL } // end namespace CGAL
#include <CGAL/enable_warnings.h>
#endif // CGAL_MESH_2_TRIANGULATION_MESHER_LEVEL_TRAITS_3_H #endif // CGAL_MESH_2_TRIANGULATION_MESHER_LEVEL_TRAITS_3_H