From 52317dd49fb81f040ad59945ff05d06304c2f98c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 9 Jun 2010 07:37:13 +0000 Subject: [PATCH] add python script (replace_CGAL_NAMESPACE.py) to replace CGAL_BEGIN_NAMESPACE and CGAL_END_NAMESPACE by namespace CGAL { and } //namespace CGAL. in all .h and .cpp files in a directory. Apply it to all packages in the trunk Remove macro definition from the config.h file. --- .gitattributes | 1 + .../Bbox_3_Plane_3_do_intersect.h | 4 ++-- .../Bbox_3_Sphere_3_do_intersect.h | 4 ++-- .../Bbox_3_Triangle_3_do_intersect.h | 4 ++-- .../include/CGAL/Algebraic_extension_traits.h | 4 ++-- .../include/CGAL/Algebraic_structure_traits.h | 4 ++-- .../include/CGAL/Coercion_traits.h | 4 ++-- .../include/CGAL/Fraction_traits.h | 4 ++-- .../include/CGAL/Needs_parens_as_product.h | 4 ++-- .../include/CGAL/Rational_traits.h | 4 ++-- .../include/CGAL/Real_embeddable_traits.h | 4 ++-- .../include/CGAL/Scalar_factor_traits.h | 4 ++-- .../CGAL/Test/_test_algebraic_structure.h | 4 ++-- .../include/CGAL/Test/_test_coercion_traits.h | 4 ++-- .../include/CGAL/Test/_test_fraction_traits.h | 4 ++-- .../include/CGAL/Test/_test_rational_traits.h | 4 ++-- .../include/CGAL/Test/_test_real_embeddable.h | 4 ++-- .../CGAL/extended_euclidean_algorithm.h | 4 ++-- Algebraic_foundations/include/CGAL/ipower.h | 4 ++-- .../include/CGAL/number_utils.h | 4 ++-- .../include/CGAL/number_utils_classes.h | 4 ++-- .../include/CGAL/Algebraic_kernel_converter.h | 4 ++-- ...ion_objects_on_roots_and_polynomials_2_2.h | 4 ++-- .../CGAL/Algebraic_kernel_for_circles_2_2.h | 4 ++-- .../include/CGAL/Polynomials_1_2.h | 4 ++-- .../include/CGAL/Polynomials_2_2.h | 4 ++-- .../include/CGAL/Root_for_circles_2_2.h | 4 ++-- .../global_functions_on_root_for_circle_2_2.h | 4 ++-- ...ions_on_roots_and_polynomial_1_2_and_2_2.h | 4 ++-- ...l_functions_on_roots_and_polynomials_2_2.h | 4 ++-- ...ion_objects_on_roots_and_polynomials_2_3.h | 4 ++-- .../CGAL/Algebraic_kernel_for_spheres_2_3.h | 4 ++-- .../include/CGAL/Polynomials_1_3.h | 4 ++-- .../include/CGAL/Polynomials_2_3.h | 4 ++-- .../include/CGAL/Polynomials_for_line_3.h | 4 ++-- .../include/CGAL/Root_for_spheres_2_3.h | 4 ++-- .../global_functions_on_root_for_sphere_2_3.h | 4 ++-- ...l_functions_on_roots_and_polynomials_1_3.h | 4 ++-- ...l_functions_on_roots_and_polynomials_2_3.h | 4 ++-- Alpha_shapes_2/include/CGAL/Alpha_shape_2.h | 4 ++-- .../CGAL/Alpha_shape_euclidean_traits_2.h | 4 ++-- .../include/CGAL/Alpha_shape_face_base_2.h | 4 ++-- .../include/CGAL/Alpha_shape_vertex_base_2.h | 4 ++-- .../include/CGAL/Weighted_alpha_shape_2.h | 4 ++-- .../Weighted_alpha_shape_euclidean_traits_2.h | 4 ++-- ...ed_radius_smallest_orthogonalcircle_ftC2.h | 4 ++-- .../in_smallest_orthogonalcircle_ftC2.h | 4 ++-- Alpha_shapes_3/include/CGAL/Alpha_shape_3.h | 4 ++-- .../include/CGAL/Alpha_shape_cell_base_3.h | 4 ++-- .../CGAL/Alpha_shape_euclidean_traits_3.h | 4 ++-- .../include/CGAL/Alpha_shape_vertex_base_3.h | 4 ++-- .../CGAL/IO/alpha_shape_geomview_ostream_3.h | 4 ++-- .../Weighted_alpha_shape_euclidean_traits_3.h | 4 ++-- .../Qt3/include/CGAL/colors.h | 4 ++-- .../CGAL/Apollonius_graph_2/make_degenerate.h | 4 ++-- .../random_integral_sites_in_square_2.h | 4 ++-- .../random_integral_sites_on_parabola_2.h | 4 ++-- .../random_sites_in_0x1_box.h | 4 ++-- .../generators/include/CGAL/bits.h | 4 ++-- .../generators/include/CGAL/random_integer.h | 4 ++-- .../include/CGAL/Apollonius_graph_2.h | 4 ++-- .../Apollonius_graph_2_impl.h | 4 ++-- .../Apollonius_graph_hierarchy_2_impl.h | 4 ++-- .../Bounded_side_of_ccw_circle_C2.h | 4 ++-- .../Apollonius_graph_2/Compare_weight_2.h | 4 ++-- .../CGAL/Apollonius_graph_2/Compare_x_2.h | 4 ++-- .../CGAL/Apollonius_graph_2/Compare_y_2.h | 4 ++-- .../Apollonius_graph_2/Constructions_C2.h | 4 ++-- .../Apollonius_graph_2/Constructions_ftC2.h | 4 ++-- .../Apollonius_graph_2/Constructions_rtH2.h | 4 ++-- ...Apollonius_graph_mixed_filtered_traits_2.h | 4 ++-- .../Apollonius_graph_mixed_traits_2.h | 4 ++-- .../Apollonius_graph_new_filtered_traits_2.h | 4 ++-- .../Apollonius_graph_new_traits_2.h | 4 ++-- .../Delage_traits/Conflict_2.h | 4 ++-- .../Delage_traits/Edge_conflict_2.h | 4 ++-- .../Delage_traits/Finite_edge_conflict_2.h | 4 ++-- .../Delage_traits/Infinite_edge_conflict_2.h | 4 ++-- .../Delage_traits/Orientation_2.h | 4 ++-- .../Delage_traits/Vertex_conflict_2.h | 4 ++-- .../Apollonius_graph_2/Finite_edge_test8_C2.h | 4 ++-- .../Apollonius_graph_2/Finite_edge_test_C2.h | 4 ++-- .../CGAL/Apollonius_graph_2/Incircle8_C2.h | 4 ++-- .../CGAL/Apollonius_graph_2/Incircle_C2.h | 4 ++-- .../Infinite_edge_test_C2.h | 4 ++-- .../Is_degenerate_edge_C2.h | 4 ++-- .../CGAL/Apollonius_graph_2/Is_hidden_C2.h | 4 ++-- .../Apollonius_graph_2/Kernel_wrapper_2.h | 4 ++-- .../CGAL/Apollonius_graph_2/Orientation8_C2.h | 4 ++-- .../CGAL/Apollonius_graph_2/Orientation_2.h | 4 ++-- .../Oriented_side_of_bisector_C2.h | 4 ++-- .../Predicate_constructions_C2.h | 4 ++-- .../Apollonius_graph_2/Traits_wrapper_2.h | 4 ++-- .../Apollonius_graph_2/comparator_profiler.h | 4 ++-- .../Apollonius_graph_2/compare_quadratic.h | 4 ++-- .../Apollonius_graph_2/predicate_profiler.h | 4 ++-- ...lonius_graph_uncertain_filtered_traits_2.h | 4 ++-- .../uncertain/Uncertain_is_hidden_C2.h | 4 ++-- .../Uncertain_oriented_side_of_bisector_C2.h | 4 ++-- .../uncertain/Uncertain_vertex_conflict_2.h | 4 ++-- .../uncertain/uncertain_functions_on_signs.h | 4 ++-- .../CGAL/Apollonius_graph_data_structure_2.h | 4 ++-- .../CGAL/Apollonius_graph_filtered_traits_2.h | 4 ++-- .../CGAL/Apollonius_graph_hierarchy_2.h | 4 ++-- ...Apollonius_graph_hierarchy_vertex_base_2.h | 4 ++-- .../include/CGAL/Apollonius_graph_traits_2.h | 4 ++-- .../CGAL/Apollonius_graph_vertex_base_2.h | 4 ++-- .../include/CGAL/Apollonius_site_2.h | 4 ++-- Apollonius_graph_2/include/CGAL/Hyperbola_2.h | 4 ++-- .../include/CGAL/Hyperbola_ray_2.h | 4 ++-- .../include/CGAL/Hyperbola_segment_2.h | 4 ++-- .../CGAL/IO/Qt_widget_Apollonius_site_2.h | 4 ++-- .../include/CGAL/IO/Qt_widget_Hyperbola_2.h | 4 ++-- Apollonius_graph_2/include/CGAL/Parabola_2.h | 4 ++-- .../include/CGAL/Parabola_segment_2.h | 4 ++-- .../include/CGAL/functions_on_signs.h | 4 ++-- .../include/CGAL/in_place_edge_list.h | 4 ++-- .../include/CGAL/more_functions_on_signs.h | 4 ++-- .../include/IO/Null_output_stream.h | 4 ++-- .../test/Apollonius_graph_2/include/test.h | 4 ++-- .../Arithmetic_kernel_base.h | 4 ++-- .../include/CGAL/CORE_arithmetic_kernel.h | 4 ++-- .../include/CGAL/GMP_arithmetic_kernel.h | 4 ++-- .../include/CGAL/Get_arithmetic_kernel.h | 4 ++-- .../include/CGAL/LEDA_arithmetic_kernel.h | 4 ++-- .../CGAL/OLD/GMP/Gmpfr_interval_type.h | 8 +++---- .../include/CGAL/OLD/Gmpfr_interval.h | 4 ++-- .../CGAL/Test/_test_arithmetic_kernel.h | 4 ++-- .../Arrangement_on_surface_2/arr_bench.cpp | 4 ++-- .../include/CGAL/Arr_Bezier_curve_traits_2.h | 4 ++-- .../include/CGAL/Arr_accessor.h | 4 ++-- .../include/CGAL/Arr_batched_point_location.h | 4 ++-- .../Arr_bounded_planar_topology_traits_2.h | 4 ++-- .../CGAL/Arr_circle_segment_traits_2.h | 4 ++-- .../include/CGAL/Arr_conic_traits_2.h | 4 ++-- .../Arr_consolidated_curve_data_traits_2.h | 4 ++-- .../include/CGAL/Arr_counting_traits_2.h | 4 ++-- .../include/CGAL/Arr_curve_data_traits_2.h | 4 ++-- .../include/CGAL/Arr_dcel_base.h | 4 ++-- .../include/CGAL/Arr_default_dcel.h | 4 ++-- .../include/CGAL/Arr_default_overlay_traits.h | 4 ++-- .../include/CGAL/Arr_enums.h | 4 ++-- .../include/CGAL/Arr_extended_dcel.h | 4 ++-- .../include/CGAL/Arr_face_map.h | 4 ++-- ...eodesic_arc_on_sphere_partition_traits_2.h | 8 +++---- .../Arr_geodesic_arc_on_sphere_traits_2.h | 4 ++-- .../CGAL/Arr_geometry_traits/Arr_plane_3.h | 4 ++-- .../Bezier_bounding_rational_traits.h | 4 ++-- .../CGAL/Arr_geometry_traits/Bezier_cache.h | 4 ++-- .../CGAL/Arr_geometry_traits/Bezier_curve_2.h | 4 ++-- .../CGAL/Arr_geometry_traits/Bezier_point_2.h | 4 ++-- .../Arr_geometry_traits/Bezier_x_monotone_2.h | 4 ++-- .../Arr_geometry_traits/Circle_segment_2.h | 4 ++-- .../CGAL/Arr_geometry_traits/Conic_arc_2.h | 4 ++-- .../Conic_intersections_2.h | 4 ++-- .../CGAL/Arr_geometry_traits/Conic_point_2.h | 4 ++-- .../Conic_x_monotone_arc_2.h | 4 ++-- .../Consolidated_curve_data_aux.h | 4 ++-- .../CGAL/Arr_geometry_traits/Curve_data_aux.h | 4 ++-- .../Arr_geometry_traits/Hyperbolic_arc_2.h | 4 ++-- .../Arr_geometry_traits/One_root_number.h | 4 ++-- .../CGAL/Arr_geometry_traits/Polycurve_2.h | 4 ++-- .../CGAL/Arr_geometry_traits/Polyline_2.h | 4 ++-- .../CGAL/Arr_geometry_traits/Rational_arc_2.h | 4 ++-- .../Arr_geometry_traits/Segment_assertions.h | 4 ++-- .../CGAL/Arr_geometry_traits/de_Casteljau_2.h | 4 ++-- ..._great_circular_arc_on_cylinder_traits_2.h | 4 ++-- .../CGAL/Arr_hyperbolic_arc_traits_2.h | 4 ++-- .../CGAL/Arr_landmarks_point_location.h | 4 ++-- .../include/CGAL/Arr_linear_traits_2.h | 4 ++-- .../include/CGAL/Arr_naive_point_location.h | 4 ++-- .../Arr_non_caching_segment_basic_traits_2.h | 4 ++-- .../CGAL/Arr_non_caching_segment_traits_2.h | 4 ++-- .../include/CGAL/Arr_observer.h | 4 ++-- .../include/CGAL/Arr_overlay_2.h | 4 ++-- .../Arr_batched_point_location_traits_2.h | 4 ++-- .../Arr_landmarks_pl_impl.h | 4 ++-- .../Arr_lm_generator_base.h | 4 ++-- .../Arr_lm_grid_generator.h | 4 ++-- .../Arr_lm_halton_generator.h | 4 ++-- .../Arr_lm_middle_edges_generator.h | 4 ++-- .../Arr_lm_nearest_neighbor.h | 4 ++-- .../Arr_lm_random_generator.h | 4 ++-- .../Arr_lm_specified_points_generator.h | 4 ++-- .../Arr_lm_vertices_generator.h | 4 ++-- .../Arr_naive_point_location_impl.h | 4 ++-- .../Arr_simple_point_location_impl.h | 4 ++-- .../Arr_trapezoid_ric_pl_impl.h | 4 ++-- .../Arr_triangulation_pl_functions.h | 4 ++-- .../Arr_triangulation_pl_impl.h | 4 ++-- .../Arr_walk_along_line_pl_impl.h | 4 ++-- .../CGAL/Arr_point_location/Td_X_trapezoid.h | 4 ++-- .../include/CGAL/Arr_point_location/Td_dag.h | 4 ++-- .../CGAL/Arr_point_location/Td_ninetuple.h | 4 ++-- .../CGAL/Arr_point_location/Td_predicates.h | 4 ++-- .../CGAL/Arr_point_location/Td_traits.h | 4 ++-- .../Arr_point_location/Td_traits_functions.h | 4 ++-- .../Trapezoidal_decomposition_2.h | 4 ++-- .../Trapezoidal_decomposition_2_iostream.h | 4 ++-- .../include/CGAL/Arr_polycurve_traits_2.h | 4 ++-- .../include/CGAL/Arr_polyline_traits_2.h | 4 ++-- .../include/CGAL/Arr_rational_arc_traits_2.h | 4 ++-- .../include/CGAL/Arr_segment_traits_2.h | 4 ++-- .../include/CGAL/Arr_simple_point_location.h | 4 ++-- .../Arr_on_sphere_transformation.h | 4 ++-- .../Arr_polyhedral_sgm.h | 4 ++-- .../Arr_polyhedral_sgm_arr_dcel.h | 4 ++-- .../Arr_polyhedral_sgm_initializer_visitor.h | 4 ++-- .../Arr_polyhedral_sgm_overlay.h | 4 ++-- .../Arr_polyhedral_sgm_polyhedron_3.h | 4 ++-- .../Arr_polyhedral_sgm_traits.h | 4 ++-- .../Arr_polyhedral_sgm_transformation.h | 4 ++-- .../Arr_spherical_gaussian_map_3.h | 4 ++-- .../Arr_transform_on_sphere.h | 4 ++-- .../CGAL/Arr_spherical_topology_traits_2.h | 4 ++-- .../include/CGAL/Arr_tags.h | 4 ++-- .../Arr_bounded_planar_batched_pl_helper.h | 4 ++-- .../Arr_bounded_planar_construction_helper.h | 4 ++-- .../Arr_bounded_planar_insertion_helper.h | 4 ++-- .../Arr_bounded_planar_overlay_helper.h | 4 ++-- ...rr_bounded_planar_topology_traits_2_impl.h | 4 ++-- .../Arr_bounded_planar_vert_decomp_helper.h | 4 ++-- .../Arr_inc_insertion_zone_visitor.h | 4 ++-- .../Arr_planar_topology_traits_base_2.h | 4 ++-- .../Arr_spherical_batched_pl_helper.h | 4 ++-- .../Arr_spherical_construction_helper.h | 4 ++-- .../Arr_spherical_insertion_helper.h | 4 ++-- .../Arr_spherical_overlay_helper.h | 4 ++-- .../Arr_spherical_topology_traits_2_impl.h | 4 ++-- .../Arr_spherical_vert_decomp_helper.h | 4 ++-- .../Arr_unb_planar_batched_pl_helper.h | 4 ++-- .../Arr_unb_planar_construction_helper.h | 4 ++-- .../Arr_unb_planar_insertion_helper.h | 4 ++-- .../Arr_unb_planar_overlay_helper.h | 4 ++-- .../Arr_unb_planar_topology_traits_2_impl.h | 4 ++-- .../Arr_unb_planar_vert_decomp_helper.h | 4 ++-- .../CGAL/Arr_topology_traits/Sign_of_path.h | 4 ++-- .../include/CGAL/Arr_tracing_traits_2.h | 4 ++-- .../CGAL/Arr_trapezoid_ric_point_location.h | 4 ++-- .../CGAL/Arr_triangulation_point_location.h | 4 ++-- .../CGAL/Arr_unb_planar_topology_traits_2.h | 4 ++-- .../include/CGAL/Arr_vertex_map.h | 4 ++-- .../CGAL/Arr_vertical_decomposition_2.h | 4 ++-- .../CGAL/Arr_walk_along_line_point_location.h | 4 ++-- .../include/CGAL/Arrangement_2.h | 4 ++-- .../Arrangement_2/Arr_compute_zone_visitor.h | 4 ++-- .../Arr_default_planar_topology.h | 4 ++-- .../Arr_do_intersect_zone_visitor.h | 4 ++-- .../Arr_on_surface_with_history_2_impl.h | 4 ++-- .../CGAL/Arrangement_2/Arr_traits_adaptor_2.h | 4 ++-- .../Arr_traits_adaptor_2_dispatching.h | 4 ++-- .../Arrangement_2/Arr_with_history_accessor.h | 4 ++-- .../Arrangement_2/Arrangement_2_iterators.h | 4 ++-- .../Arrangement_on_surface_2_global.h | 4 ++-- .../Arrangement_on_surface_2_impl.h | 4 ++-- .../Arrangement_2/Arrangement_zone_2_impl.h | 4 ++-- .../include/CGAL/Arrangement_2/Open_hash.h | 4 ++-- .../include/CGAL/Arrangement_on_surface_2.h | 4 ++-- .../Arrangement_on_surface_with_history_2.h | 4 ++-- .../include/CGAL/Arrangement_with_history_2.h | 4 ++-- .../include/CGAL/Arrangement_zone_2.h | 4 ++-- .../include/CGAL/Basic_sweep_line_2.h | 4 ++-- .../CGAL/CORE_algebraic_number_traits.h | 4 ++-- .../include/CGAL/IO/Arr_iostream.h | 4 ++-- .../include/CGAL/IO/Arr_text_formatter.h | 4 ++-- .../CGAL/IO/Arr_with_history_2_reader.h | 4 ++-- .../CGAL/IO/Arr_with_history_2_writer.h | 4 ++-- .../CGAL/IO/Arr_with_history_iostream.h | 4 ++-- .../CGAL/IO/Arr_with_history_text_formatter.h | 4 ++-- .../include/CGAL/IO/Arrangement_2_reader.h | 4 ++-- .../include/CGAL/IO/Arrangement_2_writer.h | 4 ++-- .../include/CGAL/IO/Fig_stream.h | 4 ++-- .../include/CGAL/IO/Qt_widget_Conic_arc_2.h | 4 ++-- .../CGAL/IO/Qt_widget_Linear_object_2.h | 4 ++-- .../include/CGAL/IO/Qt_widget_Polyline_2.h | 4 ++-- .../include/CGAL/Sweep_line_2.h | 4 ++-- .../Arr_basic_insertion_sl_visitor.h | 4 ++-- .../Arr_basic_insertion_traits_2.h | 4 ++-- .../Sweep_line_2/Arr_batched_pl_sl_visitor.h | 4 ++-- .../Sweep_line_2/Arr_construction_event.h | 4 ++-- .../Arr_construction_sl_visitor.h | 4 ++-- .../Sweep_line_2/Arr_construction_subcurve.h | 4 ++-- .../Arr_default_overlay_traits_base.h | 4 ++-- .../Sweep_line_2/Arr_insertion_sl_visitor.h | 4 ++-- .../Sweep_line_2/Arr_insertion_traits_2.h | 4 ++-- .../Sweep_line_2/Arr_overlay_sl_visitor.h | 4 ++-- .../CGAL/Sweep_line_2/Arr_overlay_subcurve.h | 4 ++-- .../CGAL/Sweep_line_2/Arr_overlay_traits_2.h | 4 ++-- .../Sweep_line_2/Arr_vert_decomp_sl_visitor.h | 4 ++-- .../Sweep_line_2/Basic_sweep_line_2_impl.h | 4 ++-- .../CGAL/Sweep_line_2/Sweep_line_2_impl.h | 4 ++-- .../CGAL/Sweep_line_2/Sweep_line_2_utils.h | 4 ++-- .../CGAL/Sweep_line_2/Sweep_line_2_visitors.h | 4 ++-- .../CGAL/Sweep_line_2/Sweep_line_curve_pair.h | 4 ++-- .../CGAL/Sweep_line_2/Sweep_line_event.h | 4 ++-- .../CGAL/Sweep_line_2/Sweep_line_functors.h | 4 ++-- .../CGAL/Sweep_line_2/Sweep_line_subcurve.h | 4 ++-- .../include/CGAL/Sweep_line_2_algorithms.h | 4 ++-- .../include/CGAL/Sweep_line_empty_visitor.h | 4 ++-- .../include/CGAL/graph_traits_Arrangement_2.h | 4 ++-- .../CGAL/graph_traits_Dual_Arrangement_2.h | 8 +++---- .../CGAL/HalfedgeDS_face_max_base_with_id.h | 4 ++-- .../HalfedgeDS_halfedge_max_base_with_id.h | 4 ++-- .../CGAL/HalfedgeDS_vertex_max_base_with_id.h | 4 ++-- BGL/include/CGAL/Polyhedron_items_with_id_3.h | 4 ++-- .../Triangulation_vertex_base_with_id_2.h | 4 ++-- .../boost/graph/graph_traits_HalfedgeDS.h | 4 ++-- .../CGAL/boost/graph/halfedge_graph_traits.h | 4 ++-- .../graph/halfedge_graph_traits_HalfedgeDS.h | 4 ++-- .../halfedge_graph_traits_Polyhedron_3.h | 4 ++-- .../CGAL/boost/graph/named_function_params.h | 4 ++-- BGL/include/CGAL/boost/graph/properties.h | 4 ++-- .../boost/graph/properties_Polyhedron_3.h | 4 ++-- .../include/CGAL/Boolean_set_operations_2.h | 4 ++-- .../Bso_internal_functions.h | 4 ++-- .../Ccb_curve_iterator.h | 4 ++-- .../Curve_with_halfedge.h | 4 ++-- .../Gps_agg_meta_traits.h | 4 ++-- .../Boolean_set_operations_2/Gps_agg_op.h | 4 ++-- .../Gps_agg_op_sweep.h | 4 ++-- .../Gps_agg_op_visitor.h | 4 ++-- .../Gps_base_functor.h | 4 ++-- .../Gps_bfs_base_visitor.h | 4 ++-- .../Gps_bfs_intersection_visitor.h | 4 ++-- .../Gps_bfs_join_visitor.h | 4 ++-- .../Gps_bfs_scanner.h | 4 ++-- .../Gps_bfs_xor_visitor.h | 4 ++-- .../Gps_default_dcel.h | 4 ++-- .../Gps_default_traits.h | 4 ++-- .../Gps_difference_functor.h | 4 ++-- .../Gps_do_intersect_functor.h | 4 ++-- .../Gps_insertion_meta_traits.h | 4 ++-- .../Gps_intersection_functor.h | 4 ++-- .../Gps_join_functor.h | 4 ++-- .../CGAL/Boolean_set_operations_2/Gps_merge.h | 4 ++-- .../Gps_on_surface_base_2.h | 4 ++-- .../Gps_polygon_simplifier.h | 4 ++-- .../Gps_polygon_validation.h | 4 ++-- .../Gps_simplifier_traits.h | 4 ++-- .../Gps_sym_diff_functor.h | 4 ++-- .../Gps_traits_adaptor.h | 4 ++-- .../Gps_traits_decorator.h | 4 ++-- .../Point_with_vertex.h | 4 ++-- .../Polygon_2_curve_iterator.h | 4 ++-- .../include/CGAL/General_polygon_2.h | 4 ++-- .../include/CGAL/General_polygon_set_2.h | 4 ++-- .../CGAL/General_polygon_set_on_surface_2.h | 4 ++-- .../CGAL/General_polygon_with_holes_2.h | 4 ++-- .../CGAL/Gps_circle_segment_traits_2.h | 4 ++-- .../include/CGAL/Gps_segment_traits_2.h | 4 ++-- .../include/CGAL/Gps_traits_2.h | 4 ++-- .../include/CGAL/IO/Dxf_bsop_reader.h | 4 ++-- .../include/CGAL/IO/Gps_iostream.h | 4 ++-- .../include/CGAL/Polygon_set_2.h | 4 ++-- .../include/CGAL/Polygon_with_holes_2.h | 4 ++-- .../include/CGAL/connect_holes.h | 4 ++-- .../include/CGAL/Box_intersection_d/Box_d.h | 4 ++-- .../CGAL/Box_intersection_d/Box_traits_d.h | 4 ++-- .../Box_intersection_d/Box_with_handle_d.h | 4 ++-- .../CGAL/Box_intersection_d/box_limits.h | 4 ++-- .../CGAL/Box_intersection_d/segment_tree.h | 4 ++-- .../include/CGAL/box_intersection_d.h | 4 ++-- Cartesian_kernel/include/CGAL/Cartesian.h | 4 ++-- .../CGAL/Cartesian/Aff_transformation_2.h | 8 +++---- .../CGAL/Cartesian/Aff_transformation_3.h | 8 +++---- .../CGAL/Cartesian/Aff_transformation_rep_2.h | 4 ++-- .../CGAL/Cartesian/Aff_transformation_rep_3.h | 4 ++-- .../include/CGAL/Cartesian/Cartesian_base.h | 4 ++-- .../include/CGAL/Cartesian/Circle_2.h | 4 ++-- .../include/CGAL/Cartesian/Circle_3.h | 4 ++-- .../include/CGAL/Cartesian/Data_accessor_2.h | 4 ++-- .../include/CGAL/Cartesian/Direction_2.h | 4 ++-- .../include/CGAL/Cartesian/Direction_3.h | 4 ++-- .../include/CGAL/Cartesian/Iso_cuboid_3.h | 4 ++-- .../include/CGAL/Cartesian/Iso_rectangle_2.h | 4 ++-- .../include/CGAL/Cartesian/Line_2.h | 4 ++-- .../include/CGAL/Cartesian/Line_3.h | 4 ++-- .../include/CGAL/Cartesian/Plane_3.h | 4 ++-- .../include/CGAL/Cartesian/Point_2.h | 4 ++-- .../include/CGAL/Cartesian/Point_3.h | 4 ++-- .../include/CGAL/Cartesian/Ray_2.h | 4 ++-- .../include/CGAL/Cartesian/Ray_3.h | 4 ++-- .../include/CGAL/Cartesian/Rotation_rep_2.h | 4 ++-- .../include/CGAL/Cartesian/Scaling_rep_2.h | 4 ++-- .../include/CGAL/Cartesian/Scaling_rep_3.h | 4 ++-- .../include/CGAL/Cartesian/Segment_2.h | 4 ++-- .../include/CGAL/Cartesian/Segment_3.h | 4 ++-- .../include/CGAL/Cartesian/Sphere_3.h | 4 ++-- .../include/CGAL/Cartesian/Tetrahedron_3.h | 4 ++-- .../CGAL/Cartesian/Translation_rep_2.h | 4 ++-- .../CGAL/Cartesian/Translation_rep_3.h | 4 ++-- .../include/CGAL/Cartesian/Triangle_2.h | 4 ++-- .../include/CGAL/Cartesian/Triangle_3.h | 4 ++-- .../include/CGAL/Cartesian/Vector_2.h | 4 ++-- .../include/CGAL/Cartesian/Vector_3.h | 4 ++-- .../CGAL/Cartesian/ft_constructions_2.h | 4 ++-- .../CGAL/Cartesian/ft_constructions_3.h | 4 ++-- .../include/CGAL/Cartesian/function_objects.h | 4 ++-- .../CGAL/Cartesian/line_constructions_2.h | 4 ++-- .../CGAL/Cartesian/plane_constructions_3.h | 4 ++-- .../CGAL/Cartesian/point_constructions_2.h | 4 ++-- .../CGAL/Cartesian/point_constructions_3.h | 4 ++-- .../Cartesian/predicates_on_directions_2.h | 4 ++-- .../CGAL/Cartesian/predicates_on_planes_3.h | 4 ++-- .../CGAL/Cartesian/predicates_on_points_2.h | 4 ++-- .../CGAL/Cartesian/predicates_on_points_3.h | 4 ++-- .../include/CGAL/Cartesian/solve_3.h | 4 ++-- .../include/CGAL/Cartesian_converter.h | 4 ++-- .../include/CGAL/Simple_cartesian.h | 4 ++-- .../include/CGAL/constructions/kernel_ftC2.h | 4 ++-- .../include/CGAL/constructions/kernel_ftC3.h | 4 ++-- .../include/CGAL/predicates/kernel_ftC2.h | 4 ++-- .../include/CGAL/predicates/kernel_ftC3.h | 4 ++-- .../include/CGAL/Circular_arc_2.h | 4 ++-- .../include/CGAL/Circular_arc_point_2.h | 4 ++-- .../include/CGAL/Circular_kernel_2.h | 4 ++-- .../internal_functions_on_circle_2.h | 4 ++-- .../include/CGAL/Circular_kernel_converter.h | 4 ++-- .../CGAL/Circular_kernel_intersections.h | 4 ++-- .../Circular_kernel_type_equality_wrapper.h | 4 ++-- .../include/CGAL/Exact_circular_kernel_2.h | 4 ++-- .../CGAL/Filtered_bbox_circular_kernel_2.h | 4 ++-- .../bbox_filtered_predicates.h | 4 ++-- .../CGAL/Filtered_hexagon_circular_kernel_2.h | 4 ++-- .../Circular_arc_with_hexagon_2.h | 4 ++-- .../Line_arc_with_hexagon_2.h | 4 ++-- .../hexagon_filtered_predicates.h | 4 ++-- .../include/CGAL/IO/Dxf_reader.h | 4 ++-- .../include/CGAL/IO/Dxf_reader_doubles.h | 4 ++-- .../include/CGAL/Lazy_circular_kernel_2.h | 4 ++-- .../CGAL/Lazy_circular_kernel_constructions.h | 4 ++-- Circular_kernel_2/include/CGAL/Line_arc_2.h | 4 ++-- .../include/CGAL/Simple_circular_kernel_2.h | 4 ++-- .../CGAL/global_functions_circular_kernel_2.h | 4 ++-- .../include/CGAL/Exact_spherical_kernel_3.h | 4 ++-- .../CGAL/Spherical_kernel_intersections.h | 4 ++-- .../global_functions_spherical_kernel_3.h | 4 ++-- .../CGAL/Safe_circulator_from_iterator.h | 4 ++-- Circulator/include/CGAL/circulator.h | 4 ++-- Circulator/include/CGAL/circulator_bases.h | 4 ++-- Circulator/include/CGAL/circulator_impl.h | 4 ++-- Conic_2/include/CGAL/ConicCPA2.h | 4 ++-- Conic_2/include/CGAL/ConicHPA2.h | 4 ++-- Conic_2/include/CGAL/Conic_2.h | 4 ++-- Conic_2/include/CGAL/Conic_misc.h | 4 ++-- .../CGAL/Convex_decomposition_3/Edge_sorter.h | 4 ++-- .../External_structure_builder.h | 4 ++-- .../Insert_vertex_into_edge.h | 4 ++-- .../Ray_hit_generator.h | 4 ++-- .../Ray_hit_generator2.h | 4 ++-- .../Reflex_edge_searcher.h | 4 ++-- .../Reflex_vertex_searcher.h | 4 ++-- .../Convex_decomposition_3/SFace_separator.h | 4 ++-- .../CGAL/Convex_decomposition_3/SM_walls.h | 4 ++-- .../Single_wall_creator.h | 4 ++-- .../Single_wall_creator2.h | 4 ++-- .../Single_wall_creator3.h | 4 ++-- .../YVertical_wall_builder.h | 4 ++-- .../Convex_decomposition_3/is_reflex_sedge.h | 4 ++-- .../include/CGAL/convex_decomposition_3.h | 4 ++-- .../Convex_hull_2/include/CGAL/ch_timing_2.h | 4 ++-- .../include/CGAL/ch_timing_2_impl.h | 4 ++-- .../Convex_hull_2/ch_akl_toussaint_impl.h | 4 ++-- .../CGAL/Convex_hull_2/ch_bykat_impl.h | 4 ++-- .../include/CGAL/Convex_hull_2/ch_eddy_impl.h | 4 ++-- .../Convex_hull_2/ch_graham_andrew_impl.h | 4 ++-- .../CGAL/Convex_hull_2/ch_jarvis_impl.h | 4 ++-- .../CGAL/Convex_hull_2/ch_melkman_impl.h | 4 ++-- .../ch_selected_extreme_points_2_impl.h | 4 ++-- .../Convex_hull_2/convexity_check_2_impl.h | 4 ++-- .../include/CGAL/IO/Tee_for_output_iterator.h | 4 ++-- Convex_hull_2/include/CGAL/ch_akl_toussaint.h | 4 ++-- Convex_hull_2/include/CGAL/ch_bykat.h | 4 ++-- Convex_hull_2/include/CGAL/ch_eddy.h | 4 ++-- .../include/CGAL/ch_function_objects_2.h | 4 ++-- Convex_hull_2/include/CGAL/ch_graham_andrew.h | 4 ++-- Convex_hull_2/include/CGAL/ch_jarvis.h | 4 ++-- Convex_hull_2/include/CGAL/ch_melkman.h | 4 ++-- .../CGAL/ch_selected_extreme_points_2.h | 4 ++-- Convex_hull_2/include/CGAL/convex_hull_2.h | 4 ++-- .../CGAL/convex_hull_constructive_traits_2.h | 4 ++-- .../include/CGAL/convex_hull_traits_2.h | 4 ++-- .../include/CGAL/convexity_check_2.h | 4 ++-- .../include/CGAL/_test_fct_ch_I_2.h | 4 ++-- .../include/CGAL/_test_fct_ch_I_2_impl.h | 4 ++-- .../Convex_hull_2/include/CGAL/ch__test.h | 4 ++-- .../include/CGAL/ch__test_impl.h | 4 ++-- .../include/CGAL/convex_hull_incremental_3.h | 4 ++-- Convex_hull_d/include/CGAL/Convex_hull_d.h | 4 ++-- .../CGAL/Convex_hull_d_to_polyhedron_3.h | 4 ++-- .../include/CGAL/Convex_hull_d_traits_3.h | 4 ++-- Convex_hull_d/include/CGAL/Delaunay_d.h | 4 ++-- .../include/CGAL/Regular_complex_d.h | 4 ++-- .../include/CGAL/squared_distance_2_1.h | 4 ++-- .../include/CGAL/squared_distance_2_2.h | 4 ++-- .../include/CGAL/squared_distance_utils.h | 4 ++-- .../include/CGAL/squared_distance_3_0.h | 4 ++-- .../include/CGAL/squared_distance_3_1.h | 4 ++-- .../include/CGAL/squared_distance_3_2.h | 4 ++-- .../include/CGAL/Env_default_diagram_1.h | 4 ++-- .../Envelope_2/Env_divide_and_conquer_2.h | 4 ++-- .../Env_divide_and_conquer_2_impl.h | 4 ++-- Envelope_2/include/CGAL/envelope_2.h | 4 ++-- Envelope_3/include/CGAL/Env_plane_traits_3.h | 4 ++-- Envelope_3/include/CGAL/Env_sphere_traits_3.h | 4 ++-- .../include/CGAL/Env_surface_data_traits_3.h | 4 ++-- .../include/CGAL/Env_tracing_traits_3.h | 4 ++-- .../include/CGAL/Env_triangle_traits_3.h | 4 ++-- .../Envelope_3/Env_plane_traits_3_functions.h | 4 ++-- .../include/CGAL/Envelope_3/Envelope_base.h | 4 ++-- .../Envelope_diagram_on_surface_2.h | 4 ++-- .../Envelope_divide_and_conquer_3.h | 4 ++-- .../Envelope_3/Envelope_element_visitor_3.h | 4 ++-- .../CGAL/Envelope_3/Envelope_overlay_2.h | 4 ++-- .../Envelope_3/Envelope_overlay_functor.h | 4 ++-- Envelope_3/include/CGAL/envelope_3.h | 4 ++-- Envelope_3/test/Envelope_3/Envelope_test_3.h | 4 ++-- .../Envelope_test_overlay_functor.h | 4 ++-- .../Envelope_3/Envelope_triangles_test_3.h | 4 ++-- .../examples/Filtered_kernel/Cartesian_I.h | 4 ++-- .../include/CGAL/Filtered_kernel.h | 4 ++-- .../Cartesian_coordinate_iterator_2.h | 4 ++-- .../Cartesian_coordinate_iterator_3.h | 4 ++-- .../include/CGAL/Filtered_predicate.h | 4 ++-- .../include/CGAL/Kernel_profiler.h | 4 ++-- Filtered_kernel/include/CGAL/Lazy.h | 4 ++-- Filtered_kernel/include/CGAL/Lazy_kernel.h | 4 ++-- .../include/CGAL/Restricted_double.h | 4 ++-- .../include/CGAL/Robust_construction.h | 4 ++-- .../include/CGAL/Random_convex_set_traits_2.h | 4 ++-- .../include/CGAL/Random_polygon_traits_2.h | 4 ++-- Generator/include/CGAL/generators.h | 4 ++-- Generator/include/CGAL/point_generators_2.h | 4 ++-- Generator/include/CGAL/point_generators_3.h | 4 ++-- Generator/include/CGAL/point_generators_d.h | 4 ++-- Generator/include/CGAL/random_convex_set_2.h | 4 ++-- Generator/include/CGAL/random_selection.h | 4 ++-- Geomview/include/CGAL/IO/Geomview_stream.h | 4 ++-- Geomview/src/CGAL/Geomview_stream.cpp | 8 +++---- .../include/CGAL/HalfedgeDS_const_decorator.h | 4 ++-- .../include/CGAL/HalfedgeDS_decorator.h | 4 ++-- HalfedgeDS/include/CGAL/HalfedgeDS_default.h | 4 ++-- .../include/CGAL/HalfedgeDS_face_base.h | 4 ++-- .../include/CGAL/HalfedgeDS_face_min_base.h | 4 ++-- .../include/CGAL/HalfedgeDS_halfedge_base.h | 4 ++-- .../CGAL/HalfedgeDS_halfedge_min_base.h | 4 ++-- HalfedgeDS/include/CGAL/HalfedgeDS_items_2.h | 4 ++-- .../include/CGAL/HalfedgeDS_items_decorator.h | 4 ++-- HalfedgeDS/include/CGAL/HalfedgeDS_iterator.h | 4 ++-- .../CGAL/HalfedgeDS_iterator_adaptor.h | 4 ++-- HalfedgeDS/include/CGAL/HalfedgeDS_list.h | 4 ++-- .../include/CGAL/HalfedgeDS_min_items.h | 4 ++-- HalfedgeDS/include/CGAL/HalfedgeDS_vector.h | 4 ++-- .../include/CGAL/HalfedgeDS_vertex_base.h | 4 ++-- .../include/CGAL/HalfedgeDS_vertex_min_base.h | 4 ++-- HalfedgeDS/include/CGAL/Polyhedron_items_3.h | 4 ++-- .../include/CGAL/halfedgeDS_cut_component.h | 4 ++-- .../CGAL/halfedgeds_connected_components.h | 4 ++-- Hash_map/include/CGAL/Handle_hash_function.h | 4 ++-- Hash_map/include/CGAL/Tools/chained_map.h | 4 ++-- Hash_map/include/CGAL/Unique_hash_map.h | 4 ++-- Homogeneous_kernel/include/CGAL/Homogeneous.h | 4 ++-- .../CGAL/Homogeneous/Aff_transformationH2.h | 4 ++-- .../CGAL/Homogeneous/Aff_transformationH3.h | 4 ++-- .../include/CGAL/Homogeneous/CircleH2.h | 4 ++-- .../CGAL/Homogeneous/Data_accessorH2.h | 4 ++-- .../include/CGAL/Homogeneous/DirectionH2.h | 8 +++---- .../include/CGAL/Homogeneous/DirectionH3.h | 4 ++-- .../CGAL/Homogeneous/Homogeneous_base.h | 4 ++-- .../include/CGAL/Homogeneous/Iso_cuboidH3.h | 4 ++-- .../CGAL/Homogeneous/Iso_rectangleH2.h | 4 ++-- .../include/CGAL/Homogeneous/LineH2.h | 4 ++-- .../include/CGAL/Homogeneous/PlaneH3.h | 4 ++-- .../include/CGAL/Homogeneous/PointH2.h | 4 ++-- .../include/CGAL/Homogeneous/PointH3.h | 4 ++-- .../include/CGAL/Homogeneous/RayH3.h | 4 ++-- .../include/CGAL/Homogeneous/SphereH3.h | 4 ++-- .../include/CGAL/Homogeneous/VectorH2.h | 4 ++-- .../include/CGAL/Homogeneous/VectorH3.h | 4 ++-- .../CGAL/Homogeneous/basic_constructionsH2.h | 4 ++-- .../CGAL/Homogeneous/basic_constructionsH3.h | 4 ++-- .../CGAL/Homogeneous/distance_predicatesH2.h | 4 ++-- .../CGAL/Homogeneous/distance_predicatesH3.h | 4 ++-- .../CGAL/Homogeneous/function_objects.h | 4 ++-- .../CGAL/Homogeneous/predicates_on_pointsH2.h | 4 ++-- .../CGAL/Homogeneous/predicates_on_pointsH3.h | 4 ++-- .../include/CGAL/Homogeneous_converter.h | 4 ++-- .../include/CGAL/Simple_homogeneous.h | 4 ++-- Installation/include/CGAL/config.h | 7 ++---- .../Interpolation_gradient_fitting_traits_2.h | 4 ++-- .../include/CGAL/Interpolation_traits_2.h | 4 ++-- .../CGAL/Voronoi_intersection_2_traits_3.h | 4 ++-- ...s_for_voronoi_intersection_cartesian_2_3.h | 4 ++-- .../include/CGAL/interpolation_functions.h | 4 ++-- .../CGAL/natural_neighbor_coordinates_2.h | 4 ++-- .../CGAL/natural_neighbor_coordinates_3.h | 4 ++-- ...s_for_voronoi_intersection_cartesian_2_3.h | 4 ++-- .../CGAL/regular_neighbor_coordinates_2.h | 4 ++-- .../include/CGAL/sibson_gradient_fitting.h | 4 ++-- .../CGAL/surface_neighbor_coordinates_3.h | 4 ++-- .../include/CGAL/surface_neighbors_3.h | 4 ++-- .../include/CGAL/Bbox_2_Line_2_intersection.h | 4 ++-- .../CGAL/Circle_2_Circle_2_intersection.h | 4 ++-- .../CGAL/Circle_2_Line_2_intersection.h | 4 ++-- .../Triangle_2_Triangle_2_intersection_impl.h | 4 ++-- ...rectangle_2_Iso_rectangle_2_intersection.h | 4 ++-- .../Line_2_Iso_rectangle_2_intersection.h | 4 ++-- .../include/CGAL/Line_2_Line_2_intersection.h | 4 ++-- .../CGAL/Line_2_Triangle_2_intersection.h | 4 ++-- .../Point_2_Iso_rectangle_2_intersection.h | 4 ++-- .../CGAL/Point_2_Line_2_intersection.h | 4 ++-- .../CGAL/Point_2_Point_2_intersection.h | 4 ++-- .../include/CGAL/Point_2_Ray_2_intersection.h | 4 ++-- .../CGAL/Point_2_Segment_2_intersection.h | 4 ++-- .../CGAL/Point_2_Triangle_2_intersection.h | 4 ++-- .../include/CGAL/Ray_2_Bbox_2_intersection.h | 4 ++-- .../CGAL/Ray_2_Iso_rectangle_2_intersection.h | 4 ++-- .../include/CGAL/Ray_2_Line_2_intersection.h | 4 ++-- .../include/CGAL/Ray_2_Ray_2_intersection.h | 4 ++-- .../CGAL/Ray_2_Segment_2_intersection.h | 4 ++-- .../CGAL/Ray_2_Triangle_2_intersection.h | 4 ++-- .../Segment_2_Iso_rectangle_2_intersection.h | 4 ++-- .../CGAL/Segment_2_Line_2_intersection.h | 4 ++-- .../CGAL/Segment_2_Segment_2_intersection.h | 4 ++-- .../CGAL/Segment_2_Triangle_2_intersection.h | 4 ++-- Intersections_2/include/CGAL/Straight_2.h | 4 ++-- .../CGAL/Triangle_2_Triangle_2_do_intersect.h | 4 ++-- .../CGAL/Triangle_2_Triangle_2_intersection.h | 4 ++-- .../src/CGAL/Bbox_2_intersections.cpp | 4 ++-- .../Intersections_3/intersection_3_1_impl.h | 4 ++-- .../CGAL/Triangle_3_Line_3_do_intersect.h | 4 ++-- .../CGAL/Triangle_3_Plane_3_do_intersect.h | 4 ++-- .../CGAL/Triangle_3_Point_3_do_intersect.h | 4 ++-- .../CGAL/Triangle_3_Ray_3_do_intersect.h | 4 ++-- .../CGAL/Triangle_3_Segment_3_do_intersect.h | 4 ++-- .../Triangle_3_Tetrahedron_3_do_intersect.h | 4 ++-- .../CGAL/Triangle_3_Triangle_3_do_intersect.h | 4 ++-- .../include/CGAL/bbox_intersection_3.h | 4 ++-- .../Bbox_3_Bbox_3_do_intersect.h | 4 ++-- .../Bbox_3_Line_3_do_intersect.h | 4 ++-- .../Bbox_3_Ray_3_do_intersect.h | 4 ++-- .../Bbox_3_Segment_3_do_intersect.h | 4 ++-- .../include/CGAL/intersection_3_1.h | 4 ++-- .../include/CGAL/Bigfloat_interval_traits.h | 4 ++-- .../include/CGAL/Interval_traits.h | 4 ++-- .../Test/_test_bigfloat_interval_traits.h | 4 ++-- .../include/CGAL/Test/_test_convert_to_bfi.h | 4 ++-- .../include/CGAL/Test/_test_interval_traits.h | 4 ++-- .../include/CGAL/convert_to_bfi.h | 4 ++-- .../CGAL/IO/Alpha_shape_3_VRML_2_ostream.h | 4 ++-- Inventor/include/CGAL/IO/Inventor_ostream.h | 8 +++---- Inventor/include/CGAL/IO/VRML_1_ostream.h | 8 +++---- Inventor/include/CGAL/IO/VRML_2_ostream.h | 24 +++++++++---------- .../include/CGAL/Monge_via_jet_fitting.h | 4 ++-- Kernel_23/include/CGAL/Aff_transformation_2.h | 4 ++-- Kernel_23/include/CGAL/Aff_transformation_3.h | 4 ++-- Kernel_23/include/CGAL/Bbox_2.h | 4 ++-- Kernel_23/include/CGAL/Bbox_3.h | 4 ++-- Kernel_23/include/CGAL/Circle_2.h | 4 ++-- Kernel_23/include/CGAL/Circle_3.h | 4 ++-- Kernel_23/include/CGAL/Dimension.h | 4 ++-- Kernel_23/include/CGAL/Direction_2.h | 4 ++-- Kernel_23/include/CGAL/Direction_3.h | 4 ++-- Kernel_23/include/CGAL/Enum_converter.h | 4 ++-- ...ct_predicates_exact_constructions_kernel.h | 4 ++-- ...tes_exact_constructions_kernel_with_sqrt.h | 4 ++-- ..._predicates_inexact_constructions_kernel.h | 4 ++-- Kernel_23/include/CGAL/Is_a_predicate.h | 4 ++-- Kernel_23/include/CGAL/Iso_cuboid_3.h | 4 ++-- Kernel_23/include/CGAL/Iso_rectangle_2.h | 4 ++-- .../include/CGAL/Kernel/Dimension_utils.h | 4 ++-- .../include/CGAL/Kernel/Return_base_tag.h | 4 ++-- .../include/CGAL/Kernel/Same_uncertainty.h | 4 ++-- .../CGAL/Kernel/Type_equality_wrapper.h | 4 ++-- Kernel_23/include/CGAL/Kernel/Type_mapper.h | 4 ++-- Kernel_23/include/CGAL/Kernel/Wutils.h | 4 ++-- .../include/CGAL/Kernel/function_objects.h | 4 ++-- .../include/CGAL/Kernel/global_functions.h | 4 ++-- .../include/CGAL/Kernel/global_functions_2.h | 4 ++-- .../include/CGAL/Kernel/global_functions_3.h | 4 ++-- .../CGAL/Kernel/global_functions_internal_2.h | 4 ++-- .../CGAL/Kernel/global_functions_internal_3.h | 4 ++-- Kernel_23/include/CGAL/Kernel/mpl.h | 4 ++-- Kernel_23/include/CGAL/Kernel/solve.h | 4 ++-- Kernel_23/include/CGAL/Kernel_checker.h | 4 ++-- Kernel_23/include/CGAL/Line_2.h | 4 ++-- Kernel_23/include/CGAL/Line_3.h | 4 ++-- Kernel_23/include/CGAL/Origin.h | 4 ++-- Kernel_23/include/CGAL/Plane_3.h | 4 ++-- Kernel_23/include/CGAL/Point_2.h | 4 ++-- Kernel_23/include/CGAL/Point_3.h | 4 ++-- Kernel_23/include/CGAL/Qualified_result_of.h | 4 ++-- Kernel_23/include/CGAL/Ray_2.h | 4 ++-- Kernel_23/include/CGAL/Ray_3.h | 4 ++-- Kernel_23/include/CGAL/Segment_2.h | 4 ++-- Kernel_23/include/CGAL/Segment_3.h | 4 ++-- Kernel_23/include/CGAL/Sphere_3.h | 4 ++-- Kernel_23/include/CGAL/Tetrahedron_3.h | 4 ++-- Kernel_23/include/CGAL/Triangle_2.h | 4 ++-- Kernel_23/include/CGAL/Triangle_3.h | 4 ++-- Kernel_23/include/CGAL/Vector_2.h | 4 ++-- Kernel_23/include/CGAL/Vector_3.h | 4 ++-- .../include/CGAL/aff_transformation_tags.h | 4 ++-- .../CGAL/cartesian_homogeneous_conversion.h | 4 ++-- Kernel_23/include/CGAL/determinant.h | 4 ++-- Kernel_23/include/CGAL/enum.h | 4 ++-- Kernel_23/include/CGAL/kernel_to_kernel.h | 4 ++-- .../CGAL/predicates/sign_of_determinant.h | 4 ++-- Kernel_23/include/CGAL/rational_rotation.h | 4 ++-- Kernel_23/include/CGAL/representation_tags.h | 4 ++-- Kernel_23/src/CGAL/kernel.cpp | 4 ++-- Kernel_d/include/CGAL/Cartesian_d.h | 4 ++-- Kernel_d/include/CGAL/Homogeneous_d.h | 4 ++-- .../CGAL/Kernel_d/Aff_transformationCd.h | 4 ++-- .../CGAL/Kernel_d/Aff_transformationHd.h | 4 ++-- .../CGAL/Kernel_d/Aff_transformation_d.h | 4 ++-- .../Kernel_d/Cartesian_const_iterator_d.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/DirectionCd.h | 4 ++-- .../include/CGAL/Kernel_d/DirectionCd_impl.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/DirectionHd.h | 4 ++-- .../include/CGAL/Kernel_d/DirectionHd_impl.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Direction_d.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/HyperplaneCd.h | 4 ++-- .../include/CGAL/Kernel_d/HyperplaneCd_impl.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/HyperplaneHd.h | 4 ++-- .../include/CGAL/Kernel_d/HyperplaneHd_impl.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Hyperplane_d.h | 4 ++-- .../include/CGAL/Kernel_d/Interface_classes.h | 4 ++-- .../include/CGAL/Kernel_d/Kernel_classesCd.h | 4 ++-- .../include/CGAL/Kernel_d/Kernel_classesHd.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Line_d.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Line_d_impl.h | 4 ++-- .../CGAL/Kernel_d/Linear_algebraCd_impl.h | 4 ++-- .../CGAL/Kernel_d/Linear_algebraHd_impl.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Pair_d.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/PointCd.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/PointCd_impl.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/PointHd.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/PointHd_impl.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Point_d.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Ray_d.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Segment_d.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Sphere_d.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Tuple_d.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/VectorCd.h | 4 ++-- .../include/CGAL/Kernel_d/VectorCd_impl.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/VectorHd.h | 4 ++-- .../include/CGAL/Kernel_d/VectorHd_impl.h | 4 ++-- Kernel_d/include/CGAL/Kernel_d/Vector_d.h | 4 ++-- .../include/CGAL/Kernel_d/function_objects.h | 4 ++-- .../CGAL/Kernel_d/function_objectsCd.h | 4 ++-- .../CGAL/Kernel_d/function_objectsHd.h | 4 ++-- .../CGAL/Kernel_d/intersection_objectsCd.h | 4 ++-- .../CGAL/Kernel_d/intersection_objectsHd.h | 4 ++-- .../CGAL/Kernel_d/intersection_objects_d.h | 4 ++-- .../include/CGAL/Kernel_d/simple_objects.h | 4 ++-- Kernel_d/include/CGAL/Linear_algebraCd.h | 4 ++-- Kernel_d/include/CGAL/Linear_algebraHd.h | 4 ++-- Kernel_d/include/CGAL/constructions_d.h | 4 ++-- Kernel_d/include/CGAL/intersections_d.h | 4 ++-- Kernel_d/include/CGAL/predicates_d.h | 4 ++-- .../include/CGAL/simple_transformations_d.h | 4 ++-- .../include/SoQt_handle.h | 4 ++-- .../CGAL/Kinetic/Interval_simulator_traits.h | 4 ++-- .../CGAL/Updatable_Delaunay_triangulation_2.h | 4 ++-- ...Updatable_Delaunay_triangulation_table_2.h | 4 ++-- .../include/CGAL/Kinetic/basic.h | 4 ++-- .../CGAL/Polynomial/CORE_Expr_root_stack.h | 4 ++-- .../internal/Double_with_infinity.h | 4 ++-- .../Polynomial/internal/Filtered_number.h | 4 ++-- .../Polynomial/internal/Isolating_interval.h | 4 ++-- .../internal/Simple_interval_root.h | 4 ++-- .../internal/Sturm_isolating_interval.h | 4 ++-- .../CGAL/Polynomial/internal/Sturm_root_rep.h | 4 ++-- .../include/CGAL/Polynomial/internal/macros.h | 4 ++-- .../include/CGAL/Tools/Counter.h | 4 ++-- .../include/CGAL/Tools/Label.h | 4 ++-- .../include/CGAL/Tools/Log.h | 4 ++-- .../include/CGAL/Tools/utility_macros.h | 12 +++++----- Kinetic_data_structures/src/CGAL/KDS_Log.cpp | 4 ++-- LEDA/include/CGAL/leda_in_CGAL_2.h | 4 ++-- LEDA/include/CGAL/rat_leda_in_CGAL_2.h | 4 ++-- .../CGAL/predicates_on_points_rat_leda_2.h | 4 ++-- LEDA/test/LEDA/include/CGAL/rat_leda.h | 4 ++-- .../CGAL/Largest_empty_iso_rectangle_2.h | 4 ++-- Matrix_search/include/CGAL/Cartesian_matrix.h | 4 ++-- Matrix_search/include/CGAL/Dynamic_matrix.h | 4 ++-- .../include/CGAL/Extremal_polygon_traits_2.h | 8 +++---- .../CGAL/Rectangular_p_center_traits_2.h | 4 ++-- .../Sorted_matrix_search_traits_adaptor.h | 4 ++-- .../include/CGAL/Transform_iterator.h | 4 ++-- .../include/CGAL/all_furthest_neighbors_2.h | 8 +++---- .../include/CGAL/extremal_polygon_2.h | 4 ++-- .../include/CGAL/monotone_matrix_search.h | 4 ++-- .../include/CGAL/pierce_rectangles_2.h | 8 +++---- .../include/CGAL/rectangular_3_center_2.h | 4 ++-- .../include/CGAL/rectangular_p_center_2.h | 4 ++-- .../include/CGAL/sorted_matrix_search.h | 4 ++-- Mesh_3/include/CGAL/Mesh_3/Lloyd_move.h | 4 ++-- .../CGAL/Mesh_3/Mesh_global_optimizer.h | 4 ++-- .../include/CGAL/Mesh_3/Mesh_sizing_field.h | 4 ++-- Mesh_3/include/CGAL/Mesh_3/Odt_move.h | 4 ++-- .../Mesh_3/Robust_intersection_traits_3.h | 4 ++-- Mesh_3/include/CGAL/Mesh_3/Sizing_grid.h | 4 ++-- Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h | 4 ++-- .../CGAL/Mesh_3/Triangulation_helpers.h | 4 ++-- .../CGAL/Mesh_3/Triangulation_sizing_field.h | 4 ++-- .../CGAL/Mesh_3/Uniform_sizing_field.h | 4 ++-- .../include/CGAL/Mesh_3/global_parameters.h | 4 ++-- .../include/CGAL/Mesh_3/vertex_perturbation.h | 4 ++-- .../CGAL/Mesh_optimization_return_code.h | 4 ++-- Mesh_3/include/CGAL/exude_mesh_3.h | 4 ++-- Mesh_3/include/CGAL/perturb_mesh_3.h | 4 ++-- Min_annulus_d/include/CGAL/Min_annulus_d.h | 4 ++-- .../test/Min_annulus_d/test_Min_annulus_d.h | 4 ++-- Min_circle_2/include/CGAL/Min_circle_2.h | 4 ++-- .../Min_circle_2/Min_circle_2_adapterC2.h | 4 ++-- .../Min_circle_2/Min_circle_2_adapterH2.h | 4 ++-- .../CGAL/Min_circle_2/Min_circle_2_impl.h | 4 ++-- .../CGAL/Min_circle_2/Optimisation_circle_2.h | 4 ++-- .../Min_circle_2/Optimisation_circle_2_impl.h | 4 ++-- .../include/CGAL/Min_circle_2_traits_2.h | 4 ++-- Min_ellipse_2/include/CGAL/Min_ellipse_2.h | 4 ++-- .../Min_ellipse_2/Min_ellipse_2_adapterC2.h | 4 ++-- .../Min_ellipse_2/Min_ellipse_2_adapterH2.h | 4 ++-- .../CGAL/Min_ellipse_2/Min_ellipse_2_impl.h | 4 ++-- .../Min_ellipse_2/Optimisation_ellipse_2.h | 4 ++-- .../Optimisation_ellipse_2_impl.h | 4 ++-- .../include/CGAL/Min_ellipse_2_traits_2.h | 4 ++-- .../include/CGAL/Min_quadrilateral_traits_2.h | 4 ++-- .../include/CGAL/min_quadrilateral_2.h | 8 +++---- .../CGAL/Min_sphere_annulus_d_traits_2.h | 4 ++-- .../CGAL/Min_sphere_annulus_d_traits_3.h | 4 ++-- .../CGAL/Min_sphere_annulus_d_traits_d.h | 4 ++-- Min_sphere_d/include/CGAL/Min_sphere_d.h | 4 ++-- .../CGAL/Min_sphere_d/Min_sphere_d_impl.h | 4 ++-- .../CGAL/Min_sphere_d/Optimisation_sphere_d.h | 8 +++---- .../Minkowski_sum_2/Approx_offset_base_2.h | 4 ++-- .../Minkowski_sum_2/Arr_labeled_traits_2.h | 4 ++-- .../Decomposition_strategy_adapter.h | 4 ++-- .../Minkowski_sum_2/Exact_offset_base_2.h | 4 ++-- .../include/CGAL/Minkowski_sum_2/Labels.h | 4 ++-- .../Minkowski_sum_2/Minkowski_sum_conv_2.h | 4 ++-- .../Minkowski_sum_2/Minkowski_sum_decomp_2.h | 4 ++-- .../CGAL/Minkowski_sum_2/Offset_conv_2.h | 4 ++-- .../CGAL/Minkowski_sum_2/Offset_decomp_2.h | 4 ++-- .../Polygon_convex_decomposition.h | 4 ++-- .../Minkowski_sum_2/Union_of_curve_cycles_2.h | 4 ++-- .../CGAL/Minkowski_sum_2/Union_of_cycles_2.h | 4 ++-- .../Union_of_segment_cycles_2.h | 4 ++-- .../CGAL/Polygon_convex_decomposition_2.h | 4 ++-- ...mall_side_angle_bisector_decomposition_2.h | 4 ++-- .../include/CGAL/approximated_offset_2.h | 4 ++-- .../include/CGAL/minkowski_sum_2.h | 4 ++-- .../include/CGAL/offset_polygon_2.h | 4 ++-- .../CGAL/Minkowski_sum_3/Gaussian_map.h | 4 ++-- .../Minkowski_sum_3/Gaussian_map_to_nef_3.h | 4 ++-- .../include/CGAL/Minkowski_sum_3/PointMark.h | 4 ++-- .../bipartite_nary_union_sorted_combined.h | 4 ++-- .../include/CGAL/minkowski_sum_3.h | 4 ++-- Modifier/include/CGAL/Modifier_base.h | 4 ++-- .../CGAL/Modular_arithmetic/Residue_type.h | 4 ++-- Modular_arithmetic/include/CGAL/Residue.h | 4 ++-- Nef_2/include/CGAL/Bounded_kernel.h | 4 ++-- Nef_2/include/CGAL/Extended_cartesian.h | 4 ++-- Nef_2/include/CGAL/Extended_homogeneous.h | 4 ++-- .../CGAL/Filtered_extended_homogeneous.h | 4 ++-- .../CGAL/IO/Nef_polyhedron_2_PS_stream.h | 4 ++-- Nef_2/include/CGAL/Is_extended_kernel.h | 4 ++-- Nef_2/include/CGAL/Nef_2/Bounding_box_2.h | 4 ++-- .../CGAL/Nef_2/Constrained_triang_traits.h | 4 ++-- Nef_2/include/CGAL/Nef_2/Line_to_epoint.h | 4 ++-- Nef_2/include/CGAL/Nef_2/Object_handle.h | 4 ++-- Nef_2/include/CGAL/Nef_2/Object_index.h | 4 ++-- Nef_2/include/CGAL/Nef_2/PM_checker.h | 4 ++-- Nef_2/include/CGAL/Nef_2/PM_const_decorator.h | 4 ++-- Nef_2/include/CGAL/Nef_2/PM_decorator.h | 4 ++-- Nef_2/include/CGAL/Nef_2/PM_explorer.h | 4 ++-- Nef_2/include/CGAL/Nef_2/PM_io_parser.h | 4 ++-- Nef_2/include/CGAL/Nef_2/PM_overlayer.h | 4 ++-- Nef_2/include/CGAL/Nef_2/PM_point_locator.h | 4 ++-- Nef_2/include/CGAL/Nef_2/Polynomial.h | 4 ++-- Nef_2/include/CGAL/Nef_2/iterator_tools.h | 4 ++-- Nef_2/include/CGAL/Nef_polyhedron_2.h | 4 ++-- Nef_2/include/CGAL/Nef_polynomial.h | 4 ++-- Nef_2/include/CGAL/Nef_polynomial_fwd.h | 4 ++-- .../include/CGAL/Nef_3/Decomposition_mark.h | 4 ++-- .../include/CGAL/Nef_3/Edge_sorter.h | 4 ++-- .../include/CGAL/Nef_3/Edge_sorter2.h | 4 ++-- .../CGAL/Nef_3/External_structure_builder.h | 4 ++-- .../include/CGAL/Nef_3/Nary_union_by_pq.h | 4 ++-- .../include/CGAL/Nef_3/Nary_union_by_queue.h | 4 ++-- .../CGAL/Nef_3/Nary_union_by_small_queue.h | 4 ++-- .../include/CGAL/Nef_3/Nary_union_by_summup.h | 4 ++-- .../include/CGAL/Nef_3/Nary_union_strategy.h | 4 ++-- .../Nef_3/Nary_union_using_distinct_uniter.h | 4 ++-- .../include/CGAL/Nef_3/Ray_hit_generator.h | 4 ++-- .../include/CGAL/Nef_3/Ray_hit_generator2.h | 4 ++-- .../include/CGAL/Nef_3/Ray_shooter.h | 4 ++-- .../include/CGAL/Nef_3/Reflex_edge_searcher.h | 4 ++-- .../include/CGAL/Nef_3/Relabel_volume.h | 4 ++-- .../include/CGAL/Nef_3/SFace_separator.h | 4 ++-- .../Minkowski/include/CGAL/Nef_3/SNC_walls.h | 4 ++-- .../include/CGAL/Nef_3/Single_wall_creator.h | 4 ++-- .../include/CGAL/Nef_3/Single_wall_creator2.h | 4 ++-- .../include/CGAL/Nef_3/Single_wall_creator3.h | 4 ++-- .../CGAL/Nef_3/YVertical_wall_builder.h | 4 ++-- .../CGAL/Nef_3/YVertical_wall_builder2.h | 4 ++-- .../Nef_3/bipartite_nary_union_sequential.h | 4 ++-- .../bipartite_nary_union_sorted_combined.h | 4 ++-- .../bipartite_nary_union_sorted_separately.h | 4 ++-- .../include/CGAL/Nef_3/is_reflex_sedge.h | 4 ++-- .../include/CGAL/Nef_3/trunk_offset.h | 4 ++-- .../include/CGAL/Nef_3/trunk_offset2.h | 4 ++-- .../CGAL/Nef_3/trunk_offset_brute_force.h | 4 ++-- .../include/CGAL/Nef_S2/Gaussian_map.h | 4 ++-- .../Minkowski/include/CGAL/Nef_S2/PointMark.h | 4 ++-- .../include/CGAL/Nef_S2/PointMarkBoundary.h | 4 ++-- .../Minkowski/include/CGAL/Nef_S2/SM_walls.h | 4 ++-- .../CGAL/Nef_S2/gaussian_map_to_nef_3.h | 4 ++-- Nef_3/Visual_hull/Nef_3/visual_hull_creator.h | 4 ++-- .../Nef_3/include/CGAL/Nef_3/demo_stack.h | 4 ++-- .../include/CGAL/Nef_3/visual_hull_creator.h | 4 ++-- .../CGAL/IO/Nef_polyhedron_iostream_3.h | 4 ++-- Nef_3/include/CGAL/IO/Qt_widget_Nef_3.h | 4 ++-- Nef_3/include/CGAL/Nef_3/Binary_operation.h | 4 ++-- Nef_3/include/CGAL/Nef_3/Bounding_box_3.h | 4 ++-- .../CGAL/Nef_3/Combine_with_halfspace.h | 4 ++-- Nef_3/include/CGAL/Nef_3/Default_items.h | 4 ++-- Nef_3/include/CGAL/Nef_3/Edge_edge_overlay.h | 4 ++-- ...xact_triangulation_euclidean_traits_xy_3.h | 4 ++-- ...xact_triangulation_euclidean_traits_xz_3.h | 4 ++-- ...xact_triangulation_euclidean_traits_yz_3.h | 4 ++-- Nef_3/include/CGAL/Nef_3/Halfedge.h | 4 ++-- Nef_3/include/CGAL/Nef_3/Halffacet.h | 4 ++-- Nef_3/include/CGAL/Nef_3/ID_support_handler.h | 4 ++-- Nef_3/include/CGAL/Nef_3/Infimaximal_box.h | 4 ++-- Nef_3/include/CGAL/Nef_3/K3_tree.h | 4 ++-- .../include/CGAL/Nef_3/Mark_bounded_volumes.h | 4 ++-- Nef_3/include/CGAL/Nef_3/Nef_box.h | 4 ++-- Nef_3/include/CGAL/Nef_3/OGL_helper.h | 4 ++-- Nef_3/include/CGAL/Nef_3/Pluecker_line_3.h | 4 ++-- .../include/CGAL/Nef_3/Polygon_constructor.h | 4 ++-- .../include/CGAL/Nef_3/Polyline_constructor.h | 4 ++-- Nef_3/include/CGAL/Nef_3/SFace.h | 4 ++-- Nef_3/include/CGAL/Nef_3/SHalfedge.h | 4 ++-- Nef_3/include/CGAL/Nef_3/SHalfloop.h | 4 ++-- Nef_3/include/CGAL/Nef_3/SM_visualizor.h | 4 ++-- Nef_3/include/CGAL/Nef_3/SNC_FM_decorator.h | 4 ++-- Nef_3/include/CGAL/Nef_3/SNC_SM_explorer.h | 4 ++-- Nef_3/include/CGAL/Nef_3/SNC_SM_overlayer.h | 4 ++-- Nef_3/include/CGAL/Nef_3/SNC_SM_visualizor.h | 4 ++-- .../include/CGAL/Nef_3/SNC_const_decorator.h | 4 ++-- Nef_3/include/CGAL/Nef_3/SNC_constructor.h | 4 ++-- Nef_3/include/CGAL/Nef_3/SNC_decorator.h | 4 ++-- .../include/CGAL/Nef_3/SNC_decorator_traits.h | 4 ++-- .../CGAL/Nef_3/SNC_external_structure.h | 4 ++-- Nef_3/include/CGAL/Nef_3/SNC_indexed_items.h | 4 ++-- Nef_3/include/CGAL/Nef_3/SNC_intersection.h | 4 ++-- Nef_3/include/CGAL/Nef_3/SNC_io_parser.h | 4 ++-- Nef_3/include/CGAL/Nef_3/SNC_items.h | 4 ++-- Nef_3/include/CGAL/Nef_3/SNC_k3_tree_traits.h | 4 ++-- Nef_3/include/CGAL/Nef_3/SNC_list.h | 4 ++-- Nef_3/include/CGAL/Nef_3/SNC_point_locator.h | 4 ++-- Nef_3/include/CGAL/Nef_3/SNC_ray_shooter.h | 4 ++-- Nef_3/include/CGAL/Nef_3/SNC_simplify.h | 4 ++-- Nef_3/include/CGAL/Nef_3/SNC_sphere_map.h | 4 ++-- Nef_3/include/CGAL/Nef_3/SNC_structure.h | 4 ++-- Nef_3/include/CGAL/Nef_3/Shell_constructor.h | 4 ++-- Nef_3/include/CGAL/Nef_3/Vertex.h | 4 ++-- Nef_3/include/CGAL/Nef_3/Visualizor.h | 4 ++-- Nef_3/include/CGAL/Nef_3/Volume.h | 4 ++-- .../CGAL/Nef_3/binop_intersection_tests.h | 4 ++-- Nef_3/include/CGAL/Nef_3/bounded_side_3.h | 4 ++-- .../CGAL/Nef_3/polyhedron_3_to_nef_3.h | 4 ++-- ...uotient_coordinates_to_homogeneous_point.h | 4 ++-- Nef_3/include/CGAL/Nef_3/shell_to_nef_3.h | 4 ++-- .../CGAL/Nef_3/vertex_cycle_to_nef_3.h | 4 ++-- Nef_3/include/CGAL/Nef_nary_intersection_3.h | 4 ++-- Nef_3/include/CGAL/Nef_nary_union_3.h | 4 ++-- Nef_3/include/CGAL/Nef_polyhedron_3.h | 4 ++-- Nef_3/include/CGAL/OFF_to_nef_3.h | 8 +++---- Nef_3/include/CGAL/normal_vector_newell_3.h | 4 ++-- Nef_3/performance/Nef_3/grid_generator.h | 4 ++-- .../Nef_3/include/CGAL/Nef_3/Filtered_gcd.h | 4 ++-- Nef_3/performance/Nef_3/sat_writer.h | 4 ++-- Nef_3/performance/Nef_3/sat_writer2.h | 4 ++-- Nef_3/test/Nef_3/include/CGAL/test_Nef_3.h | 4 ++-- .../include/CGAL/Nef_3/pm_from_nef3_facet.h | 4 ++-- .../CGAL/Nef_3/triangulate_nef3_facet.h | 4 ++-- .../CGAL/Nef_S2/create_random_Nef_S2.h | 4 ++-- .../CGAL/Nef_S2/create_random_Nef_S2.h | 4 ++-- .../CGAL/IO/Nef_polyhedron_S2_OGLUT_stream.h | 4 ++-- .../CGAL/IO/Nef_polyhedron_iostream_S2.h | 4 ++-- Nef_S2/include/CGAL/IO/Qt_widget_Nef_S2.h | 4 ++-- .../include/CGAL/Nef_S2/Generic_handle_map.h | 4 ++-- Nef_S2/include/CGAL/Nef_S2/Normalizing.h | 4 ++-- Nef_S2/include/CGAL/Nef_S2/OGL_base_object.h | 4 ++-- Nef_S2/include/CGAL/Nef_S2/SM_checker.h | 4 ++-- .../include/CGAL/Nef_S2/SM_const_decorator.h | 4 ++-- .../Nef_S2/SM_constrained_triang_traits.h | 4 ++-- Nef_S2/include/CGAL/Nef_S2/SM_decorator.h | 4 ++-- .../include/CGAL/Nef_S2/SM_decorator_traits.h | 4 ++-- Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h | 4 ++-- Nef_S2/include/CGAL/Nef_S2/SM_items.h | 4 ++-- Nef_S2/include/CGAL/Nef_S2/SM_list.h | 4 ++-- Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h | 4 ++-- Nef_S2/include/CGAL/Nef_S2/SM_point_locator.h | 4 ++-- Nef_S2/include/CGAL/Nef_S2/SM_triangulator.h | 4 ++-- Nef_S2/include/CGAL/Nef_S2/SM_visualizor.h | 4 ++-- Nef_S2/include/CGAL/Nef_S2/Sphere_circle.h | 4 ++-- Nef_S2/include/CGAL/Nef_S2/Sphere_direction.h | 4 ++-- Nef_S2/include/CGAL/Nef_S2/Sphere_geometry.h | 8 +++---- .../include/CGAL/Nef_S2/Sphere_geometry_OGL.h | 4 ++-- Nef_S2/include/CGAL/Nef_S2/Sphere_map.h | 4 ++-- Nef_S2/include/CGAL/Nef_S2/Sphere_point.h | 4 ++-- Nef_S2/include/CGAL/Nef_S2/Sphere_segment.h | 4 ++-- Nef_S2/include/CGAL/Nef_S2/Sphere_triangle.h | 4 ++-- .../include/CGAL/Nef_S2/sphere_predicates.h | 4 ++-- Nef_S2/include/CGAL/Nef_polyhedron_S2.h | 4 ++-- Number_types/include/CGAL/CORE_BigFloat.h | 4 ++-- Number_types/include/CGAL/CORE_BigInt.h | 4 ++-- Number_types/include/CGAL/CORE_BigRat.h | 4 ++-- Number_types/include/CGAL/CORE_Expr.h | 4 ++-- .../include/CGAL/CORE_coercion_traits.h | 4 ++-- Number_types/include/CGAL/Counted_number.h | 4 ++-- Number_types/include/CGAL/FPU.h | 4 ++-- Number_types/include/CGAL/GMP/Gmpq_type.h | 4 ++-- Number_types/include/CGAL/GMP/Gmpz_type.h | 4 ++-- Number_types/include/CGAL/GMP/Gmpzf_type.h | 4 ++-- .../include/CGAL/Gmp_coercion_traits.h | 4 ++-- Number_types/include/CGAL/Gmpq.h | 4 ++-- Number_types/include/CGAL/Gmpz.h | 4 ++-- Number_types/include/CGAL/Gmpzf.h | 4 ++-- Number_types/include/CGAL/Interval_nt.h | 4 ++-- Number_types/include/CGAL/Lazy_exact_nt.h | 4 ++-- Number_types/include/CGAL/MP_Float.h | 4 ++-- Number_types/include/CGAL/NT_converter.h | 4 ++-- .../include/CGAL/Number_type_checker.h | 4 ++-- Number_types/include/CGAL/Quotient.h | 4 ++-- Number_types/include/CGAL/Root_of_traits.h | 4 ++-- .../Algebraic_extension_traits.h | 4 ++-- .../Algebraic_structure_traits.h | 4 ++-- .../CGAL/Sqrt_extension/Coercion_traits.h | 4 ++-- .../CGAL/Sqrt_extension/Fraction_traits.h | 4 ++-- .../Sqrt_extension/Get_arithmetic_kernel.h | 4 ++-- .../CGAL/Sqrt_extension/Modular_traits.h | 4 ++-- .../Sqrt_extension/Real_embeddable_traits.h | 4 ++-- .../Sqrt_extension/Scalar_factor_traits.h | 4 ++-- .../CGAL/Sqrt_extension/Sqrt_extension_type.h | 4 ++-- .../include/CGAL/Sqrt_extension/Wang_traits.h | 4 ++-- Number_types/include/CGAL/Sqrt_extension/io.h | 4 ++-- Number_types/include/CGAL/constant.h | 4 ++-- Number_types/include/CGAL/double.h | 4 ++-- Number_types/include/CGAL/float.h | 4 ++-- Number_types/include/CGAL/gmpxx.h | 4 ++-- .../include/CGAL/gmpxx_coercion_traits.h | 4 ++-- Number_types/include/CGAL/int.h | 4 ++-- .../include/CGAL/known_bit_size_integers.h | 4 ++-- Number_types/include/CGAL/leda_bigfloat.h | 4 ++-- .../include/CGAL/leda_bigfloat_interval.h | 8 +++---- .../include/CGAL/leda_coercion_traits.h | 4 ++-- Number_types/include/CGAL/leda_integer.h | 4 ++-- Number_types/include/CGAL/leda_rational.h | 4 ++-- Number_types/include/CGAL/leda_real.h | 4 ++-- Number_types/include/CGAL/long_double.h | 4 ++-- Number_types/include/CGAL/long_long.h | 4 ++-- Number_types/include/CGAL/mpq_class.h | 4 ++-- Number_types/include/CGAL/mpz_class.h | 4 ++-- .../CGAL/simplest_rational_in_interval.h | 4 ++-- Number_types/include/CGAL/to_rational.h | 4 ++-- Number_types/include/CGAL/utils.h | 4 ++-- Number_types/include/CGAL/utils_classes.h | 4 ++-- Number_types/src/CGAL/Interval_arithmetic.cpp | 4 ++-- Number_types/src/CGAL/MP_Float.cpp | 4 ++-- .../test/Number_types/Sqrt_extension.cpp | 4 ++-- .../include/CGAL/_test_utilities.h | 4 ++-- .../Optimisation/Access_coordinates_begin_2.h | 4 ++-- .../Optimisation/Access_coordinates_begin_3.h | 4 ++-- .../Optimisation/Access_coordinates_begin_d.h | 4 ++-- .../CGAL/Optimisation/Access_dimension_2.h | 4 ++-- .../CGAL/Optimisation/Access_dimension_3.h | 4 ++-- .../CGAL/Optimisation/Access_dimension_d.h | 4 ++-- .../CGAL/Optimisation/Construct_point_2.h | 4 ++-- .../CGAL/Optimisation/Construct_point_3.h | 4 ++-- .../CGAL/Optimisation/Construct_point_d.h | 4 ++-- .../include/CGAL/Optimisation/basic.h | 4 ++-- .../include/CGAL/Optimisation_d_traits_2.h | 4 ++-- .../include/CGAL/Optimisation_d_traits_3.h | 4 ++-- .../include/CGAL/Optimisation_d_traits_d.h | 4 ++-- PDB/include/CGAL/PDB/small_map.h | 4 ++-- .../Periodic_3_Delaunay_triangulation_3.h | 4 ++-- .../include/CGAL/Periodic_3_offset_3.h | 4 ++-- .../include/CGAL/Periodic_3_triangulation_3.h | 4 ++-- .../Periodic_3_triangulation_ds_cell_base_3.h | 4 ++-- ...eriodic_3_triangulation_ds_vertex_base_3.h | 4 ++-- ...riodic_3_triangulation_filtered_traits_3.h | 8 +++---- .../Periodic_3_triangulation_hierarchy_3.h | 4 ++-- .../Periodic_3_triangulation_iterators_3.h | 4 ++-- ...Periodic_3_triangulation_remove_traits_3.h | 4 ++-- ...iangulation_statically_filtered_traits_3.h | 4 ++-- .../CGAL/Periodic_3_triangulation_traits_3.h | 8 +++---- Point_set_2/include/CGAL/Point_set_2.h | 4 ++-- Point_set_2/include/CGAL/compare_vertices.h | 4 ++-- .../CGAL/nearest_neighbor_delaunay_2.h | 4 ++-- .../include/CGAL/range_search_delaunay_2.h | 4 ++-- .../include/CGAL/IO/read_off_points.h | 4 ++-- .../include/CGAL/IO/read_xyz_points.h | 4 ++-- .../include/CGAL/IO/write_off_points.h | 4 ++-- .../include/CGAL/IO/write_xyz_points.h | 4 ++-- .../include/CGAL/Point_with_normal_3.h | 4 ++-- .../CGAL/Search_traits_vertex_handle_3.h | 4 ++-- .../include/CGAL/compute_average_spacing.h | 4 ++-- .../include/CGAL/grid_simplify_point_set.h | 4 ++-- .../CGAL/improved_jet_smooth_point_set.h | 4 ++-- .../improved_laplacian_smooth_point_set.h | 4 ++-- .../include/CGAL/jet_estimate_normals.h | 4 ++-- .../include/CGAL/jet_smooth_point_set.h | 4 ++-- .../include/CGAL/mst_orient_normals.h | 4 ++-- .../include/CGAL/pca_estimate_normals.h | 4 ++-- .../include/CGAL/pca_smooth_point_set.h | 4 ++-- .../include/CGAL/radial_orient_normals.h | 4 ++-- .../include/CGAL/random_simplify_point_set.h | 4 ++-- .../include/CGAL/remove_outliers.h | 4 ++-- ...move_outliers_wrt_median_knn_sq_distance.h | 4 ++-- .../include/CGAL/value_type_traits.h | 4 ++-- Polygon/include/CGAL/Polygon_2.h | 8 +++---- .../Polygon_2/Polygon_2_algorithms_impl.h | 4 ++-- .../Polygon_2/Polygon_2_edge_circulator.h | 4 ++-- .../CGAL/Polygon_2/Polygon_2_edge_iterator.h | 4 ++-- .../include/CGAL/Polygon_2/Polygon_2_impl.h | 4 ++-- Polygon/include/CGAL/Polygon_2_algorithms.h | 4 ++-- Polygon/include/CGAL/Polygon_traits_2.h | 4 ++-- Polyhedron/include/CGAL/Polyhedron_3.h | 4 ++-- Polyhedron/include/CGAL/Polyhedron_copy_3.h | 4 ++-- .../CGAL/Polyhedron_incremental_builder_3.h | 4 ++-- .../include/CGAL/Polyhedron_min_items_3.h | 4 ++-- Polyhedron/include/CGAL/Polyhedron_traits_3.h | 4 ++-- .../CGAL/Polyhedron_traits_with_normals_3.h | 4 ++-- .../include/CGAL/polyhedron_cut_plane_3.h | 4 ++-- .../Polyhedron_IO/triangulation_print_OFF.h | 4 ++-- .../CGAL/IO/Polyhedron_VRML_2_ostream.h | 4 ++-- .../CGAL/IO/Polyhedron_geomview_ostream.h | 4 ++-- .../CGAL/IO/Polyhedron_inventor_ostream.h | 4 ++-- .../include/CGAL/IO/Polyhedron_iostream.h | 4 ++-- .../include/CGAL/IO/Polyhedron_scan_OFF.h | 4 ++-- .../CGAL/IO/generic_print_polyhedron.h | 4 ++-- Polyhedron_IO/include/CGAL/IO/print_OFF.h | 4 ++-- Polyhedron_IO/include/CGAL/IO/print_VRML_1.h | 4 ++-- Polyhedron_IO/include/CGAL/IO/print_VRML_2.h | 4 ++-- .../include/CGAL/IO/print_inventor.h | 4 ++-- .../include/CGAL/IO/print_wavefront.h | 4 ++-- Polyhedron_IO/include/CGAL/IO/scan_OFF.h | 4 ++-- Polynomial/include/CGAL/Exponent_vector.h | 4 ++-- .../Polynomial/Algebraic_structure_traits.h | 4 ++-- .../Cached_extended_euclidean_algorithm.h | 4 ++-- .../include/CGAL/Polynomial/Coercion_traits.h | 4 ++-- Polynomial/include/CGAL/Polynomial/Degree.h | 4 ++-- .../include/CGAL/Polynomial/Fraction_traits.h | 4 ++-- .../CGAL/Polynomial/Get_arithmetic_kernel.h | 4 ++-- .../include/CGAL/Polynomial/Interpolator.h | 4 ++-- .../include/CGAL/Polynomial/Modular_traits.h | 4 ++-- .../CGAL/Polynomial/Monomial_representation.h | 4 ++-- .../include/CGAL/Polynomial/Polynomial_type.h | 4 ++-- .../CGAL/Polynomial/Real_embeddable_traits.h | 4 ++-- .../CGAL/Polynomial/Scalar_factor_traits.h | 4 ++-- .../include/CGAL/Polynomial/bezout_matrix.h | 4 ++-- .../include/CGAL/Polynomial/determinant.h | 4 ++-- .../include/CGAL/Polynomial/hgdelta_update.h | 4 ++-- .../include/CGAL/Polynomial/modular_filter.h | 4 ++-- .../CGAL/Polynomial/polynomial_functions.h | 4 ++-- .../include/CGAL/Polynomial/prs_resultant.h | 4 ++-- .../include/CGAL/Polynomial/resultant.h | 4 ++-- .../CGAL/Polynomial/square_free_factorize.h | 4 ++-- .../CGAL/Polynomial/sturm_habicht_sequence.h | 4 ++-- .../include/CGAL/Polynomial/subresultants.h | 4 ++-- Polynomial/include/CGAL/Polynomial_traits_d.h | 4 ++-- .../include/CGAL/Polynomial_type_generator.h | 4 ++-- Polynomial/include/CGAL/polynomial_utils.h | 4 ++-- .../include/CGAL/gen_sparse_polynomial.h | 4 ++-- Polynomial/test/Polynomial/test_polynomial.h | 4 ++-- .../include/CGAL/Polytope_distance_d.h | 4 ++-- .../CGAL/Polytope_distance_d_traits_2.h | 4 ++-- .../CGAL/Polytope_distance_d_traits_3.h | 4 ++-- .../CGAL/Polytope_distance_d_traits_d.h | 4 ++-- .../test_Polytope_distance_d.h | 4 ++-- .../include/CGAL/PCA_util.h | 4 ++-- .../include/CGAL/barycenter.h | 4 ++-- .../include/CGAL/bounding_box.h | 4 ++-- .../include/CGAL/centroid.h | 4 ++-- .../include/CGAL/eigen.h | 4 ++-- .../include/CGAL/eigen_2.h | 4 ++-- .../CGAL/linear_least_squares_fitting_2.h | 4 ++-- .../CGAL/linear_least_squares_fitting_3.h | 4 ++-- .../linear_least_squares_fitting_circles_2.h | 4 ++-- .../linear_least_squares_fitting_cuboids_3.h | 4 ++-- .../linear_least_squares_fitting_points_2.h | 4 ++-- .../linear_least_squares_fitting_points_3.h | 4 ++-- ...inear_least_squares_fitting_rectangles_2.h | 4 ++-- .../linear_least_squares_fitting_segments_2.h | 4 ++-- .../linear_least_squares_fitting_segments_3.h | 4 ++-- .../linear_least_squares_fitting_spheres_3.h | 4 ++-- ...inear_least_squares_fitting_tetrahedra_3.h | 4 ++-- ...linear_least_squares_fitting_triangles_2.h | 4 ++-- ...linear_least_squares_fitting_triangles_3.h | 4 ++-- Profiling_tools/include/CGAL/Memory_sizer.h | 8 +++---- .../include/CGAL/Profile_counter.h | 4 ++-- Profiling_tools/include/CGAL/Profile_timer.h | 4 ++-- Profiling_tools/include/CGAL/Real_timer.h | 4 ++-- Profiling_tools/include/CGAL/Timer.h | 4 ++-- Profiling_tools/src/CGAL/Real_timer.cpp | 4 ++-- Profiling_tools/src/CGAL/Timer.cpp | 4 ++-- QP_solver/include/CGAL/QP_functions.h | 4 ++-- QP_solver/include/CGAL/QP_models.h | 4 ++-- QP_solver/include/CGAL/QP_options.h | 4 ++-- QP_solver/include/CGAL/QP_solution.h | 4 ++-- .../include/CGAL/QP_solver/Initialization.h | 4 ++-- .../CGAL/QP_solver/QP__filtered_base.h | 4 ++-- .../CGAL/QP_solver/QP__filtered_base_impl.h | 4 ++-- .../include/CGAL/QP_solver/QP__partial_base.h | 4 ++-- .../include/CGAL/QP_solver/QP_basis_inverse.h | 4 ++-- .../CGAL/QP_solver/QP_basis_inverse_impl.h | 4 ++-- .../CGAL/QP_solver/QP_exact_bland_pricing.h | 4 ++-- .../CGAL/QP_solver/QP_full_exact_pricing.h | 4 ++-- .../CGAL/QP_solver/QP_full_filtered_pricing.h | 4 ++-- .../CGAL/QP_solver/QP_functions_impl.h | 4 ++-- .../CGAL/QP_solver/QP_partial_exact_pricing.h | 4 ++-- .../QP_solver/QP_partial_filtered_pricing.h | 4 ++-- .../CGAL/QP_solver/QP_pricing_strategy.h | 4 ++-- .../include/CGAL/QP_solver/QP_solution_impl.h | 4 ++-- QP_solver/include/CGAL/QP_solver/QP_solver.h | 4 ++-- .../CGAL/QP_solver/QP_solver_bounds_impl.h | 4 ++-- .../include/CGAL/QP_solver/QP_solver_impl.h | 4 ++-- .../QP_solver_nonstandardform_impl.h | 4 ++-- .../CGAL/QP_solver/Unbounded_direction.h | 4 ++-- QP_solver/include/CGAL/QP_solver/functors.h | 4 ++-- Random_numbers/include/CGAL/Random.h | 8 +++---- Random_numbers/src/CGAL/Random.cpp | 4 ++-- .../include/CGAL/PolyhedralSurf_neighbors.h | 4 ++-- Ridges_3/include/CGAL/Ridges.h | 4 ++-- Ridges_3/include/CGAL/Umbilics.h | 4 ++-- STL_Extension/include/CGAL/Cache.h | 4 ++-- .../include/CGAL/Circulator_identity.h | 4 ++-- .../include/CGAL/Circulator_on_node.h | 4 ++-- .../include/CGAL/Circulator_project.h | 4 ++-- .../include/CGAL/Compact_container.h | 4 ++-- .../include/CGAL/Concatenate_iterator.h | 4 ++-- .../include/CGAL/Flattening_iterator.h | 4 ++-- STL_Extension/include/CGAL/Fourtuple.h | 4 ++-- STL_Extension/include/CGAL/Handle.h | 4 ++-- STL_Extension/include/CGAL/Handle_for.h | 4 ++-- .../include/CGAL/Handle_for_virtual.h | 4 ++-- .../include/CGAL/Handle_with_policy.h | 4 ++-- STL_Extension/include/CGAL/In_place_list.h | 4 ++-- .../include/CGAL/Iterator_identity.h | 4 ++-- STL_Extension/include/CGAL/Iterator_project.h | 4 ++-- .../include/CGAL/Iterator_transform.h | 4 ++-- STL_Extension/include/CGAL/Multiset.h | 4 ++-- STL_Extension/include/CGAL/Nested_iterator.h | 4 ++-- STL_Extension/include/CGAL/Object.h | 4 ++-- STL_Extension/include/CGAL/Sixtuple.h | 4 ++-- STL_Extension/include/CGAL/Threetuple.h | 4 ++-- STL_Extension/include/CGAL/Twotuple.h | 4 ++-- STL_Extension/include/CGAL/Uncertain.h | 4 ++-- STL_Extension/include/CGAL/algorithm.h | 4 ++-- STL_Extension/include/CGAL/array.h | 4 ++-- STL_Extension/include/CGAL/assertions.h | 4 ++-- .../include/CGAL/assertions_behaviour.h | 4 ++-- STL_Extension/include/CGAL/exceptions.h | 4 ++-- STL_Extension/include/CGAL/function_objects.h | 4 ++-- STL_Extension/include/CGAL/iterator.h | 4 ++-- STL_Extension/include/CGAL/min_max_n.h | 4 ++-- STL_Extension/include/CGAL/tags.h | 4 ++-- STL_Extension/include/CGAL/tuple.h | 4 ++-- STL_Extension/include/CGAL/utility.h | 4 ++-- STL_Extension/include/CGAL/vector.h | 4 ++-- STL_Extension/src/CGAL/assertions.cpp | 4 ++-- .../replace_CGAL_NAMESPACE.py | 23 ++++++++++++++++++ .../RangeSegmentTrees/include/Tree_Traits.h | 4 ++-- .../include/CGAL/Range_segment_tree_traits.h | 4 ++-- SearchStructures/include/CGAL/Range_tree_d.h | 4 ++-- SearchStructures/include/CGAL/Range_tree_k.h | 4 ++-- .../include/CGAL/Segment_tree_d.h | 4 ++-- .../include/CGAL/Segment_tree_k.h | 4 ++-- SearchStructures/include/CGAL/Tree_base.h | 4 ++-- SearchStructures/include/CGAL/Tree_traits.h | 4 ++-- ...t_Delaunay_graph_vertex_base_with_info_2.h | 4 ++-- .../Qt3/include/Which_diagram.h | 4 ++-- .../include/CGAL/Edge_hash_function.h | 4 ++-- .../include/CGAL/Filtered_construction.h | 4 ++-- .../include/CGAL/Segment_Delaunay_graph_2.h | 4 ++-- .../Are_parallel_C2.h | 4 ++-- .../Are_same_points_C2.h | 4 ++-- .../Are_same_segments_C2.h | 4 ++-- .../Arrangement_enum.h | 4 ++-- .../Arrangement_type_C2.h | 4 ++-- .../Arrangement_type_non_intersecting_C2.h | 4 ++-- .../Basic_predicates_C2.h | 4 ++-- .../Cartesian_converter.h | 4 ++-- .../Segment_Delaunay_graph_2/Compare_x_2.h | 4 ++-- .../Segment_Delaunay_graph_2/Compare_y_2.h | 4 ++-- .../Construct_storage_site_2.h | 4 ++-- .../Construct_storage_site_with_info_2.h | 4 ++-- .../Constructions_C2.h | 4 ++-- .../Filtered_traits_base_2.h | 4 ++-- .../Filtered_traits_concept_check_tags.h | 4 ++-- .../Finite_edge_interior_conflict_C2.h | 4 ++-- .../Infinite_edge_interior_conflict_C2.h | 4 ++-- .../Is_degenerate_edge_C2.h | 4 ++-- .../Kernel_wrapper_2.h | 4 ++-- .../Segment_Delaunay_graph_2/Orientation_C2.h | 4 ++-- .../Oriented_side_C2.h | 4 ++-- .../Oriented_side_of_bisector_C2.h | 4 ++-- .../Segment_Delaunay_graph_2_impl.h | 4 ++-- .../Segment_Delaunay_graph_hierarchy_2_impl.h | 4 ++-- .../Sqrt_extension_1.h | 4 ++-- .../Sqrt_extension_2.h | 4 ++-- .../Segment_Delaunay_graph_2/Traits_base_2.h | 4 ++-- .../Traits_wrapper_2.h | 4 ++-- .../Triangulation_face_base_with_edges_2.h | 4 ++-- .../Vertex_conflict_C2.h | 4 ++-- .../Voronoi_vertex_C2.h | 4 ++-- .../Voronoi_vertex_ring_C2.h | 4 ++-- .../Voronoi_vertex_sqrt_field_C2.h | 4 ++-- .../Voronoi_vertex_sqrt_field_new_C2.h | 4 ++-- .../CGAL/Segment_Delaunay_graph_2/edge_list.h | 4 ++-- .../in_place_edge_list.h | 4 ++-- .../CGAL/Segment_Delaunay_graph_face_base_2.h | 4 ++-- ...Segment_Delaunay_graph_filtered_traits_2.h | 4 ++-- .../CGAL/Segment_Delaunay_graph_hierarchy_2.h | 4 ++-- ...t_Delaunay_graph_hierarchy_vertex_base_2.h | 4 ++-- .../Segment_Delaunay_graph_simple_site_2.h | 4 ++-- ...ent_Delaunay_graph_simple_storage_site_2.h | 4 ++-- .../CGAL/Segment_Delaunay_graph_site_2.h | 4 ++-- .../Segment_Delaunay_graph_storage_site_2.h | 4 ++-- ..._Delaunay_graph_storage_site_with_info_2.h | 4 ++-- .../Segment_Delaunay_graph_storage_traits_2.h | 4 ++-- ...elaunay_graph_storage_traits_with_info_2.h | 4 ++-- .../CGAL/Segment_Delaunay_graph_traits_2.h | 4 ++-- .../Segment_Delaunay_graph_vertex_base_2.h | 4 ++-- ...gulation_nearest_neighbor_graph_traits_2.h | 4 ++-- .../Segment_Delaunay_graph_2/Directed_graph.h | 4 ++-- .../Nearest_neighbor_graph_2.h | 4 ++-- .../include/IO/Null_output_stream.h | 4 ++-- .../Segment_Delaunay_graph_2/include/test.h | 4 ++-- .../include/test_info.h | 4 ++-- .../include/test_info_hierarchy.h | 4 ++-- .../include/test_types.h | 4 ++-- .../include/test_types_hierarchy.h | 4 ++-- .../test_sdg_2_et.cpp | 4 ++-- .../test_sdg_hierarchy_2_et.cpp | 4 ++-- .../include/CGAL/Compute_anchor_3.h | 4 ++-- .../Marching_tetrahedra_observer_default_3.h | 4 ++-- ...arching_tetrahedra_traits_skin_surface_3.h | 4 ++-- Skin_surface_3/include/CGAL/Skin_surface_3.h | 4 ++-- .../include/CGAL/Skin_surface_base_3.h | 4 ++-- .../CGAL/Skin_surface_filtered_traits_3.h | 4 ++-- ...n_surface_marching_tetrahedra_observer_3.h | 4 ++-- .../CGAL/Skin_surface_polyhedral_items_3.h | 4 ++-- ...e_polyhedral_items_with_face_information.h | 4 ++-- .../CGAL/Skin_surface_quadratic_surface_3.h | 4 ++-- .../CGAL/Skin_surface_refinement_policy_3.h | 4 ++-- .../include/CGAL/Skin_surface_traits_3.h | 8 +++---- .../Triangulated_mixed_complex_observer_3.h | 4 ++-- .../Triangulation_incremental_builder_3.h | 4 ++-- .../include/CGAL/Union_of_balls_3.h | 4 ++-- .../include/CGAL/make_skin_surface_mesh_3.h | 4 ++-- .../include/CGAL/make_union_of_balls_3.h | 4 ++-- .../include/CGAL/marching_tetrahedra_3.h | 4 ++-- .../include/CGAL/mesh_skin_surface_3.h | 4 ++-- .../include/CGAL/mesh_union_of_balls_3.h | 4 ++-- .../predicates_for_mixed_complex_3.h | 4 ++-- .../CGAL/subdivide_skin_surface_mesh_3.h | 4 ++-- .../CGAL/subdivide_union_of_balls_mesh_3.h | 4 ++-- .../CGAL/triangulate_mixed_complex_3.h | 4 ++-- .../CGAL/triangulate_power_diagram_3.h | 4 ++-- .../include/CGAL/Snap_rounding_2.h | 4 ++-- .../include/CGAL/Snap_rounding_kd_2.h | 4 ++-- .../include/CGAL/Snap_rounding_traits_2.h | 4 ++-- Spatial_sorting/include/CGAL/Hilbert_sort_2.h | 4 ++-- Spatial_sorting/include/CGAL/Hilbert_sort_3.h | 4 ++-- .../include/CGAL/Hilbert_sort_base.h | 4 ++-- .../include/CGAL/Multiscale_sort.h | 4 ++-- Spatial_sorting/include/CGAL/hilbert_sort.h | 4 ++-- Spatial_sorting/include/CGAL/spatial_sort.h | 4 ++-- .../include/CGAL/IO/Dxf_stream.h | 4 ++-- .../include/CGAL/IO/Dxf_writer.h | 4 ++-- .../include/CGAL/Polygon_offset_builder_2.h | 4 ++-- .../CGAL/Polygon_offset_builder_traits_2.h | 4 ++-- .../include/CGAL/Straight_skeleton_2.h | 4 ++-- .../Polygon_offset_builder_2_impl.h | 4 ++-- .../Straight_skeleton_aux.h | 4 ++-- .../Straight_skeleton_builder_2_impl.h | 4 ++-- .../Straight_skeleton_builder_events_2.h | 4 ++-- .../Straight_skeleton_builder_traits_2_aux.h | 4 ++-- .../CGAL/Straight_skeleton_2/assertions.h | 4 ++-- .../include/CGAL/Straight_skeleton_2/debug.h | 4 ++-- .../include/CGAL/Straight_skeleton_2/test.h | 4 ++-- .../CGAL/Straight_skeleton_builder_2.h | 4 ++-- .../CGAL/Straight_skeleton_builder_traits_2.h | 4 ++-- .../CGAL/Straight_skeleton_converter_2.h | 4 ++-- .../CGAL/Straight_skeleton_face_base_2.h | 4 ++-- .../CGAL/Straight_skeleton_halfedge_base_2.h | 4 ++-- .../include/CGAL/Straight_skeleton_items_2.h | 4 ++-- .../CGAL/Straight_skeleton_vertex_base_2.h | 4 ++-- .../CGAL/Unfiltered_predicate_adaptor.h | 4 ++-- .../include/CGAL/arrange_offset_polygons_2.h | 4 ++-- .../CGAL/certified_numeric_predicates.h | 4 ++-- .../CGAL/certified_quotient_predicates.h | 4 ++-- .../include/CGAL/compute_outer_frame_margin.h | 4 ++-- .../constructions/Polygon_offset_cons_ftC2.h | 4 ++-- .../Straight_skeleton_cons_ftC2.h | 4 ++-- .../include/CGAL/create_offset_polygons_2.h | 4 ++-- ...ffset_polygons_from_polygon_with_holes_2.h | 4 ++-- .../include/CGAL/create_straight_skeleton_2.h | 4 ++-- ...aight_skeleton_from_polygon_with_holes_2.h | 4 ++-- .../predicates/Polygon_offset_pred_ftC2.h | 4 ++-- .../predicates/Straight_skeleton_pred_ftC2.h | 4 ++-- .../include/CGAL/Euler_integrator_2.h | 4 ++-- Stream_lines_2/include/CGAL/Regular_grid_2.h | 4 ++-- .../include/CGAL/Runge_kutta_integrator_2.h | 4 ++-- Stream_lines_2/include/CGAL/Stream_lines_2.h | 4 ++-- .../include/CGAL/Triangular_field_2.h | 4 ++-- .../include/CGAL/IO/File_header_OFF.h | 4 ++-- .../CGAL/IO/File_header_extended_OFF.h | 4 ++-- .../include/CGAL/IO/File_header_gocad.h | 4 ++-- .../include/CGAL/IO/File_scanner_OFF.h | 4 ++-- .../include/CGAL/IO/File_writer_OFF.h | 4 ++-- .../include/CGAL/IO/File_writer_VRML_2.h | 4 ++-- .../include/CGAL/IO/File_writer_gocad.h | 4 ++-- .../include/CGAL/IO/File_writer_inventor.h | 4 ++-- .../include/CGAL/IO/File_writer_wavefront.h | 4 ++-- .../include/CGAL/IO/Generic_writer.h | 4 ++-- .../include/CGAL/IO/Istream_iterator.h | 4 ++-- .../include/CGAL/IO/Ostream_iterator.h | 4 ++-- Stream_support/include/CGAL/IO/Scanner_OFF.h | 4 ++-- .../include/CGAL/IO/Verbose_ostream.h | 4 ++-- Stream_support/include/CGAL/IO/Writer_OFF.h | 4 ++-- .../include/CGAL/IO/binary_file_io.h | 4 ++-- .../include/CGAL/IO/generic_copy_OFF.h | 4 ++-- Stream_support/src/CGAL/File_header_OFF.cpp | 4 ++-- .../src/CGAL/File_header_extended_OFF.cpp | 4 ++-- Stream_support/src/CGAL/File_scanner_OFF.cpp | 4 ++-- Stream_support/src/CGAL/File_writer_OFF.cpp | 4 ++-- .../src/CGAL/File_writer_VRML_2.cpp | 4 ++-- .../src/CGAL/File_writer_inventor.cpp | 4 ++-- .../src/CGAL/File_writer_wavefront.cpp | 4 ++-- .../include/CGAL/Polyhedron_decorator_3.h | 4 ++-- .../include/CGAL/Subdivision_mask_3.h | 4 ++-- .../include/CGAL/Subdivision_method_3.h | 4 ++-- .../include/CGAL/Subdivision_method_impl_3.h | 4 ++-- .../Barycentric_mapping_parameterizer_3.h | 4 ++-- .../CGAL/Circular_border_parameterizer_3.h | 4 ++-- .../CGAL/Convertible_circulator_project.h | 4 ++-- .../CGAL/Convertible_filter_iterator.h | 4 ++-- .../CGAL/Convertible_iterator_project.h | 4 ++-- .../CGAL/Discrete_authalic_parameterizer_3.h | 4 ++-- .../Discrete_conformal_map_parameterizer_3.h | 4 ++-- .../CGAL/Fixed_border_parameterizer_3.h | 4 ++-- .../include/CGAL/LSCM_parameterizer_3.h | 4 ++-- .../Mean_value_coordinates_parameterizer_3.h | 4 ++-- .../CGAL/Param_mesh_patch_circulators.h | 4 ++-- .../include/CGAL/Param_mesh_patch_iterators.h | 4 ++-- .../include/CGAL/Param_mesh_patch_vertex.h | 4 ++-- .../Parameterization_mesh_feature_extractor.h | 4 ++-- .../CGAL/Parameterization_mesh_patch_3.h | 4 ++-- .../Parameterization_polyhedron_adaptor_3.h | 4 ++-- .../include/CGAL/Parameterizer_traits_3.h | 4 ++-- .../CGAL/Square_border_parameterizer_3.h | 4 ++-- .../include/CGAL/Taucs_matrix.h | 4 ++-- .../include/CGAL/Taucs_solver_traits.h | 4 ++-- .../include/CGAL/Taucs_vector.h | 4 ++-- .../CGAL/Two_vertices_parameterizer_3.h | 4 ++-- .../include/CGAL/Win32_exception.h | 4 ++-- .../include/CGAL/parameterize.h | 4 ++-- .../include/CGAL/Cartesian/MatrixC33.h | 4 ++-- .../include/CGAL/Modifiable_priority_queue.h | 4 ++-- .../include/CGAL/Null_matrix.h | 4 ++-- .../Detail/Common.h | 4 ++-- .../Detail/Edge_collapse.h | 4 ++-- .../Detail/Edge_collapse_impl.h | 4 ++-- .../Edge_collapse_visitor_base.h | 4 ++-- .../Count_ratio_stop_predicate.h | 4 ++-- .../Edge_collapse/Count_stop_predicate.h | 4 ++-- .../Detail/Lindstrom_Turk_core.h | 4 ++-- .../Detail/Lindstrom_Turk_core_impl.h | 4 ++-- .../Policies/Edge_collapse/Edge_length_cost.h | 4 ++-- .../Policies/Edge_collapse/Edge_profile.h | 4 ++-- .../Edge_collapse/Edge_profile_impl.h | 4 ++-- .../Edge_collapse/LindstromTurk_cost.h | 4 ++-- .../Edge_collapse/LindstromTurk_params.h | 4 ++-- .../Edge_collapse/LindstromTurk_placement.h | 4 ++-- .../Edge_collapse/Midpoint_placement.h | 4 ++-- .../edge_collapse.h | 4 ++-- .../halfedge_collapse_Polyhedron_3.h | 4 ++-- .../IO/output_surface_facets_to_polyhedron.h | 4 ++-- .../CGAL/Robust_circumcenter_traits_3.h | 4 ++-- Surface_mesher/include/CGAL/builder.h | 4 ++-- .../output_surface_facets_to_triangle_soup.h | 4 ++-- .../include/CGAL/Lightweight_vector_3.h | 4 ++-- .../include/CGAL/Peak_memory_sizer.h | 4 ++-- .../CGAL/Poisson_reconstruction_function.h | 4 ++-- .../CGAL/Reconstruction_triangulation_3.h | 4 ++-- .../include/CGAL/k_nearest_neighbor.h | 4 ++-- .../CGAL/poisson_refine_triangulation.h | 4 ++-- .../Constrained_Delaunay_triangulation_2.h | 4 ++-- .../CGAL/Constrained_triangulation_2.h | 4 ++-- .../Constrained_triangulation_face_base_2.h | 4 ++-- .../CGAL/Constrained_triangulation_plus_2.h | 4 ++-- .../include/CGAL/Constraint_hierarchy_2.h | 4 ++-- .../include/CGAL/Delaunay_triangulation_2.h | 4 ++-- Triangulation_2/include/CGAL/Distance_2.h | 4 ++-- Triangulation_2/include/CGAL/Dummy_tds_2.h | 4 ++-- .../IO/Triangulation_geomview_ostream_2.h | 4 ++-- .../include/CGAL/IO/Triangulation_ps_stream.h | 16 ++++++------- .../include/CGAL/Regular_triangulation_2.h | 4 ++-- ...Regular_triangulation_euclidean_traits_2.h | 8 +++---- .../CGAL/Regular_triangulation_face_base_2.h | 4 ++-- .../Regular_triangulation_filtered_traits_2.h | 4 ++-- .../Regular_triangulation_vertex_base_2.h | 4 ++-- .../include/CGAL/Triangulation_2.h | 4 ++-- .../include/CGAL/Triangulation_2_traits_3.h | 4 ++-- .../CGAL/Triangulation_data_structure_2.h | 4 ++-- .../CGAL/Triangulation_ds_circulators_2.h | 4 ++-- .../include/CGAL/Triangulation_ds_face_2.h | 4 ++-- .../CGAL/Triangulation_ds_face_base_2.h | 4 ++-- .../CGAL/Triangulation_ds_iterators_2.h | 4 ++-- .../include/CGAL/Triangulation_ds_vertex_2.h | 4 ++-- .../CGAL/Triangulation_ds_vertex_base_2.h | 4 ++-- .../CGAL/Triangulation_euclidean_traits_2.h | 4 ++-- .../Triangulation_euclidean_traits_xy_3.h | 4 ++-- .../Triangulation_euclidean_traits_xz_3.h | 4 ++-- .../Triangulation_euclidean_traits_yz_3.h | 4 ++-- .../include/CGAL/Triangulation_face_base_2.h | 4 ++-- .../Triangulation_face_base_with_info_2.h | 4 ++-- .../include/CGAL/Triangulation_hierarchy_2.h | 4 ++-- .../Triangulation_hierarchy_vertex_base_2.h | 4 ++-- .../CGAL/Triangulation_iterator_adaptator.h | 4 ++-- .../Triangulation_line_face_circulator_2.h | 4 ++-- .../include/CGAL/Triangulation_utils_2.h | 4 ++-- .../CGAL/Triangulation_vertex_base_2.h | 4 ++-- .../Triangulation_vertex_base_with_info_2.h | 4 ++-- .../include/CGAL/Trivial_iterator.h | 4 ++-- ...tructions_on_weighted_points_cartesian_2.h | 4 ++-- ...uctions_on_weighted_points_homogeneous_2.h | 4 ++-- .../predicates/Regular_triangulation_ftC2.h | 4 ++-- .../predicates/Regular_triangulation_rtH2.h | 4 ++-- .../include/CGAL/_test_cls_tds_face.h | 4 ++-- .../include/CGAL/_test_cls_tds_vertex.h | 4 ++-- .../include/CGAL/_test_traits.h | 4 ++-- .../include/CGAL/Delaunay_triangulation_3.h | 4 ++-- .../IO/Triangulation_geomview_ostream_3.h | 4 ++-- .../include/CGAL/Regular_triangulation_3.h | 4 ++-- .../CGAL/Regular_triangulation_cell_base_3.h | 4 ++-- ...Regular_triangulation_euclidean_traits_3.h | 8 +++---- .../include/CGAL/Triangulation_3.h | 4 ++-- .../include/CGAL/Triangulation_cell_base_3.h | 4 ++-- ...angulation_cell_base_with_circumcenter_3.h | 4 ++-- .../Triangulation_cell_base_with_info_3.h | 4 ++-- .../CGAL/Triangulation_data_structure_3.h | 4 ++-- .../CGAL/Triangulation_ds_cell_base_3.h | 4 ++-- .../CGAL/Triangulation_ds_vertex_base_3.h | 4 ++-- .../CGAL/Triangulation_geom_traits_3.h | 4 ++-- .../include/CGAL/Triangulation_hierarchy_3.h | 4 ++-- .../Triangulation_hierarchy_vertex_base_3.h | 4 ++-- .../include/CGAL/Triangulation_simplex_3.h | 4 ++-- .../include/CGAL/Triangulation_utils_3.h | 4 ++-- .../CGAL/Triangulation_vertex_base_3.h | 4 ++-- .../Triangulation_vertex_base_with_info_3.h | 4 ++-- ...tructions_on_weighted_points_cartesian_3.h | 4 ++-- .../predicates/Regular_triangulation_ftC3.h | 4 ++-- .../predicates/Regular_triangulation_rtH3.h | 4 ++-- ...redicates_on_weighted_points_cartesian_3.h | 4 ++-- Union_find/include/CGAL/Union_find.h | 4 ++-- .../Qt_widget_Apollonius_diagram_halfedge_2.h | 4 ++-- .../IO/Qt_widget_Voronoi_diagram_halfedge_2.h | 4 ++-- .../IO/Qt_widget_power_diagram_halfedge_2.h | 4 ++-- .../include/Virtual_Voronoi_diagram_2.h | 4 ++-- .../Apollonius_graph_adaptation_policies_2.h | 4 ++-- .../Apollonius_graph_adaptation_traits_2.h | 4 ++-- ...unay_triangulation_adaptation_policies_2.h | 4 ++-- ...launay_triangulation_adaptation_traits_2.h | 4 ++-- .../include/CGAL/Identity_policy_2.h | 4 ++-- ...ular_triangulation_adaptation_policies_2.h | 4 ++-- ...egular_triangulation_adaptation_traits_2.h | 4 ++-- ...ent_Delaunay_graph_adaptation_policies_2.h | 4 ++-- ...gment_Delaunay_graph_adaptation_traits_2.h | 4 ++-- .../include/CGAL/Voronoi_diagram_2.h | 4 ++-- .../include/CGAL/Voronoi_diagram_2/Accessor.h | 4 ++-- .../Adaptation_traits_base_2.h | 4 ++-- .../Adaptation_traits_functors.h | 4 ++-- .../Apollonius_graph_degeneracy_testers.h | 4 ++-- .../Apollonius_graph_nearest_site_2.h | 4 ++-- .../Cached_degeneracy_testers.h | 4 ++-- .../Voronoi_diagram_2/Circulator_adaptors.h | 4 ++-- .../Voronoi_diagram_2/Connected_components.h | 4 ++-- .../Voronoi_diagram_2/Construct_dual_points.h | 4 ++-- .../Default_site_inserters.h | 4 ++-- .../Voronoi_diagram_2/Default_site_removers.h | 4 ++-- .../Degeneracy_tester_binders.h | 4 ++-- ...elaunay_triangulation_degeneracy_testers.h | 4 ++-- .../Delaunay_triangulation_nearest_site_2.h | 4 ++-- .../CGAL/Voronoi_diagram_2/Dummy_iterator.h | 4 ++-- .../CGAL/Voronoi_diagram_2/Edge_less.h | 4 ++-- .../include/CGAL/Voronoi_diagram_2/Face.h | 4 ++-- .../CGAL/Voronoi_diagram_2/Finder_classes.h | 4 ++-- .../include/CGAL/Voronoi_diagram_2/Halfedge.h | 4 ++-- .../CGAL/Voronoi_diagram_2/Handle_adaptor.h | 4 ++-- .../Voronoi_diagram_2/Identity_rejectors.h | 4 ++-- .../Voronoi_diagram_2/Iterator_adaptors.h | 4 ++-- .../CGAL/Voronoi_diagram_2/Policy_base.h | 4 ++-- ...Regular_triangulation_degeneracy_testers.h | 4 ++-- .../Regular_triangulation_nearest_site_2.h | 4 ++-- ...egment_Delaunay_graph_degeneracy_testers.h | 4 ++-- .../Segment_Delaunay_graph_nearest_site_2.h | 4 ++-- .../CGAL/Voronoi_diagram_2/Site_accessors.h | 4 ++-- .../CGAL/Voronoi_diagram_2/Unbounded_edges.h | 4 ++-- .../CGAL/Voronoi_diagram_2/Unbounded_faces.h | 4 ++-- .../CGAL/Voronoi_diagram_2/Validity_testers.h | 4 ++-- .../include/CGAL/Voronoi_diagram_2/Vertex.h | 4 ++-- .../include/CGAL/Voronoi_diagram_2/tags.h | 4 ++-- .../include/Adaptation_policy_concept.h | 4 ++-- .../include/Adaptation_traits_concept.h | 4 ++-- .../include/Delaunay_graph_concept.h | 4 ++-- Width_3/include/CGAL/Width_3.h | 4 ++-- Width_3/include/CGAL/Width_default_traits_3.h | 4 ++-- Width_3/include/CGAL/Width_polyhedron_3.h | 4 ++-- iostream/include/CGAL/IO/Color.h | 4 ++-- iostream/include/CGAL/IO/io.h | 4 ++-- iostream/include/CGAL/IO/io_tags.h | 4 ++-- iostream/src/CGAL/Color.cpp | 4 ++-- iostream/src/CGAL/io.cpp | 4 ++-- kdtree/include/CGAL/kdtree_d.h | 4 ++-- 1633 files changed, 3356 insertions(+), 3335 deletions(-) create mode 100644 Scripts/developer_scripts/replace_CGAL_NAMESPACE.py diff --git a/.gitattributes b/.gitattributes index 467671777144..867c760f25c0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3097,6 +3097,7 @@ Scripts/developer_scripts/mirror_package_files.rb -text Scripts/developer_scripts/mirror_package_impl.rb -text Scripts/developer_scripts/remove_package_files_from_build_tree.rb -text Scripts/developer_scripts/remove_package_files_from_build_tree_impl.rb -text +Scripts/developer_scripts/replace_CGAL_NAMESPACE.py -text Scripts/developer_scripts/test_testsuite_submission -text Scripts/scripts/cgal_create_cmake_script -text Scripts/scripts/cgal_create_cmake_script_with_options -text diff --git a/AABB_tree/include/CGAL/internal/AABB_Intersections_3/Bbox_3_Plane_3_do_intersect.h b/AABB_tree/include/CGAL/internal/AABB_Intersections_3/Bbox_3_Plane_3_do_intersect.h index a2f677bd3dd2..dda0c4625210 100644 --- a/AABB_tree/include/CGAL/internal/AABB_Intersections_3/Bbox_3_Plane_3_do_intersect.h +++ b/AABB_tree/include/CGAL/internal/AABB_Intersections_3/Bbox_3_Plane_3_do_intersect.h @@ -26,7 +26,7 @@ // Opcode like -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -94,6 +94,6 @@ bool do_intersect(const CGAL::Bbox_3& bbox, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_INTERNAL_INTERSECTIONS_3_BBOX_3_PLANE_3_DO_INTERSECT_H diff --git a/AABB_tree/include/CGAL/internal/AABB_Intersections_3/Bbox_3_Sphere_3_do_intersect.h b/AABB_tree/include/CGAL/internal/AABB_Intersections_3/Bbox_3_Sphere_3_do_intersect.h index d7f4ecb83e6d..488635578b7a 100644 --- a/AABB_tree/include/CGAL/internal/AABB_Intersections_3/Bbox_3_Sphere_3_do_intersect.h +++ b/AABB_tree/include/CGAL/internal/AABB_Intersections_3/Bbox_3_Sphere_3_do_intersect.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -111,6 +111,6 @@ bool do_intersect(const CGAL::Bbox_3& bbox, return typename K::Do_intersect_3()(sphere, bbox); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_INTERNAL_INTERSECTIONS_3_BBOX_3_SPHERE_3_DO_INTERSECT_H diff --git a/AABB_tree/include/CGAL/internal/AABB_Intersections_3/Bbox_3_Triangle_3_do_intersect.h b/AABB_tree/include/CGAL/internal/AABB_Intersections_3/Bbox_3_Triangle_3_do_intersect.h index 936b47ca80f8..c70f865439f4 100644 --- a/AABB_tree/include/CGAL/internal/AABB_Intersections_3/Bbox_3_Triangle_3_do_intersect.h +++ b/AABB_tree/include/CGAL/internal/AABB_Intersections_3/Bbox_3_Triangle_3_do_intersect.h @@ -31,7 +31,7 @@ // ST: is this include really needed ? #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -283,6 +283,6 @@ bool do_intersect(const CGAL::Bbox_3& bbox, return typename K::Do_intersect_3()(triangle, bbox); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_INTERNAL_INTERSECTIONS_3_BBOX_3_TRIANGLE_3_DO_INTERSECT_H diff --git a/Algebraic_foundations/include/CGAL/Algebraic_extension_traits.h b/Algebraic_foundations/include/CGAL/Algebraic_extension_traits.h index 75f66474bf67..b930dd488108 100644 --- a/Algebraic_foundations/include/CGAL/Algebraic_extension_traits.h +++ b/Algebraic_foundations/include/CGAL/Algebraic_extension_traits.h @@ -30,7 +30,7 @@ #include // for std::accumulate -CGAL_BEGIN_NAMESPACE +namespace CGAL { template< class T > class Algebraic_extension_traits { @@ -79,7 +79,7 @@ class Algebraic_extension_traits { }; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // NiX_ALGEBRAIC_NUMBER_TRAITS_H // EOF diff --git a/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h b/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h index a67db7940ae4..8ad226de1031 100644 --- a/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h +++ b/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // REMARK: Some of the following comments and references are just copy & pasted // from EXACUS and have to be adapted/removed in the future. @@ -602,6 +602,6 @@ namespace INTERN_AST { } }; } // INTERN_AST -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ALGEBRAIC_STRUCTURE_TRAITS_H diff --git a/Algebraic_foundations/include/CGAL/Coercion_traits.h b/Algebraic_foundations/include/CGAL/Coercion_traits.h index 191c8b0beca4..b5970cfd619f 100644 --- a/Algebraic_foundations/include/CGAL/Coercion_traits.h +++ b/Algebraic_foundations/include/CGAL/Coercion_traits.h @@ -132,7 +132,7 @@ CGAL_IMPLICIT_INTEROPERABLE_BINARY_OPERATOR_WITH_RT( NT, NT ) }; \ }; -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace INTERN_CT{ @@ -236,6 +236,6 @@ template struct Coercion_traits :public Coercion_traits_for_level{}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //NiX_COERCION_TRAITS_H diff --git a/Algebraic_foundations/include/CGAL/Fraction_traits.h b/Algebraic_foundations/include/CGAL/Fraction_traits.h index c2aeb779b030..ffb29478a912 100644 --- a/Algebraic_foundations/include/CGAL/Fraction_traits.h +++ b/Algebraic_foundations/include/CGAL/Fraction_traits.h @@ -37,7 +37,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \ingroup NiX_Fraction_traits_spec * \brief Traits class for accessing numerator and denominator.\n @@ -62,7 +62,7 @@ class Fraction_traits { typedef Null_functor Compose; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_FRACTION_TRAITS_H // EOF diff --git a/Algebraic_foundations/include/CGAL/Needs_parens_as_product.h b/Algebraic_foundations/include/CGAL/Needs_parens_as_product.h index 3bfe2562fc82..7ee12bf8b79c 100644 --- a/Algebraic_foundations/include/CGAL/Needs_parens_as_product.h +++ b/Algebraic_foundations/include/CGAL/Needs_parens_as_product.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * oformat flag for parentheses if needed for a coefficient @@ -97,6 +97,6 @@ template <> struct Needs_parens_as_product{ bool operator()(const long double& x){return x < (long double)(0);} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEEDS_PARENTHESES_AS_PRODUCT_H diff --git a/Algebraic_foundations/include/CGAL/Rational_traits.h b/Algebraic_foundations/include/CGAL/Rational_traits.h index 598ffed35dda..7347d0bae14e 100644 --- a/Algebraic_foundations/include/CGAL/Rational_traits.h +++ b/Algebraic_foundations/include/CGAL/Rational_traits.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal{ @@ -87,7 +87,7 @@ typename Fraction_traits::Denominator_type >::value > {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_RATIONAL_TRAITS_H // EOF diff --git a/Algebraic_foundations/include/CGAL/Real_embeddable_traits.h b/Algebraic_foundations/include/CGAL/Real_embeddable_traits.h index aec8f3cb81aa..ea965a590f4a 100644 --- a/Algebraic_foundations/include/CGAL/Real_embeddable_traits.h +++ b/Algebraic_foundations/include/CGAL/Real_embeddable_traits.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace INTERN_RET { @@ -175,6 +175,6 @@ template< class Type_ > class Real_embeddable_traits : public INTERN_RET::Real_embeddable_traits_base {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_REAL_EMBEDDABLE_TRAITS_H diff --git a/Algebraic_foundations/include/CGAL/Scalar_factor_traits.h b/Algebraic_foundations/include/CGAL/Scalar_factor_traits.h index cbd6ac6d9569..105dc4989536 100644 --- a/Algebraic_foundations/include/CGAL/Scalar_factor_traits.h +++ b/Algebraic_foundations/include/CGAL/Scalar_factor_traits.h @@ -31,7 +31,7 @@ /*! \file NiX/Scalar_factor_traits.h * \brief Definition of traits class NiX::Scalar_factor_traits. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \nosubgrouping * \ingroup NiX_Scalar_factor_traits_spec @@ -157,7 +157,7 @@ scalar_factor(const NT& x, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // NiX_SCALAR_FACTOR_TRAITS_H // EOF diff --git a/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h b/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h index 9e1502e519dc..a38ca0c2c4a3 100644 --- a/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h +++ b/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h @@ -71,7 +71,7 @@ void check_result_type(CGAL::Null_functor, ResultType){} typedef typename AST::Kth_root Kth_root; \ typedef typename AST::Root_of Root_of; -CGAL_BEGIN_NAMESPACE +namespace CGAL { template< class AS > bool test_equality_epsilon( const AS & a, @@ -918,6 +918,6 @@ void test_algebraic_structure( const AS & a, const AS & b, const AS & c) { !(::boost::is_same::value)); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TEST_ALGEBRAIC_STRUCTURE_H diff --git a/Algebraic_foundations/include/CGAL/Test/_test_coercion_traits.h b/Algebraic_foundations/include/CGAL/Test/_test_coercion_traits.h index d81dc27b5903..90796075aca0 100644 --- a/Algebraic_foundations/include/CGAL/Test/_test_coercion_traits.h +++ b/Algebraic_foundations/include/CGAL/Test/_test_coercion_traits.h @@ -28,7 +28,7 @@ #include // These are test functions for the Coercion_traits -CGAL_BEGIN_NAMESPACE +namespace CGAL { // this test implicit interoperable template< class A, class B, class Type > void test_implicit_interoperable(); @@ -382,4 +382,4 @@ template void test_explicit_interoperable_from_to(){ test_explicit_interoperable(); } -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Algebraic_foundations/include/CGAL/Test/_test_fraction_traits.h b/Algebraic_foundations/include/CGAL/Test/_test_fraction_traits.h index 4ee9e058385c..9e7e63d00258 100644 --- a/Algebraic_foundations/include/CGAL/Test/_test_fraction_traits.h +++ b/Algebraic_foundations/include/CGAL/Test/_test_fraction_traits.h @@ -30,7 +30,7 @@ #ifndef CGAL_TEST_FRACTION_TRAITS_H #define CGAL_TEST_FRACTION_TRAITS_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void test_fraction_traits(){ @@ -72,6 +72,6 @@ void test_fraction_traits(){ assert(common_factor(Den(-12),Den(-15)) == Den(3)); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TEST_FRACTION_TRAITS_H diff --git a/Algebraic_foundations/include/CGAL/Test/_test_rational_traits.h b/Algebraic_foundations/include/CGAL/Test/_test_rational_traits.h index 10b868cf83cd..c7451b9dd960 100644 --- a/Algebraic_foundations/include/CGAL/Test/_test_rational_traits.h +++ b/Algebraic_foundations/include/CGAL/Test/_test_rational_traits.h @@ -30,7 +30,7 @@ #ifndef CGAL_TEST_RATIONAL_TRAITS_H #define CGAL_TEST_RATIONAL_TRAITS_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void test_rational_traits(){ @@ -50,6 +50,6 @@ void test_rational_traits(){ assert( x == Rational(7)/Rational(2)); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TEST_RATIONAL_TRAITS_H diff --git a/Algebraic_foundations/include/CGAL/Test/_test_real_embeddable.h b/Algebraic_foundations/include/CGAL/Test/_test_real_embeddable.h index 0b2921ee0c57..4daa960d50ac 100644 --- a/Algebraic_foundations/include/CGAL/Test/_test_real_embeddable.h +++ b/Algebraic_foundations/include/CGAL/Test/_test_real_embeddable.h @@ -50,7 +50,7 @@ #ifndef CGAL_TEST_REAL_EMBEDDABLE_H #define CGAL_TEST_REAL_EMBEDDABLE_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Test_to_double { @@ -291,6 +291,6 @@ void test_not_real_embeddable() { // test_rounded_log2_abs(Type(0), F(), C()); //} -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TEST_REAL_COMPARABLE_H diff --git a/Algebraic_foundations/include/CGAL/extended_euclidean_algorithm.h b/Algebraic_foundations/include/CGAL/extended_euclidean_algorithm.h index cfa53ce38996..e0ac0734d645 100644 --- a/Algebraic_foundations/include/CGAL/extended_euclidean_algorithm.h +++ b/Algebraic_foundations/include/CGAL/extended_euclidean_algorithm.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // EEA computing the normalized gcd // Modern Computer Algebra (Hardcover) @@ -72,6 +72,6 @@ AS extended_euclidean_algorithm(const AS& f, const AS& g, AS& s_, AS& t_){ return h; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // NiX_EXTENDED_EUCLIDEAN_ALGORITHM_H // diff --git a/Algebraic_foundations/include/CGAL/ipower.h b/Algebraic_foundations/include/CGAL/ipower.h index 977dce0d4b58..acb6f69d42e3 100644 --- a/Algebraic_foundations/include/CGAL/ipower.h +++ b/Algebraic_foundations/include/CGAL/ipower.h @@ -26,7 +26,7 @@ #ifndef CGAL_IPOWER_H #define CGAL_IPOWER_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template inline @@ -76,6 +76,6 @@ NT ipower(const NT& base, long expn) { return res; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IPOWER_H diff --git a/Algebraic_foundations/include/CGAL/number_utils.h b/Algebraic_foundations/include/CGAL/number_utils.h index 48e8fb33f4f4..3181c36b8796 100644 --- a/Algebraic_foundations/include/CGAL/number_utils.h +++ b/Algebraic_foundations/include/CGAL/number_utils.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_NTS_BEGIN_NAMESPACE @@ -300,6 +300,6 @@ to_interval( const Real_embeddable& x) { CGAL_NTS_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NUMBER_UTILS_H diff --git a/Algebraic_foundations/include/CGAL/number_utils_classes.h b/Algebraic_foundations/include/CGAL/number_utils_classes.h index 61ad4ff836a5..790dcf9d5c15 100644 --- a/Algebraic_foundations/include/CGAL/number_utils_classes.h +++ b/Algebraic_foundations/include/CGAL/number_utils_classes.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /* Defines functors: - Is_zero @@ -117,6 +117,6 @@ struct Compare -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NUMBER_UTILS_CLASSES_H diff --git a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_converter.h b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_converter.h index c4b466287d0f..f3052e17a159 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_converter.h +++ b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_converter.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // TODO : // - FT converter ? @@ -61,6 +61,6 @@ class Algebraic_kernel_converter { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_CONVERTER_H diff --git a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/function_objects_on_roots_and_polynomials_2_2.h b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/function_objects_on_roots_and_polynomials_2_2.h index 5c8f17e518f7..b28bb4bf2615 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/function_objects_on_roots_and_polynomials_2_2.h +++ b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/function_objects_on_roots_and_polynomials_2_2.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace AlgebraicFunctors { @@ -221,6 +221,6 @@ namespace AlgebraicFunctors { } // namespace AlgebraicFunctors -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_FUNCTION_OBJECTS_ON_ROOTS_AND_POLYNOMIALS_2_H diff --git a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles_2_2.h b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles_2_2.h index 7554084c7dbd..4101a6b896c4 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles_2_2.h +++ b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles_2_2.h @@ -33,7 +33,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template< class RT_ > struct Algebraic_kernel_for_circles_2_2 @@ -94,6 +94,6 @@ CGAL_BEGIN_NAMESPACE }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_2_2_H diff --git a/Algebraic_kernel_for_circles/include/CGAL/Polynomials_1_2.h b/Algebraic_kernel_for_circles/include/CGAL/Polynomials_1_2.h index 3ec04a3598ae..d33d70ca6509 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/Polynomials_1_2.h +++ b/Algebraic_kernel_for_circles/include/CGAL/Polynomials_1_2.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename RT_ > class Polynomial_1_2 @@ -67,6 +67,6 @@ operator == ( const Polynomial_1_2 & p1, (p1.c() == p2.c()) ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_POLYNOMIALS_1_2_H diff --git a/Algebraic_kernel_for_circles/include/CGAL/Polynomials_2_2.h b/Algebraic_kernel_for_circles/include/CGAL/Polynomials_2_2.h index 54dd268e1f76..9cb3738aad21 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/Polynomials_2_2.h +++ b/Algebraic_kernel_for_circles/include/CGAL/Polynomials_2_2.h @@ -29,7 +29,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // polynomials of the form (X-a)^2 + (Y-b)^2 - R^2 template < typename FT_ > @@ -70,6 +70,6 @@ operator == ( const Polynomial_for_circles_2_2 & p1, (p1.r_sq() == p2.r_sq()) ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_POLYNOMIALS_2_2_H diff --git a/Algebraic_kernel_for_circles/include/CGAL/Root_for_circles_2_2.h b/Algebraic_kernel_for_circles/include/CGAL/Root_for_circles_2_2.h index 600c41b1e0d8..919302f4207d 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/Root_for_circles_2_2.h +++ b/Algebraic_kernel_for_circles/include/CGAL/Root_for_circles_2_2.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename RT_ > class Root_for_circles_2_2 { @@ -130,6 +130,6 @@ operator>>(std::istream & is, Root_for_circles_2_2 &r) return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_ROOT_FOR_CIRCLES_2_2_H diff --git a/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_root_for_circle_2_2.h b/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_root_for_circle_2_2.h index 302d5e3b1350..eb8119fd661d 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_root_for_circle_2_2.h +++ b/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_root_for_circle_2_2.h @@ -25,7 +25,7 @@ #ifndef CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_GLOBAL_FUNCTIONS_ON_ROOT_FOR_CIRCLE_2_2_H #define CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_GLOBAL_FUNCTIONS_ON_ROOT_FOR_CIRCLE_2_2_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class AK > inline @@ -48,6 +48,6 @@ compare_xy(const typename AK::Root_for_circles_2_2& r1, const typename AK::Root_for_circles_2_2& r2) { return AK().compare_xy_object()(r1, r2); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_GLOBAL_FUNCTIONS_ON_ROOT_FOR_CIRCLE_2_2_H diff --git a/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_roots_and_polynomial_1_2_and_2_2.h b/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_roots_and_polynomial_1_2_and_2_2.h index fa82ef1004dc..d0a00831a7d3 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_roots_and_polynomial_1_2_and_2_2.h +++ b/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_roots_and_polynomial_1_2_and_2_2.h @@ -25,7 +25,7 @@ #ifndef CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIAL_1_2_AND_2_2_H #define CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIAL_1_2_AND_2_2_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template< class AK, class OutputIterator> inline @@ -57,6 +57,6 @@ construct_polynomial_1_2( const typename AK::RT& a, const typename AK::RT& c) { return AK().construct_polynomial_1_2_object()(a, b, c); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIAL_1_2_AND_2_2_H diff --git a/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_roots_and_polynomials_2_2.h b/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_roots_and_polynomials_2_2.h index c8adf57925d8..02ec7388f4e6 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_roots_and_polynomials_2_2.h +++ b/Algebraic_kernel_for_circles/include/CGAL/global_functions_on_roots_and_polynomials_2_2.h @@ -25,7 +25,7 @@ #ifndef CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIALS_2_2_H #define CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIALS_2_2_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template< class AK, class OutputIterator> inline @@ -71,6 +71,6 @@ y_critical_points(const typename AK::Polynomial_for_circles_2_2 & c, OutputIterator res) { return AK().y_critical_points_object()(c,res); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIALS_2_2_H diff --git a/Algebraic_kernel_for_spheres/include/CGAL/Algebraic_kernel_for_spheres/function_objects_on_roots_and_polynomials_2_3.h b/Algebraic_kernel_for_spheres/include/CGAL/Algebraic_kernel_for_spheres/function_objects_on_roots_and_polynomials_2_3.h index 100fae2683d6..e90be85ec29c 100644 --- a/Algebraic_kernel_for_spheres/include/CGAL/Algebraic_kernel_for_spheres/function_objects_on_roots_and_polynomials_2_3.h +++ b/Algebraic_kernel_for_spheres/include/CGAL/Algebraic_kernel_for_spheres/function_objects_on_roots_and_polynomials_2_3.h @@ -31,7 +31,7 @@ #include #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace AlgebraicSphereFunctors { @@ -398,6 +398,6 @@ namespace AlgebraicSphereFunctors { } // namespace AlgebraicSphereFunctors -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ALGEBRAIC_KERNEL_FOR_SPHERES_FUNCTION_OBJECTS_ON_ROOTS_AND_POLYNOMIALS_3_H diff --git a/Algebraic_kernel_for_spheres/include/CGAL/Algebraic_kernel_for_spheres_2_3.h b/Algebraic_kernel_for_spheres/include/CGAL/Algebraic_kernel_for_spheres_2_3.h index 094fa7d23ddb..c65b389bfc14 100644 --- a/Algebraic_kernel_for_spheres/include/CGAL/Algebraic_kernel_for_spheres_2_3.h +++ b/Algebraic_kernel_for_spheres/include/CGAL/Algebraic_kernel_for_spheres_2_3.h @@ -40,7 +40,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template< class RT_ > struct Algebraic_kernel_for_spheres_2_3 @@ -120,6 +120,6 @@ CGAL_BEGIN_NAMESPACE }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ALGEBRAIC_KERNEL_FOR_SPHERES_2_3_H diff --git a/Algebraic_kernel_for_spheres/include/CGAL/Polynomials_1_3.h b/Algebraic_kernel_for_spheres/include/CGAL/Polynomials_1_3.h index 83fc73a0a99c..c1dd6c6e9795 100644 --- a/Algebraic_kernel_for_spheres/include/CGAL/Polynomials_1_3.h +++ b/Algebraic_kernel_for_spheres/include/CGAL/Polynomials_1_3.h @@ -31,7 +31,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // polynomials of the form aX + +bY + cZ + d template < typename FT_ > @@ -116,6 +116,6 @@ same_solutions ( const Polynomial_1_3 & p1, (p2.d() * p1.a() == p1.d() * p2.a()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_ALGEBRAIC_KERNEL_POLYNOMIALS_1_3_H diff --git a/Algebraic_kernel_for_spheres/include/CGAL/Polynomials_2_3.h b/Algebraic_kernel_for_spheres/include/CGAL/Polynomials_2_3.h index 7096670322f8..f880dad7bd40 100644 --- a/Algebraic_kernel_for_spheres/include/CGAL/Polynomials_2_3.h +++ b/Algebraic_kernel_for_spheres/include/CGAL/Polynomials_2_3.h @@ -31,7 +31,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // polynomials of the form (X-a)^2 + (Y-b)^2 + (Z-c)^2 - R^2 template < typename FT_ > @@ -87,6 +87,6 @@ operator == ( const Polynomial_for_spheres_2_3 & p1, (p1.r_sq() == p2.r_sq()) ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_ALGEBRAIC_KERNEL_POLYNOMIALS_2_3_H diff --git a/Algebraic_kernel_for_spheres/include/CGAL/Polynomials_for_line_3.h b/Algebraic_kernel_for_spheres/include/CGAL/Polynomials_for_line_3.h index 0b43736643d0..675a3148c010 100644 --- a/Algebraic_kernel_for_spheres/include/CGAL/Polynomials_for_line_3.h +++ b/Algebraic_kernel_for_spheres/include/CGAL/Polynomials_for_line_3.h @@ -29,7 +29,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename FT_ > class Polynomials_for_line_3 @@ -96,6 +96,6 @@ operator == ( const Polynomials_for_line_3 & p1, (p1.b3() == p2.b3())); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_ALGEBRAIC_KERNEL_POLYNOMIALS_FOR_LINE_3_H diff --git a/Algebraic_kernel_for_spheres/include/CGAL/Root_for_spheres_2_3.h b/Algebraic_kernel_for_spheres/include/CGAL/Root_for_spheres_2_3.h index 45829e5e1db2..8a47369ad164 100644 --- a/Algebraic_kernel_for_spheres/include/CGAL/Root_for_spheres_2_3.h +++ b/Algebraic_kernel_for_spheres/include/CGAL/Root_for_spheres_2_3.h @@ -35,7 +35,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename RT_ > class Root_for_spheres_2_3 { @@ -239,6 +239,6 @@ operator>>(std::istream & is, Root_for_spheres_2_3 &r) return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ROOT_FOR_SPHERES_2_3_H diff --git a/Algebraic_kernel_for_spheres/include/CGAL/global_functions_on_root_for_sphere_2_3.h b/Algebraic_kernel_for_spheres/include/CGAL/global_functions_on_root_for_sphere_2_3.h index 2fc3063c34f2..54200cb610de 100644 --- a/Algebraic_kernel_for_spheres/include/CGAL/global_functions_on_root_for_sphere_2_3.h +++ b/Algebraic_kernel_for_spheres/include/CGAL/global_functions_on_root_for_sphere_2_3.h @@ -29,7 +29,7 @@ #ifndef CGAL_ALGEBRAIC_KERNEL_GLOBAL_FUNCTIONS_ON_ROOT_FOR_SPHERE_2_3_H #define CGAL_ALGEBRAIC_KERNEL_GLOBAL_FUNCTIONS_ON_ROOT_FOR_SPHERE_2_3_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class AK > inline @@ -66,6 +66,6 @@ compare_xyz(const typename AK::Root_for_spheres_2_3& r1, const typename AK::Root_for_spheres_2_3& r2) { return AK().compare_xyz_object()(r1, r2); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_ALGEBRAIC_KERNEL_GLOBAL_FUNCTIONS_ON_ROOT_FOR_SPHERE_2_3_H diff --git a/Algebraic_kernel_for_spheres/include/CGAL/global_functions_on_roots_and_polynomials_1_3.h b/Algebraic_kernel_for_spheres/include/CGAL/global_functions_on_roots_and_polynomials_1_3.h index ecf10c681d43..69d73c45d386 100644 --- a/Algebraic_kernel_for_spheres/include/CGAL/global_functions_on_roots_and_polynomials_1_3.h +++ b/Algebraic_kernel_for_spheres/include/CGAL/global_functions_on_roots_and_polynomials_1_3.h @@ -29,7 +29,7 @@ #ifndef CGAL_CURVED_KERNEL_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIALS_1_3_H #define CGAL_CURVED_KERNEL_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIALS_1_3_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class AK > inline @@ -51,6 +51,6 @@ construct_polynomials_for_line_3(const typename AK::FT& a1, const typename AK::FT& b3) { return AK().construct_polynomials_for_line_3_object()(a1, b1, a2, b2, a3, b3); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CURVED_KERNEL_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIALS_1_3_H diff --git a/Algebraic_kernel_for_spheres/include/CGAL/global_functions_on_roots_and_polynomials_2_3.h b/Algebraic_kernel_for_spheres/include/CGAL/global_functions_on_roots_and_polynomials_2_3.h index a3dc5197ff06..248dadc9fb69 100644 --- a/Algebraic_kernel_for_spheres/include/CGAL/global_functions_on_roots_and_polynomials_2_3.h +++ b/Algebraic_kernel_for_spheres/include/CGAL/global_functions_on_roots_and_polynomials_2_3.h @@ -29,7 +29,7 @@ #ifndef CGAL_CURVED_KERNEL_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIALS_2_3_H #define CGAL_CURVED_KERNEL_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIALS_2_3_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class AK > inline @@ -40,6 +40,6 @@ construct_polynomial_sphere_2_3(const typename AK::FT& xc, const typename AK::FT& r_sq) { return AK().construct_polynomial_sphere_2_3_object()(xc, yc, zc, r_sq); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CURVED_KERNEL_GLOBAL_FUNCTIONS_ON_ROOTS_AND_POLYNOMIALS_2_3_H diff --git a/Alpha_shapes_2/include/CGAL/Alpha_shape_2.h b/Alpha_shapes_2/include/CGAL/Alpha_shape_2.h index 893c95202b25..eb3f959f4a6d 100644 --- a/Alpha_shapes_2/include/CGAL/Alpha_shape_2.h +++ b/Alpha_shapes_2/include/CGAL/Alpha_shape_2.h @@ -40,7 +40,7 @@ -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Dt > class Alpha_shape_2 : public Dt @@ -1828,7 +1828,7 @@ Alpha_shape_2
::print_edge_map() { -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_ALPHA_SHAPE_2_H diff --git a/Alpha_shapes_2/include/CGAL/Alpha_shape_euclidean_traits_2.h b/Alpha_shapes_2/include/CGAL/Alpha_shape_euclidean_traits_2.h index 564ba45f7d19..40eca07af1b8 100644 --- a/Alpha_shapes_2/include/CGAL/Alpha_shape_euclidean_traits_2.h +++ b/Alpha_shapes_2/include/CGAL/Alpha_shape_euclidean_traits_2.h @@ -22,12 +22,12 @@ #define CGAL_ALPHA_SHAPE_EUCLIDEAN_TRAITS_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R > class Alpha_shape_euclidean_traits_2 : public R {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Alpha_shapes_2/include/CGAL/Alpha_shape_face_base_2.h b/Alpha_shapes_2/include/CGAL/Alpha_shape_face_base_2.h index 822661dc18d6..117f8df5c57d 100644 --- a/Alpha_shapes_2/include/CGAL/Alpha_shape_face_base_2.h +++ b/Alpha_shapes_2/include/CGAL/Alpha_shape_face_base_2.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Gt, class Fb = Triangulation_face_base_2 > class Alpha_shape_face_base_2 : public Fb @@ -81,6 +81,6 @@ class Alpha_shape_face_base_2 : public Fb }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //ALPHA_SHAPE_FACE_BASE_2_H diff --git a/Alpha_shapes_2/include/CGAL/Alpha_shape_vertex_base_2.h b/Alpha_shapes_2/include/CGAL/Alpha_shape_vertex_base_2.h index 32f62c8cf413..3d94880fea37 100644 --- a/Alpha_shapes_2/include/CGAL/Alpha_shape_vertex_base_2.h +++ b/Alpha_shapes_2/include/CGAL/Alpha_shape_vertex_base_2.h @@ -24,7 +24,7 @@ #include //------------------------------------------------------------------- -CGAL_BEGIN_NAMESPACE +namespace CGAL { //------------------------------------------------------------------- template > @@ -77,7 +77,7 @@ class Alpha_shape_vertex_base_2 : public Vb }; //------------------------------------------------------------------- -CGAL_END_NAMESPACE +} //namespace CGAL //------------------------------------------------------------------- #endif //ALPHA_SHAPE_VERTEX_BASE_2_H diff --git a/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_2.h b/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_2.h index 35678a6f65ad..d224149053af 100644 --- a/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_2.h +++ b/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_2.h @@ -31,7 +31,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Rt > class Weighted_alpha_shape_2 : public Alpha_shape_2 @@ -235,6 +235,6 @@ Weighted_alpha_shape_2::initialize_weights_to_the_nearest_vertex } } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_WEIGHTED_ALPHA_2_H diff --git a/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h b/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h index 129c7029f2b9..5ba675949f1d 100644 --- a/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h +++ b/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h @@ -29,7 +29,7 @@ #include //------------------------------------------------------------------- -CGAL_BEGIN_NAMESPACE +namespace CGAL { //------------------------------------------------------------------- //------------------ Function Objects---------------------------------- @@ -141,7 +141,7 @@ Regular_triangulation_euclidean_traits_2 }; //------------------------------------------------------------------- -CGAL_END_NAMESPACE +} //namespace CGAL //------------------------------------------------------------------- #endif diff --git a/Alpha_shapes_2/include/CGAL/constructions/squared_radius_smallest_orthogonalcircle_ftC2.h b/Alpha_shapes_2/include/CGAL/constructions/squared_radius_smallest_orthogonalcircle_ftC2.h index 03a0e841d0fe..4ddfd4b26543 100644 --- a/Alpha_shapes_2/include/CGAL/constructions/squared_radius_smallest_orthogonalcircle_ftC2.h +++ b/Alpha_shapes_2/include/CGAL/constructions/squared_radius_smallest_orthogonalcircle_ftC2.h @@ -24,7 +24,7 @@ #include //------------------------------------------------------------------- -CGAL_BEGIN_NAMESPACE +namespace CGAL { //------------------------------------------------------------------- template< class FT > @@ -70,7 +70,7 @@ squared_radius_smallest_orthogonalcircleC2( } //------------------------------------------------------------------- -CGAL_END_NAMESPACE +} //namespace CGAL //------------------------------------------------------------------- #endif //CGAL_SQUARED_RADIUS_SMALLEST_ORTHOGONALCIRCLE_ftC2_H diff --git a/Alpha_shapes_2/include/CGAL/predicates/in_smallest_orthogonalcircle_ftC2.h b/Alpha_shapes_2/include/CGAL/predicates/in_smallest_orthogonalcircle_ftC2.h index 07762e625f9a..f715b08bbac8 100644 --- a/Alpha_shapes_2/include/CGAL/predicates/in_smallest_orthogonalcircle_ftC2.h +++ b/Alpha_shapes_2/include/CGAL/predicates/in_smallest_orthogonalcircle_ftC2.h @@ -24,7 +24,7 @@ #include //------------------------------------------------------------------- -CGAL_BEGIN_NAMESPACE +namespace CGAL { //------------------------------------------------------------------- template< class FT > @@ -46,7 +46,7 @@ in_smallest_orthogonalcircleC2(const FT &px, const FT &py, const FT &pw, } //------------------------------------------------------------------- -CGAL_END_NAMESPACE +} //namespace CGAL //------------------------------------------------------------------- #endif //CGAL_IN_SMALLEST_ORTHOGONALCIRCLEC2_H diff --git a/Alpha_shapes_3/include/CGAL/Alpha_shape_3.h b/Alpha_shapes_3/include/CGAL/Alpha_shape_3.h index 80345c365050..48786f934837 100644 --- a/Alpha_shapes_3/include/CGAL/Alpha_shape_3.h +++ b/Alpha_shapes_3/include/CGAL/Alpha_shape_3.h @@ -43,7 +43,7 @@ #endif //------------------------------------------------------------------- -CGAL_BEGIN_NAMESPACE +namespace CGAL { //------------------------------------------------------------------- namespace internal{ @@ -1924,7 +1924,7 @@ Alpha_shape_3
::print_alpha_status(const Alpha_status& as) const std::cerr << std::endl; } -CGAL_END_NAMESPACE +} //namespace CGAL #ifdef CGAL_USE_GEOMVIEW #include diff --git a/Alpha_shapes_3/include/CGAL/Alpha_shape_cell_base_3.h b/Alpha_shapes_3/include/CGAL/Alpha_shape_cell_base_3.h index 63220d1f1272..fde3ef738daa 100644 --- a/Alpha_shapes_3/include/CGAL/Alpha_shape_cell_base_3.h +++ b/Alpha_shapes_3/include/CGAL/Alpha_shape_cell_base_3.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class NT> class Alpha_status @@ -106,6 +106,6 @@ class Alpha_shape_cell_base_3 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ALPHA_SHAPE_CELL_BASE_3_H diff --git a/Alpha_shapes_3/include/CGAL/Alpha_shape_euclidean_traits_3.h b/Alpha_shapes_3/include/CGAL/Alpha_shape_euclidean_traits_3.h index f7793ed2fa33..4d44c884a415 100644 --- a/Alpha_shapes_3/include/CGAL/Alpha_shape_euclidean_traits_3.h +++ b/Alpha_shapes_3/include/CGAL/Alpha_shape_euclidean_traits_3.h @@ -20,12 +20,12 @@ #ifndef CGAL_ALPHA_SHAPE_EUCLIDEAN_TRAITS_3_H #define CGAL_ALPHA_SHAPE_EUCLIDEAN_TRAITS_3_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Alpha_shape_euclidean_traits_3 : public K {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_ALPHA_SHAPE_EUCLIDEAN_TRAITS_3_H diff --git a/Alpha_shapes_3/include/CGAL/Alpha_shape_vertex_base_3.h b/Alpha_shapes_3/include/CGAL/Alpha_shape_vertex_base_3.h index 8d9b1c7c1df4..6839bd7f3de3 100644 --- a/Alpha_shapes_3/include/CGAL/Alpha_shape_vertex_base_3.h +++ b/Alpha_shapes_3/include/CGAL/Alpha_shape_vertex_base_3.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template > class Alpha_shape_vertex_base_3 @@ -69,6 +69,6 @@ class Alpha_shape_vertex_base_3 void set_alpha_status(Alpha_status_iterator as) {_as= as;} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ALPHA_SHAPE_VERTEX_BASE_3_H diff --git a/Alpha_shapes_3/include/CGAL/IO/alpha_shape_geomview_ostream_3.h b/Alpha_shapes_3/include/CGAL/IO/alpha_shape_geomview_ostream_3.h index 69c734561115..244109479f8f 100644 --- a/Alpha_shapes_3/include/CGAL/IO/alpha_shape_geomview_ostream_3.h +++ b/Alpha_shapes_3/include/CGAL/IO/alpha_shape_geomview_ostream_3.h @@ -29,7 +29,7 @@ // - If interfaces were more similar, we could think of sharing 2d and 3d ? //------------------------------------------------------------------- -CGAL_BEGIN_NAMESPACE +namespace CGAL { //------------------------------------------------------------------- // This one is to show the edges of a 3D triangulation. @@ -137,7 +137,7 @@ operator<<( Geomview_stream &gv, Alpha_shape_3
& A) } //------------------------------------------------------------------- -CGAL_END_NAMESPACE +} //namespace CGAL //------------------------------------------------------------------- #endif // CGAL_IO_ALPHA_SHAPE_GEOMVIEW_OSTREAM_3_H diff --git a/Alpha_shapes_3/include/CGAL/Weighted_alpha_shape_euclidean_traits_3.h b/Alpha_shapes_3/include/CGAL/Weighted_alpha_shape_euclidean_traits_3.h index 2357094ca44a..c5847d306647 100644 --- a/Alpha_shapes_3/include/CGAL/Weighted_alpha_shape_euclidean_traits_3.h +++ b/Alpha_shapes_3/include/CGAL/Weighted_alpha_shape_euclidean_traits_3.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { @@ -35,7 +35,7 @@ class Weighted_alpha_shape_euclidean_traits_3 : public Regular_triangulation_euclidean_traits_3 {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NO_DEPRECATED_CODE diff --git a/Apollonius_graph_2/demo/Apollonius_graph_2/Qt3/include/CGAL/colors.h b/Apollonius_graph_2/demo/Apollonius_graph_2/Qt3/include/CGAL/colors.h index ab3e8a6da5a0..139f1a96077b 100644 --- a/Apollonius_graph_2/demo/Apollonius_graph_2/Qt3/include/CGAL/colors.h +++ b/Apollonius_graph_2/demo/Apollonius_graph_2/Qt3/include/CGAL/colors.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { const Color PINEGREEN = Color(0, 127, 0); const Color DARKGREEN = Color(0, 200, 0); @@ -30,7 +30,7 @@ const Color DARKGRAY = Color(64, 64, 64); const Color CYAN = Color(50, 248, 255); const Color LIGHTBLUE = Color(104, 144, 255); -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_COLORS_H diff --git a/Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/make_degenerate.h b/Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/make_degenerate.h index bc811e64c442..5ff9bae703d1 100644 --- a/Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/make_degenerate.h +++ b/Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/make_degenerate.h @@ -4,7 +4,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template OutputIterator @@ -34,6 +34,6 @@ make_degenerate(InputIterator first, return oit; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_MAKE_DEGENERATE_H diff --git a/Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/random_integral_sites_in_square_2.h b/Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/random_integral_sites_in_square_2.h index e55424e3b891..a434fd091757 100644 --- a/Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/random_integral_sites_in_square_2.h +++ b/Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/random_integral_sites_in_square_2.h @@ -4,7 +4,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // creates a random site with x, y in [-M,M]x[-M,M] // where M = 2^b - 1 and r in [0,R], R = 2^B - 1 @@ -49,6 +49,6 @@ class Random_integral_sites_in_square_2 Random r_; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_RANDOM_INTEGRAL_SITES_IN_SQUARE_2_H diff --git a/Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/random_integral_sites_on_parabola_2.h b/Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/random_integral_sites_on_parabola_2.h index d9965081e6c6..369317b997eb 100644 --- a/Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/random_integral_sites_on_parabola_2.h +++ b/Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/random_integral_sites_on_parabola_2.h @@ -4,7 +4,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // creates a random site of the form {(t, t^2), t^2}, where t is in // the range [-M, M], M = 2^b - 1 @@ -49,6 +49,6 @@ class Random_integral_sites_on_parabola_2 Random r_; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_RANDOM_INTEGRAL_SITES_ON_PARABOLA_2_H diff --git a/Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/random_sites_in_0x1_box.h b/Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/random_sites_in_0x1_box.h index 82c93820ebaa..316e338ffa89 100644 --- a/Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/random_sites_in_0x1_box.h +++ b/Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/random_sites_in_0x1_box.h @@ -4,7 +4,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Random_sites_in_0x1_box @@ -32,6 +32,6 @@ class Random_sites_in_0x1_box Random random_; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_RANDOM_SITES_IN_0X1_BOX_H diff --git a/Apollonius_graph_2/generators/include/CGAL/bits.h b/Apollonius_graph_2/generators/include/CGAL/bits.h index 0301a8402354..242d92a64542 100644 --- a/Apollonius_graph_2/generators/include/CGAL/bits.h +++ b/Apollonius_graph_2/generators/include/CGAL/bits.h @@ -4,7 +4,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { double log2(double x) { @@ -18,6 +18,6 @@ unsigned int bits(double x) return static_cast(log2( fabs(x) )) + 1; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_BITS_H diff --git a/Apollonius_graph_2/generators/include/CGAL/random_integer.h b/Apollonius_graph_2/generators/include/CGAL/random_integer.h index 5c6a33cee8ad..7b2a51e62cc5 100644 --- a/Apollonius_graph_2/generators/include/CGAL/random_integer.h +++ b/Apollonius_graph_2/generators/include/CGAL/random_integer.h @@ -12,7 +12,7 @@ //extern "C" int srandom(unsigned); //extern "C" long random(); -CGAL_BEGIN_NAMESPACE +namespace CGAL { // powers of 2 from 2^0 to 2^53 double @@ -104,7 +104,7 @@ double random_even_integer(Random& r, unsigned int b, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_RANDOM_INTEGER_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2.h index f1c8327b5bc2..c9a90fc8b5ec 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2.h @@ -47,7 +47,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -1328,7 +1328,7 @@ std::istream& operator>>(std::istream& is, return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h index baa4b0838c7e..de634663dd14 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h @@ -24,7 +24,7 @@ // class implementation continued //================================= -CGAL_BEGIN_NAMESPACE +namespace CGAL { //-------------------------------------------------------------------- @@ -2058,7 +2058,7 @@ Apollonius_graph_2::file_input(std::istream& is) } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_IMPL_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_hierarchy_2_impl.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_hierarchy_2_impl.h index cba22cb78018..fe766eb23170 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_hierarchy_2_impl.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_hierarchy_2_impl.h @@ -24,7 +24,7 @@ // class implementation //--------------------- -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void @@ -547,7 +547,7 @@ file_output(std::ostream& os) const delete[] V_down; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_HIERARCHY_2_IMPL_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Bounded_side_of_ccw_circle_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Bounded_side_of_ccw_circle_C2.h index 978946c0def0..2b0a9a67b9f6 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Bounded_side_of_ccw_circle_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Bounded_side_of_ccw_circle_C2.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -97,6 +97,6 @@ class Bounded_side_of_CCW_circle_2 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_BOUNDED_SIDE_OF_CCW_CIRCLE_C2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_weight_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_weight_2.h index a0f1fa47ae3e..6a1c366dd463 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_weight_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_weight_2.h @@ -26,7 +26,7 @@ //-------------------------------------------------------------------- -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -51,6 +51,6 @@ class Compare_weight_2 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_COMPARE_WEIGHT_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_x_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_x_2.h index 25b35cc89bdc..b0b24c3f2ba7 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_x_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_x_2.h @@ -26,7 +26,7 @@ //-------------------------------------------------------------------- -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -51,6 +51,6 @@ class Compare_x_2 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_COMPARE_X_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_y_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_y_2.h index e7f5329ed9db..fdaac1d743a8 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_y_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_y_2.h @@ -26,7 +26,7 @@ //-------------------------------------------------------------------- -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -51,6 +51,6 @@ class Compare_y_2 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_COMPARE_Y_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_C2.h index cee3b7857620..90758f15a42d 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_C2.h @@ -34,7 +34,7 @@ -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -429,6 +429,6 @@ class Construct_Apollonius_primal_segment_2 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_CONSTRUCTIONS_C2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_ftC2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_ftC2.h index 0f09e35bcb2d..5991f1f6c5ae 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_ftC2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_ftC2.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -181,6 +181,6 @@ ad_left_bitangent_lineC2(const FT &x1, const FT &y1, const FT &w1, CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_CONSTRUCTIONS_FTC2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_rtH2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_rtH2.h index b232e1ab034f..32a8ba782b1a 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_rtH2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_rtH2.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class RT, class We > inline @@ -78,6 +78,6 @@ ad_left_bitangent_lineH2(const FT &hx1, const FT &hy1, const We &w1, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_CONSTRUCTIONS_RTH2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_filtered_traits_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_filtered_traits_2.h index dc29734f3aa3..e0e2fb123368 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_filtered_traits_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_filtered_traits_2.h @@ -36,7 +36,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------- @@ -408,7 +408,7 @@ class Apollonius_graph_mixed_filtered_traits_2 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_UNCERTAIN_FILTERED_TRAITS_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_traits_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_traits_2.h index 1d6cd95def54..de63dcab68b6 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_traits_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_traits_2.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------- //----------------------------------------------------------------------- @@ -208,6 +208,6 @@ class Apollonius_graph_mixed_traits_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_NEW_TRAITS_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_filtered_traits_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_filtered_traits_2.h index b07f973f381e..9e204547b4a5 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_filtered_traits_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_filtered_traits_2.h @@ -36,7 +36,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------- @@ -411,7 +411,7 @@ class Apollonius_graph_new_filtered_traits_2 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_NEW_FILTERED_TRAITS_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_traits_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_traits_2.h index 0361e960f3ea..4de679134143 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_traits_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_traits_2.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------- //----------------------------------------------------------------------- @@ -211,6 +211,6 @@ class Apollonius_graph_new_traits_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_NEW_TRAITS_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Conflict_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Conflict_2.h index 3d4c7e4fcb67..9d427015d4ec 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Conflict_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Conflict_2.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -183,6 +183,6 @@ class Conflict_2 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_CONFLICT_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Edge_conflict_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Edge_conflict_2.h index 63e223866a3c..fc9346cdab34 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Edge_conflict_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Edge_conflict_2.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -106,6 +106,6 @@ class Edge_conflict_2 : public Conflict_2 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_EDGE_CONFLICT_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Finite_edge_conflict_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Finite_edge_conflict_2.h index 81400a29f43d..dc84beb0c4b5 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Finite_edge_conflict_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Finite_edge_conflict_2.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -85,6 +85,6 @@ class Finite_edge_interior_conflict_new_2 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_FINITE_EDGE_CONFLICT_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Infinite_edge_conflict_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Infinite_edge_conflict_2.h index 8021cca6aaf1..309a39dcdf64 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Infinite_edge_conflict_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Infinite_edge_conflict_2.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -64,6 +64,6 @@ class Infinite_edge_interior_conflict_new_2 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_INFINITE_EDGE_CONFLICT_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Orientation_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Orientation_2.h index 6fb2fb33c993..9953e7480b2e 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Orientation_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Orientation_2.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -94,6 +94,6 @@ class Orientation_new_2 : public Orientation_2 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_ORIENTATION_NEW_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Vertex_conflict_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Vertex_conflict_2.h index 194f83a8b4c4..3b3a3c73ebe7 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Vertex_conflict_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Vertex_conflict_2.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -322,6 +322,6 @@ class Vertex_conflict_new_2 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_VERTEX_CONFLICT_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test8_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test8_C2.h index 05815ee9d2d8..87a5bab48edc 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test8_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test8_C2.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -751,6 +751,6 @@ class Finite_edge_interior_conflict8_2 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_FINITE_EDGE_TEST8_C2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test_C2.h index 10b38e5e8ae8..af5485235439 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test_C2.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -631,6 +631,6 @@ class Finite_edge_interior_conflict_2 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_FINITE_EDGE_TEST_C2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Incircle8_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Incircle8_C2.h index 858ff0e0b9e6..f4341d1e06f8 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Incircle8_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Incircle8_C2.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -129,6 +129,6 @@ class Vertex_conflict8_2 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_INCIRCLE8_C2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Incircle_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Incircle_C2.h index 13b74d63c589..1e413c74fd54 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Incircle_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Incircle_C2.h @@ -29,7 +29,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -241,6 +241,6 @@ class Vertex_conflict_2 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_INCIRCLE_C2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Infinite_edge_test_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Infinite_edge_test_C2.h index 69347e6aa00a..cdc60a8931ec 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Infinite_edge_test_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Infinite_edge_test_C2.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -314,7 +314,7 @@ class Infinite_edge_interior_conflict_2 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_INFINITE_EDGE_TEST_C2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Is_degenerate_edge_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Is_degenerate_edge_C2.h index ba4e546cc7d5..dcfaf1a9a1bd 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Is_degenerate_edge_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Is_degenerate_edge_C2.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -94,6 +94,6 @@ class Is_degenerate_edge_2 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_IS_DEGENERATE_EDGE_C2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Is_hidden_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Is_hidden_C2.h index 35cd5a90fecf..524532cdb3ad 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Is_hidden_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Is_hidden_C2.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -83,6 +83,6 @@ class Is_hidden_2 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_IS_HIDDEN_C2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Kernel_wrapper_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Kernel_wrapper_2.h index 093a56f0f5a8..e510bab0470a 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Kernel_wrapper_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Kernel_wrapper_2.h @@ -27,7 +27,7 @@ #include //#include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -80,7 +80,7 @@ class Apollonius_graph_cartesian_converter CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_KERNEL_WRAPPER_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Orientation8_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Orientation8_C2.h index ff896ecaaae6..7e02e8a5cb08 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Orientation8_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Orientation8_C2.h @@ -25,7 +25,7 @@ //-------------------------------------------------------------------- -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -317,6 +317,6 @@ class Constructive_orientation8_C2 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_ORIENTATION8_C2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Orientation_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Orientation_2.h index 98c543f1828d..96bdeef73a2e 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Orientation_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Orientation_2.h @@ -28,7 +28,7 @@ //-------------------------------------------------------------------- -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -108,6 +108,6 @@ class Orientation_2 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_ORIENTATION_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Oriented_side_of_bisector_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Oriented_side_of_bisector_C2.h index 5db196b307b2..4fdab5b5a13d 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Oriented_side_of_bisector_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Oriented_side_of_bisector_C2.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -123,6 +123,6 @@ class Oriented_side_of_bisector_2 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_ORIENTED_SIDE_OF_BISECTOR_C2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Predicate_constructions_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Predicate_constructions_C2.h index ed346c7f1b63..43aad5cfdbb9 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Predicate_constructions_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Predicate_constructions_C2.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -357,6 +357,6 @@ class Voronoi_circle_2 : public Bitangent_line_2 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_PREDICATE_CONSTRUCTIONS_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Traits_wrapper_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Traits_wrapper_2.h index 338dda2b2fd3..8bb61db2e27d 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Traits_wrapper_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Traits_wrapper_2.h @@ -27,7 +27,7 @@ -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -48,7 +48,7 @@ class Apollonius_graph_traits_wrapper_2 : public Gt_base CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_TRAITS_WRAPPER_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/comparator_profiler.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/comparator_profiler.h index fc256efe501d..c0356606690d 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/comparator_profiler.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/comparator_profiler.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -160,6 +160,6 @@ unsigned long comparator_profiler::counter_rr_r0 = 0; CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_COMPARATOR_PROFILER_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/compare_quadratic.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/compare_quadratic.h index b79889b286a2..b48b6bca8842 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/compare_quadratic.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/compare_quadratic.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -985,6 +985,6 @@ ke_compare_r1_r2_filtered(const CT& a1, const CT& b1, const CT& c1, CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_COMPARE_QUADRATIC_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/predicate_profiler.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/predicate_profiler.h index db6ca3329665..ca9ed14019e1 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/predicate_profiler.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/predicate_profiler.h @@ -26,7 +26,7 @@ #define AG2_PROFILE_PREDICATES -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE @@ -73,6 +73,6 @@ unsigned long ag2_predicate_profiler::order_on_bisector_counter = 0; CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_PREDICATE_PROFILER diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Apollonius_graph_uncertain_filtered_traits_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Apollonius_graph_uncertain_filtered_traits_2.h index 2529e301ac26..d5e0ce69217e 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Apollonius_graph_uncertain_filtered_traits_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Apollonius_graph_uncertain_filtered_traits_2.h @@ -44,7 +44,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------- @@ -502,7 +502,7 @@ class Apollonius_graph_uncertain_filtered_traits_2 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_UNCERTAIN_FILTERED_TRAITS_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_is_hidden_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_is_hidden_C2.h index 329a6317adcf..ea0c36704d60 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_is_hidden_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_is_hidden_C2.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //-------------------------------------------------------------------- @@ -92,6 +92,6 @@ class Ag2_uncertain_is_hidden_C2 //-------------------------------------------------------------------- -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_UNCERTAIN_IS_HIDDEN_C2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_oriented_side_of_bisector_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_oriented_side_of_bisector_C2.h index 0823e2d24ca3..4c6f26d0df7a 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_oriented_side_of_bisector_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_oriented_side_of_bisector_C2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //-------------------------------------------------------------------- @@ -120,6 +120,6 @@ class Ag2_uncertain_oriented_side_of_bisector_C2 //-------------------------------------------------------------------- -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_UNCERTAIN_ORIENTED_SIDE_OF_BISECTOR_C2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_vertex_conflict_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_vertex_conflict_2.h index fd4aa81261dd..58c0b38b9280 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_vertex_conflict_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_vertex_conflict_2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------- // Vertex conflict @@ -402,6 +402,6 @@ class Uncertain_vertex_conflict_new_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_2_UNCERTAIN_VERTEX_CONFLICT_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/uncertain_functions_on_signs.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/uncertain_functions_on_signs.h index cc565e7fed30..23bce6de9f74 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/uncertain_functions_on_signs.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/uncertain_functions_on_signs.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class RT > Uncertain @@ -142,7 +142,7 @@ sign_a_plus_b_x_sqrt_e_plus_c_x_sqrt_f_plus_d_sqrt_e_x_f(const RT &a, } #endif -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_UNCERTAIN_FUNCTIONS_ON_SIGNS_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_data_structure_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_data_structure_2.h index b734b535ee83..88f3647ca5c0 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_data_structure_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_data_structure_2.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // For backward compatibility @@ -35,6 +35,6 @@ class Apollonius_graph_data_structure_2 {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_DATA_STRUCTURE_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_filtered_traits_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_filtered_traits_2.h index 15062bceae9a..a29f7a73402c 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_filtered_traits_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_filtered_traits_2.h @@ -35,7 +35,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------- @@ -401,7 +401,7 @@ class Apollonius_graph_filtered_traits_2 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_FILTERED_TRAITS_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_hierarchy_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_hierarchy_2.h index c8cc720e3601..103eb0712a64 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_hierarchy_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_hierarchy_2.h @@ -34,7 +34,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // parameterization of the hierarchy @@ -354,7 +354,7 @@ std::istream& operator>>(std::istream& is, return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_hierarchy_vertex_base_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_hierarchy_vertex_base_2.h index d2c02eb95b9a..d8de07c78a4a 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_hierarchy_vertex_base_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_hierarchy_vertex_base_2.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Vbb > class Apollonius_graph_hierarchy_vertex_base_2 @@ -65,6 +65,6 @@ class Apollonius_graph_hierarchy_vertex_base_2 Vertex_handle _down; // same vertex one level below }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_HIERARCHY_VERTEX_BASE_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_traits_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_traits_2.h index af9baa7c513c..53876508623c 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_traits_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_traits_2.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------- //----------------------------------------------------------------------- @@ -219,6 +219,6 @@ class Apollonius_graph_traits_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_TRAITS_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_vertex_base_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_vertex_base_2.h index d33f6f0bc603..ecd0f14f3409 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_vertex_base_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_vertex_base_2.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Apollonius_graph_vertex_base_nested_iterator_traits @@ -148,6 +148,6 @@ class Apollonius_graph_vertex_base_2 Site_2 _p; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_VERTEX_BASE_2_H diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_site_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_site_2.h index c97ae50289d7..0042607dcc43 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_site_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_site_2.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class K > @@ -82,6 +82,6 @@ operator>>(std::istream& is, Apollonius_site_2& wp) } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_SITE_2_H diff --git a/Apollonius_graph_2/include/CGAL/Hyperbola_2.h b/Apollonius_graph_2/include/CGAL/Hyperbola_2.h index 5cde1597d3d6..3fa69cb8b0f5 100644 --- a/Apollonius_graph_2/include/CGAL/Hyperbola_2.h +++ b/Apollonius_graph_2/include/CGAL/Hyperbola_2.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Gt > class Hyperbola_2 @@ -312,6 +312,6 @@ Stream& operator<<(Stream& s, const Hyperbola_2 &H) } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HYPERBOLA_2_H diff --git a/Apollonius_graph_2/include/CGAL/Hyperbola_ray_2.h b/Apollonius_graph_2/include/CGAL/Hyperbola_ray_2.h index c3544dce7aac..2b72ea40e47d 100644 --- a/Apollonius_graph_2/include/CGAL/Hyperbola_ray_2.h +++ b/Apollonius_graph_2/include/CGAL/Hyperbola_ray_2.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Gt > class Hyperbola_ray_2 : public Hyperbola_segment_2< Gt > @@ -144,6 +144,6 @@ Stream& operator<<(Stream &s, const Hyperbola_ray_2 &H) return s; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HYPERBOLA_RAY_2_H diff --git a/Apollonius_graph_2/include/CGAL/Hyperbola_segment_2.h b/Apollonius_graph_2/include/CGAL/Hyperbola_segment_2.h index 93732c61edda..79cf1dc8a4f3 100644 --- a/Apollonius_graph_2/include/CGAL/Hyperbola_segment_2.h +++ b/Apollonius_graph_2/include/CGAL/Hyperbola_segment_2.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Gt > class Hyperbola_segment_2 : public Hyperbola_2< Gt > @@ -192,6 +192,6 @@ Stream& operator<<(Stream &s, const Hyperbola_segment_2& H) return s; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HYPERBOLA_SEGMENT_2_H diff --git a/Apollonius_graph_2/include/CGAL/IO/Qt_widget_Apollonius_site_2.h b/Apollonius_graph_2/include/CGAL/IO/Qt_widget_Apollonius_site_2.h index 8e88f000733e..c3640af1e20b 100644 --- a/Apollonius_graph_2/include/CGAL/IO/Qt_widget_Apollonius_site_2.h +++ b/Apollonius_graph_2/include/CGAL/IO/Qt_widget_Apollonius_site_2.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template Qt_widget& @@ -38,7 +38,7 @@ operator<<(Qt_widget &qt_w, const Apollonius_site_2& wp) return qt_w << p << c; } -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Apollonius_graph_2/include/CGAL/IO/Qt_widget_Hyperbola_2.h b/Apollonius_graph_2/include/CGAL/IO/Qt_widget_Hyperbola_2.h index 44adce8e5c85..d842c96050d4 100644 --- a/Apollonius_graph_2/include/CGAL/IO/Qt_widget_Hyperbola_2.h +++ b/Apollonius_graph_2/include/CGAL/IO/Qt_widget_Hyperbola_2.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template< class Gt > inline @@ -42,6 +42,6 @@ Qt_widget& operator<<(Qt_widget &s, Hyperbola_ray_2 &H) return s; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_QT_WIDGET_HYPERBOLA_2_H diff --git a/Apollonius_graph_2/include/CGAL/Parabola_2.h b/Apollonius_graph_2/include/CGAL/Parabola_2.h index 085e2a7b7ae5..e5a1b96a5ed5 100644 --- a/Apollonius_graph_2/include/CGAL/Parabola_2.h +++ b/Apollonius_graph_2/include/CGAL/Parabola_2.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Gt > @@ -329,6 +329,6 @@ Stream& operator<<(Stream& s, const Parabola_2 &P) -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PARABOLA_2_H diff --git a/Apollonius_graph_2/include/CGAL/Parabola_segment_2.h b/Apollonius_graph_2/include/CGAL/Parabola_segment_2.h index 71778697c3b9..38f4a10320fe 100644 --- a/Apollonius_graph_2/include/CGAL/Parabola_segment_2.h +++ b/Apollonius_graph_2/include/CGAL/Parabola_segment_2.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Qt { template class PainterOstream; @@ -172,6 +172,6 @@ Stream& operator<<(Stream &s, const Parabola_segment_2 &P) return s; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PARABOLA_SEGMENT_2_H diff --git a/Apollonius_graph_2/include/CGAL/functions_on_signs.h b/Apollonius_graph_2/include/CGAL/functions_on_signs.h index d90bf30f271d..34214bccafbd 100644 --- a/Apollonius_graph_2/include/CGAL/functions_on_signs.h +++ b/Apollonius_graph_2/include/CGAL/functions_on_signs.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #if 0 inline Sign @@ -133,7 +133,7 @@ sign_a_plus_b_x_sqrt_e_plus_c_x_sqrt_f_plus_d_sqrt_e_x_f(const RT &a, e); } -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Apollonius_graph_2/include/CGAL/in_place_edge_list.h b/Apollonius_graph_2/include/CGAL/in_place_edge_list.h index 97edeb74cad4..38af54a0d03b 100644 --- a/Apollonius_graph_2/include/CGAL/in_place_edge_list.h +++ b/Apollonius_graph_2/include/CGAL/in_place_edge_list.h @@ -22,7 +22,7 @@ #ifndef CGAL_IN_PLACE_EDGE_LIST_H #define CGAL_IN_PLACE_EDGE_LIST_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class In_place_edge_list { @@ -199,7 +199,7 @@ class In_place_edge_list { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IN_EDGE_PLACE_LIST_H diff --git a/Apollonius_graph_2/include/CGAL/more_functions_on_signs.h b/Apollonius_graph_2/include/CGAL/more_functions_on_signs.h index 86be0db70df7..97eb4fd9cdb4 100644 --- a/Apollonius_graph_2/include/CGAL/more_functions_on_signs.h +++ b/Apollonius_graph_2/include/CGAL/more_functions_on_signs.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { inline Sign sign_of_first_root(const Sign &sb, const Sign &sc) @@ -58,6 +58,6 @@ sign_of_second_root(const Sign &sb, const Sign &sc) return sc; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MORE_FUNCTIONS_ON_SIGNS_H diff --git a/Apollonius_graph_2/test/Apollonius_graph_2/include/IO/Null_output_stream.h b/Apollonius_graph_2/test/Apollonius_graph_2/include/IO/Null_output_stream.h index cd6a1aa9d1a8..d5d2210f060d 100644 --- a/Apollonius_graph_2/test/Apollonius_graph_2/include/IO/Null_output_stream.h +++ b/Apollonius_graph_2/test/Apollonius_graph_2/include/IO/Null_output_stream.h @@ -29,7 +29,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { struct Null_output_stream {}; @@ -48,6 +48,6 @@ operator<<(Null_output_stream& nos, const T&) } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NULL_OUTPUT_STREAM_H diff --git a/Apollonius_graph_2/test/Apollonius_graph_2/include/test.h b/Apollonius_graph_2/test/Apollonius_graph_2/include/test.h index e7fe3e57dad2..fa43c2fe198c 100644 --- a/Apollonius_graph_2/test/Apollonius_graph_2/include/test.h +++ b/Apollonius_graph_2/test/Apollonius_graph_2/include/test.h @@ -18,7 +18,7 @@ #include "IO/Null_output_stream.h" -CGAL_BEGIN_NAMESPACE +namespace CGAL { bool dummy(bool b) { CGAL_assertion( b ); @@ -961,7 +961,7 @@ bool test_filtered_traits_hierarchy_algo(InputStream& is) -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Arithmetic_kernel/include/CGAL/Arithmetic_kernel/Arithmetic_kernel_base.h b/Arithmetic_kernel/include/CGAL/Arithmetic_kernel/Arithmetic_kernel_base.h index 8d4b45b642fc..bec543c2ef06 100644 --- a/Arithmetic_kernel/include/CGAL/Arithmetic_kernel/Arithmetic_kernel_base.h +++ b/Arithmetic_kernel/include/CGAL/Arithmetic_kernel/Arithmetic_kernel_base.h @@ -27,7 +27,7 @@ #ifndef CGAL_ARITHMETIC_KERNEL_ARITHMETIC_KERNEL_BASE_H #define CGAL_ARITHMETIC_KERNEL_ARITHMETIC_KERNEL_BASE_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal{ class Arithmetic_kernel_base{ @@ -43,6 +43,6 @@ class Arithmetic_kernel_base{ }; }// namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ARITHMETIC_KERNEL_ARITHMETIC_KERNEL_BASE_H diff --git a/Arithmetic_kernel/include/CGAL/CORE_arithmetic_kernel.h b/Arithmetic_kernel/include/CGAL/CORE_arithmetic_kernel.h index 31cd008a8209..fd7ad310384e 100644 --- a/Arithmetic_kernel/include/CGAL/CORE_arithmetic_kernel.h +++ b/Arithmetic_kernel/include/CGAL/CORE_arithmetic_kernel.h @@ -42,7 +42,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \ingroup CGAL_Arithmetic_kernel * \brief The CORE set of exact number types @@ -81,7 +81,7 @@ struct Get_arithmetic_kernel{ typedef CORE_arithmetic_kernel Arithmetic_kernel; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_USE_CORE diff --git a/Arithmetic_kernel/include/CGAL/GMP_arithmetic_kernel.h b/Arithmetic_kernel/include/CGAL/GMP_arithmetic_kernel.h index feae9319077f..98dd3ba36994 100644 --- a/Arithmetic_kernel/include/CGAL/GMP_arithmetic_kernel.h +++ b/Arithmetic_kernel/include/CGAL/GMP_arithmetic_kernel.h @@ -44,7 +44,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \ingroup CGAL_Arithmetic_kernel * \brief The GMP set of exact number types @@ -74,7 +74,7 @@ struct Get_arithmetic_kernel{ typedef GMP_arithmetic_kernel Arithmetic_kernel; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_USE_MPFI #endif //CGAL_USE_GMP diff --git a/Arithmetic_kernel/include/CGAL/Get_arithmetic_kernel.h b/Arithmetic_kernel/include/CGAL/Get_arithmetic_kernel.h index c22b52ab017c..1deca85c8c99 100644 --- a/Arithmetic_kernel/include/CGAL/Get_arithmetic_kernel.h +++ b/Arithmetic_kernel/include/CGAL/Get_arithmetic_kernel.h @@ -27,8 +27,8 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template< class NT > struct Get_arithmetic_kernel; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_GET_ARITHMETIC_KERNEL_H diff --git a/Arithmetic_kernel/include/CGAL/LEDA_arithmetic_kernel.h b/Arithmetic_kernel/include/CGAL/LEDA_arithmetic_kernel.h index a3023f8cb590..ba8e6046d3dc 100644 --- a/Arithmetic_kernel/include/CGAL/LEDA_arithmetic_kernel.h +++ b/Arithmetic_kernel/include/CGAL/LEDA_arithmetic_kernel.h @@ -42,7 +42,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \ingroup CGAL_Arithmetic_kernel * \brief The LEDA set of exact number types @@ -85,7 +85,7 @@ struct Get_arithmetic_kernel{ typedef LEDA_arithmetic_kernel Arithmetic_kernel; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_USE_LEDA diff --git a/Arithmetic_kernel/include/CGAL/OLD/GMP/Gmpfr_interval_type.h b/Arithmetic_kernel/include/CGAL/OLD/GMP/Gmpfr_interval_type.h index faef0c3230b0..832604807523 100644 --- a/Arithmetic_kernel/include/CGAL/OLD/GMP/Gmpfr_interval_type.h +++ b/Arithmetic_kernel/include/CGAL/OLD/GMP/Gmpfr_interval_type.h @@ -12,7 +12,7 @@ mpfr_ ## o (r.fr(), a.fr(), b.fr(), GMP_RND ## d); \ return r; -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -127,7 +127,7 @@ class Checking_for_gmpfr { }; } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL namespace boost { namespace numeric { @@ -144,7 +144,7 @@ std::ostream& operator << }//namespace numeric }//namespace boost -CGAL_BEGIN_NAMESPACE +namespace CGAL { typedef boost::numeric::interval< Gmpfr, @@ -160,7 +160,7 @@ Gmpfr_interval; inline bool operator == (const Gmpfr_interval& x , const Gmpfr_interval& y) {return x.operator==(y) ;} -CGAL_END_NAMESPACE +} //namespace CGAL //#endif // CGAL_USE_LEDA #undef OP #endif // CGAL_GMPFR_INTERVAL_TYPE_H diff --git a/Arithmetic_kernel/include/CGAL/OLD/Gmpfr_interval.h b/Arithmetic_kernel/include/CGAL/OLD/Gmpfr_interval.h index 91c2240bc75b..62218a101fb5 100644 --- a/Arithmetic_kernel/include/CGAL/OLD/Gmpfr_interval.h +++ b/Arithmetic_kernel/include/CGAL/OLD/Gmpfr_interval.h @@ -36,7 +36,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template <> class Algebraic_structure_traits< Gmpfr_interval > : public Algebraic_structure_traits_base < Gmpfr_interval, @@ -332,5 +332,5 @@ struct Coercion_traits // lower GMP types: CGAL_DEFINE_COERCION_TRAITS_FROM_TO(Gmpfr,Gmpfr_interval) -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_GMPFR_INTERVAL_H diff --git a/Arithmetic_kernel/test/Arithmetic_kernel/include/CGAL/Test/_test_arithmetic_kernel.h b/Arithmetic_kernel/test/Arithmetic_kernel/include/CGAL/Test/_test_arithmetic_kernel.h index 098a99401137..830ece6b7376 100644 --- a/Arithmetic_kernel/test/Arithmetic_kernel/include/CGAL/Test/_test_arithmetic_kernel.h +++ b/Arithmetic_kernel/test/Arithmetic_kernel/include/CGAL/Test/_test_arithmetic_kernel.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { typedef CGAL::Interval_nt Interval; @@ -122,5 +122,5 @@ template void test_arithmetic_kernel(){ test_coercion_arithmetic_kernel(); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TEST_ARITHMETIC_KERNEL_H diff --git a/Arrangement_on_surface_2/benchmarks/Arrangement_on_surface_2/arr_bench.cpp b/Arrangement_on_surface_2/benchmarks/Arrangement_on_surface_2/arr_bench.cpp index 61693f78cf94..f80b73ff31b2 100644 --- a/Arrangement_on_surface_2/benchmarks/Arrangement_on_surface_2/arr_bench.cpp +++ b/Arrangement_on_surface_2/benchmarks/Arrangement_on_surface_2/arr_bench.cpp @@ -267,7 +267,7 @@ QApplication * App; #error No traits (TRAITS) specified #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { inline std::ostream & operator<<(std::ostream & os, const Arr::Vertex & vertex) { @@ -275,7 +275,7 @@ inline std::ostream & operator<<(std::ostream & os, const Arr::Vertex & vertex) return os; } -CGAL_END_NAMESPACE +} //namespace CGAL /*! Exporter of an arrangement to a window stream */ inline Window_stream & operator<<(Window_stream & ws, Arr & arr) diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_Bezier_curve_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_Bezier_curve_traits_2.h index a5fc06da48ae..a58254989d76 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_Bezier_curve_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_Bezier_curve_traits_2.h @@ -33,7 +33,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A traits class for maintaining an arrangement of Bezier curves with @@ -808,6 +808,6 @@ class Arr_Bezier_curve_traits_2 //@} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_accessor.h b/Arrangement_on_surface_2/include/CGAL/Arr_accessor.h index 377c46314497..067abf457d07 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_accessor.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_accessor.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A class that provides access to some of the internal arrangement operations. @@ -967,6 +967,6 @@ class Arr_accessor }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h b/Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h index 19d1979f03fc..7181a14d0b39 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * Issue a batched point-location query on an arrangement given an input @@ -134,6 +134,6 @@ OutputIterator locate return (oi); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h index 8f2427ece4fe..1a0db635c117 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h @@ -35,7 +35,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Forward declaration: template @@ -634,7 +634,7 @@ class Arr_bounded_planar_topology_traits_2 : //@} }; -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_circle_segment_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_circle_segment_traits_2.h index c58e5f48e6fe..0163b8c09bd3 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_circle_segment_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_circle_segment_traits_2.h @@ -31,7 +31,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A traits class for maintaining an arrangement of circles. @@ -681,6 +681,6 @@ class Arr_circle_segment_traits_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_conic_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_conic_traits_2.h index 2b60107aadf6..7a49edcb0623 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_conic_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_conic_traits_2.h @@ -32,7 +32,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * \class A traits class for maintaining an arrangement of conic arcs (bounded @@ -801,6 +801,6 @@ class Arr_conic_traits_2 //@} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_consolidated_curve_data_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_consolidated_curve_data_traits_2.h index a45dfcc611f1..c51f6be662c7 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_consolidated_curve_data_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_consolidated_curve_data_traits_2.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A generic traits class for maintaining an arrangement of curves that have @@ -92,6 +92,6 @@ class Arr_consolidated_curve_data_traits_2 : Arr_right_side_category; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h index f0817b270660..c38d3f946c08 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A model of the ArrangementTraits_2 concept that counts the methods invoked. @@ -852,6 +852,6 @@ Out_stream & operator<<(Out_stream & os, return os; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_curve_data_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_curve_data_traits_2.h index 5a0de7c6b8dc..6528997ca645 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_curve_data_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_curve_data_traits_2.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A generic traits class for maintaining an arrangement of curves that have @@ -443,6 +443,6 @@ class Arr_curve_data_traits_2 : public Traits_ }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_dcel_base.h b/Arrangement_on_surface_2/include/CGAL/Arr_dcel_base.h index e492cdc7e462..3cd12856a5f5 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_dcel_base.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_dcel_base.h @@ -36,7 +36,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { inline void* _clean_pointer (const void* p) { @@ -1656,6 +1656,6 @@ class Arr_dcel_base } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_default_dcel.h b/Arrangement_on_surface_2/include/CGAL/Arr_default_dcel.h index f0d7cfe7a3cc..394c78605b80 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_default_dcel.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_default_dcel.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * The default arrangement DCEL class. @@ -60,6 +60,6 @@ class Arr_default_dcel : {} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_default_overlay_traits.h b/Arrangement_on_surface_2/include/CGAL/Arr_default_overlay_traits.h index 51c3cab34941..56df7f2d817a 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_default_overlay_traits.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_default_overlay_traits.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * \class @@ -92,6 +92,6 @@ class Arr_face_overlay_traits : }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_enums.h b/Arrangement_on_surface_2/include/CGAL/Arr_enums.h index 93058df65781..02f9f0d88770 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_enums.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_enums.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \enum * Selection of a curve end. @@ -203,6 +203,6 @@ InputStream& operator>>( } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_extended_dcel.h b/Arrangement_on_surface_2/include/CGAL/Arr_extended_dcel.h index 436370c7d654..516ab738b8ef 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_extended_dcel.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_extended_dcel.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * \class @@ -278,6 +278,6 @@ class Arr_extended_dcel : {} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_face_map.h b/Arrangement_on_surface_2/include/CGAL/Arr_face_map.h index 1dcc0a6fb68a..32b407465196 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_face_map.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_face_map.h @@ -32,7 +32,7 @@ #endif #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * An auxiliary class that automatically maintains a mapping of the @@ -374,6 +374,6 @@ void put (CGAL::Arr_face_property_map& prop_map, return; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geodesic_arc_on_sphere_partition_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_geodesic_arc_on_sphere_partition_traits_2.h index 25ad4394bc35..c2c8abefc16c 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geodesic_arc_on_sphere_partition_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geodesic_arc_on_sphere_partition_traits_2.h @@ -40,7 +40,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template -CGAL_BEGIN_NAMESPACE +namespace CGAL { template #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define CGAL_X_MINUS_1_Y_0 0 #define CGAL_X_MINUS_8_Y_6 1 @@ -3118,6 +3118,6 @@ operator>>(InputStream & is, return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Arr_plane_3.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Arr_plane_3.h index 6b8abfc4d619..a55f3540c6d0 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Arr_plane_3.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Arr_plane_3.h @@ -33,7 +33,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! A plane that contains the origin extended with a few methods */ template @@ -274,6 +274,6 @@ inline std::ostream & operator<<(std::ostream & os, return os; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_bounding_rational_traits.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_bounding_rational_traits.h index aba47865666c..f56686933599 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_bounding_rational_traits.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_bounding_rational_traits.h @@ -33,7 +33,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \struct _Bez_point_bound * Representation of a bounding interval for a point on a Bezier curve. @@ -1509,6 +1509,6 @@ class Bezier_bounding_rational_traits } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_BEZIER_BOUNDING_RATIONAL_TRAITS_H diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_cache.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_cache.h index b724c2584d71..1d25b343d21b 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_cache.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_cache.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class _Bezier_cache * Stores all cached intersection points and vertical tangency points. @@ -865,6 +865,6 @@ _Bezier_cache::_compute_resultant return (det); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_curve_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_curve_2.h index 14547d5b5619..53917dd28e19 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_curve_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_curve_2.h @@ -34,7 +34,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class _Bezier_curve_2 * Representation of a Bezier curve, specified by (n+1) control points @@ -952,6 +952,6 @@ bool _Bezier_curve_2::has_same_support return (true); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_point_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_point_2.h index a549245f25c4..5579c5d2cc30 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_point_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_point_2.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class _Bezier_point_2 * Representation of a point on a Bezier curve. The point has algebraic @@ -1679,6 +1679,6 @@ void _Bezier_point_2_rep::_make_exact CGAL_error(); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_x_monotone_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_x_monotone_2.h index 6fc58d02d501..479a2f68c464 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_x_monotone_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_x_monotone_2.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * Representation of an x-monotone Bezier subcurve, specified by a Bezier curve @@ -2671,6 +2671,6 @@ _Bezier_x_monotone_2::_exact_vertical_position return (EQUAL); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Circle_segment_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Circle_segment_2.h index dca4cb57b0e4..2be0832a53a0 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Circle_segment_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Circle_segment_2.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Forward declaration: template class _One_root_point_2; @@ -2458,6 +2458,6 @@ operator<< (std::ostream& os, return (os); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Conic_arc_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Conic_arc_2.h index eeba64174194..fa9dceadfd52 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Conic_arc_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Conic_arc_2.h @@ -30,7 +30,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! @@ -1864,6 +1864,6 @@ operator<< (std::ostream& os, return (os); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Conic_intersections_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Conic_intersections_2.h index a8f92d99cb89..3bd51349a0b5 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Conic_intersections_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Conic_intersections_2.h @@ -24,7 +24,7 @@ * Implementation of functions related to the intersection of conics curves. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * Compute the roots of the resultants of the two bivariate polynomials: @@ -229,6 +229,6 @@ int _compute_resultant_roots (Nt_traits& nt_traits, return (xs_end - xs); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Conic_point_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Conic_point_2.h index 71f9bc6ff9c2..80378429325a 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Conic_point_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Conic_point_2.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * \class A class that stores additional information with the point's @@ -164,6 +164,6 @@ class _Conic_point_2 : public Alg_kernel_::Point_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Conic_x_monotone_arc_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Conic_x_monotone_arc_2.h index 1ce8110738bf..4740e69032cd 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Conic_x_monotone_arc_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Conic_x_monotone_arc_2.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * Representation of an x-monotone conic arc. @@ -2130,6 +2130,6 @@ std::ostream& operator<< (std::ostream& os, return (os); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Consolidated_curve_data_aux.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Consolidated_curve_data_aux.h index 9ce4b9918979..70e3155b87c8 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Consolidated_curve_data_aux.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Consolidated_curve_data_aux.h @@ -25,7 +25,7 @@ * Arr_consolidated_curve_data_traits_2 class. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * Representation of a set of data objects (without duplicates), using a @@ -195,6 +195,6 @@ struct _Consolidate_unique_lists } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Curve_data_aux.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Curve_data_aux.h index 30441ebd98da..49fe320f2a3e 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Curve_data_aux.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Curve_data_aux.h @@ -25,7 +25,7 @@ * Definition of auxiliary classes for the Arr_curve_data_traits_2<> template. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * \struct A simple merge functor. @@ -113,6 +113,6 @@ class _Curve_data_ex : public BaseCurveType } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Hyperbolic_arc_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Hyperbolic_arc_2.h index 702ef72af2e7..9c9afa1a8cd5 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Hyperbolic_arc_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Hyperbolic_arc_2.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * Representation of an x-monotone hyprbolic arc, defined by: @@ -404,6 +404,6 @@ operator<< (std::ostream& os, return (os); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/One_root_number.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/One_root_number.h index 57cc04702f2b..4cea30d8b753 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/One_root_number.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/One_root_number.h @@ -26,7 +26,7 @@ */ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * Representation of a one-root number - that is, a number of the form @@ -527,6 +527,6 @@ CGAL::Comparison_result compare (const _One_root_number& x, return (EQUAL); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Polycurve_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Polycurve_2.h index 7daa520c2e16..e869c93eae66 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Polycurve_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Polycurve_2.h @@ -32,7 +32,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class @@ -262,6 +262,6 @@ std::istream & operator>> (std::istream & is, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Polyline_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Polyline_2.h index 768220c867de..ac4b19d6f6d0 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Polyline_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Polyline_2.h @@ -33,7 +33,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class @@ -468,6 +468,6 @@ std::istream& operator>> (std::istream& is, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Rational_arc_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Rational_arc_2.h index 902b87143994..26eb4955f8c3 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Rational_arc_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Rational_arc_2.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class _Base_rational_arc_2 * Representation of an segment of a rational function, given as: @@ -2520,6 +2520,6 @@ class _Rational_arc_2 : public _Base_rational_arc_2 } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Segment_assertions.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Segment_assertions.h index d32afc43af01..934e42261574 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Segment_assertions.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Segment_assertions.h @@ -20,7 +20,7 @@ #ifndef CGAL_SEGMENT_ASSERTIONS_H #define CGAL_SEGMENT_ASSERTIONS_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Segment_assertions @@ -65,6 +65,6 @@ class Segment_assertions } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/de_Casteljau_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/de_Casteljau_2.h index d50a5b67e64a..8ce37d824581 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/de_Casteljau_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/de_Casteljau_2.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * Bisect the control polygon of a given Bezier curves into the left and @@ -220,6 +220,6 @@ de_Casteljau_2 return (vec[0]); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_great_circular_arc_on_cylinder_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_great_circular_arc_on_cylinder_traits_2.h index d1ff40252114..0dd277cae193 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_great_circular_arc_on_cylinder_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_great_circular_arc_on_cylinder_traits_2.h @@ -34,7 +34,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Arr_x_monotone_great_circular_arc_on_cylinder_3; template class Arr_great_circular_arc_on_cylinder_3; @@ -3056,6 +3056,6 @@ operator>>(InputStream & is, return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_hyperbolic_arc_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_hyperbolic_arc_traits_2.h index d6b853824bda..4ba3859b5e6e 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_hyperbolic_arc_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_hyperbolic_arc_traits_2.h @@ -30,7 +30,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A traits class for maintaining an arrangement of circles. @@ -409,6 +409,6 @@ class Arr_hyperbolic_arc_traits_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_landmarks_point_location.h b/Arrangement_on_surface_2/include/CGAL/Arr_landmarks_point_location.h index 5ef711725f62..760972ddab21 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_landmarks_point_location.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_landmarks_point_location.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arr_landmarks_point_location * A class that answers point-location queries on an arrangement using the @@ -318,7 +318,7 @@ class Arr_landmarks_point_location bool& cv_is_contained_in_seg) const; }; -CGAL_END_NAMESPACE +} //namespace CGAL // The member-function definitions can be found under: #include diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_linear_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_linear_traits_2.h index b33f97db0a71..2fcc97318695 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_linear_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_linear_traits_2.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Arr_linear_object_2; @@ -1806,6 +1806,6 @@ InputStream& operator>> (InputStream& is, Arr_linear_object_2& lobj) return (is); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_naive_point_location.h b/Arrangement_on_surface_2/include/CGAL/Arr_naive_point_location.h index f3ee6921b9cf..e3cecce5a1ea 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_naive_point_location.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_naive_point_location.h @@ -26,7 +26,7 @@ * Definition of the Arr_naive_point_location template. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A class that answers point-location and vertical ray-shooting queries @@ -105,7 +105,7 @@ class Arr_naive_point_location }; -CGAL_END_NAMESPACE +} //namespace CGAL // The member-function definitions can be found under: #include diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_non_caching_segment_basic_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_non_caching_segment_basic_traits_2.h index be7635891a38..73de33279f0c 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_non_caching_segment_basic_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_non_caching_segment_basic_traits_2.h @@ -39,7 +39,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A model of the ArrangementBasicTraits_2 concept that handles x-monotone @@ -282,6 +282,6 @@ class Arr_non_caching_segment_basic_traits_2 : public T_Kernel //@} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_non_caching_segment_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_non_caching_segment_traits_2.h index 500c8ad3950e..dbd683b9eb9a 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_non_caching_segment_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_non_caching_segment_traits_2.h @@ -35,7 +35,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A model of the ArrangementTraits_2 concept that handles general @@ -407,6 +407,6 @@ class Arr_non_caching_segment_traits_2 : //@} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_observer.h b/Arrangement_on_surface_2/include/CGAL/Arr_observer.h index 39777c04f59c..5e4659722058 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_observer.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_observer.h @@ -26,7 +26,7 @@ * Definition of the Arr_observer base class. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A base class for arrangement observers. @@ -671,6 +671,6 @@ class Arr_observer }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_overlay_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_overlay_2.h index 9fd6dbc27569..01d93c68b609 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_overlay_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_overlay_2.h @@ -37,7 +37,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * Compute the overlay of two input arrangements. @@ -220,6 +220,6 @@ void overlay (const Arrangement_on_surface_2& arr1, overlay (arr1, arr2, arr_res, ovl_traits); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_batched_point_location_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_batched_point_location_traits_2.h index d411ea839aaf..60c171af5f92 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_batched_point_location_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_batched_point_location_traits_2.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A traits-class decorator for the use of the batched point-location process. @@ -777,6 +777,6 @@ class Arr_batched_point_location_traits_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_landmarks_pl_impl.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_landmarks_pl_impl.h index 17ece53fde1e..704d556c7134 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_landmarks_pl_impl.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_landmarks_pl_impl.h @@ -26,7 +26,7 @@ * Arr_landmarks_point_location class. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------------- // Locate the arrangement feature containing the given point. @@ -1087,6 +1087,6 @@ _have_odd_intersections (const X_monotone_curve_2& cv, return (left_res != right_res); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_generator_base.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_generator_base.h index 436c591e503d..b98aaba2c9d7 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_generator_base.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_generator_base.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arr_landmarks_generator_base * A pure virtual class that handles the changes in a the arrangement in a generic @@ -414,6 +414,6 @@ class Arr_landmarks_generator_base } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_grid_generator.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_grid_generator.h index c2f60bdebadd..2c796e031e5f 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_grid_generator.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_grid_generator.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arr_grid_landmarks_generator * A generator for the landmarks point-locatoion class, which uses a @@ -301,6 +301,6 @@ class Arr_grid_landmarks_generator : }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_halton_generator.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_halton_generator.h index 1bd8ff9fdef3..1c1f539379bf 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_halton_generator.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_halton_generator.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A generator for the landmarks point-locatoion class, which uses a @@ -181,6 +181,6 @@ class Arr_halton_landmarks_generator : }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_middle_edges_generator.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_middle_edges_generator.h index 95ab706871ad..06e5bdbb9923 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_middle_edges_generator.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_middle_edges_generator.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * This class is related to the Landmarks point location, and given as @@ -145,6 +145,6 @@ class Arr_middle_edges_landmarks_generator } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_nearest_neighbor.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_nearest_neighbor.h index 8c34a4e89cef..79c45c736181 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_nearest_neighbor.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_nearest_neighbor.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A class that answers nearest neighbor queries. @@ -240,6 +240,6 @@ class Arr_landmarks_nearest_neighbor } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_random_generator.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_random_generator.h index f13301d9f58f..cd868c6a9488 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_random_generator.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_random_generator.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arr_random_landmarks_generator * A generator for the landmarks point-locatoion class, which uses a @@ -144,7 +144,7 @@ class Arr_random_landmarks_generator : }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_specified_points_generator.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_specified_points_generator.h index bb094e5f79ab..ce23abc7ca07 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_specified_points_generator.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_specified_points_generator.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arr_landmarks_specified_points_generator * A generator for the landmarks point-locatoion class, which uses @@ -176,6 +176,6 @@ class Arr_landmarks_specified_points_generator : }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_vertices_generator.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_vertices_generator.h index e6d44f2feea8..5701783b6e3e 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_vertices_generator.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_vertices_generator.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arr_landmarks_vertices_generator * A generator for the landmarks point-locatoion class, which uses the @@ -161,6 +161,6 @@ class Arr_landmarks_vertices_generator : }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_naive_point_location_impl.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_naive_point_location_impl.h index 4962f73de8a3..a1d2eff2f073 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_naive_point_location_impl.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_naive_point_location_impl.h @@ -25,7 +25,7 @@ * class. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------------- // Locate the arrangement feature containing the given point. @@ -112,6 +112,6 @@ Object Arr_naive_point_location::locate (const Point_2& p) const return (CGAL::make_object (f_inner)); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_simple_point_location_impl.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_simple_point_location_impl.h index cf82075d6d98..ce09edc29117 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_simple_point_location_impl.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_simple_point_location_impl.h @@ -25,7 +25,7 @@ * class. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------------- // Locate the arrangement feature containing the given point. @@ -506,6 +506,6 @@ Arr_simple_point_location::_first_around_vertex return (top_right->twin()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_trapezoid_ric_pl_impl.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_trapezoid_ric_pl_impl.h index 3b30881bdc79..17ed77415bda 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_trapezoid_ric_pl_impl.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_trapezoid_ric_pl_impl.h @@ -32,7 +32,7 @@ #define CGAL_TRAP_PRINT_DEBUG(expr) #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------------- // Locate the arrangement feature containing the given point. @@ -289,6 +289,6 @@ _check_isolated_for_vertical_ray_shoot (Halfedge_const_handle halfedge_found, -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_triangulation_pl_functions.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_triangulation_pl_functions.h index 31837012842e..efebcd8f193d 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_triangulation_pl_functions.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_triangulation_pl_functions.h @@ -32,7 +32,7 @@ #define CGAL_TRG_PRINT_DEBUG(expr) #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------------- // Locate the arrangement feature containing the given point. @@ -293,6 +293,6 @@ ::build_triangulation () } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_triangulation_pl_impl.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_triangulation_pl_impl.h index 94e3b06c68b5..059e24dd7a49 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_triangulation_pl_impl.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_triangulation_pl_impl.h @@ -32,7 +32,7 @@ #define CGAL_TRG_PRINT_DEBUG(expr) #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------------- // Locate the arrangement feature containing the given point. @@ -293,6 +293,6 @@ ::build_triangulation () } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_walk_along_line_pl_impl.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_walk_along_line_pl_impl.h index fdc7cb1ee2e7..b5875ea95c25 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_walk_along_line_pl_impl.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_walk_along_line_pl_impl.h @@ -27,7 +27,7 @@ * Arr_walk_along_line_point_location class. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------------- // Locate the arrangement feature containing the given point. @@ -928,6 +928,6 @@ _first_around_vertex (Vertex_const_handle v, bool shoot_up) const } } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_X_trapezoid.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_X_trapezoid.h index ef622cc81a8f..da3c8228274b 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_X_trapezoid.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_X_trapezoid.h @@ -32,7 +32,7 @@ #define CGAL_TD_INLINE inline #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * Implementation of a pseudo-trapezoid as two curves(top,bottom) @@ -697,6 +697,6 @@ class Td_X_trapezoid : public Handle }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_dag.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_dag.h index c690167c2a6b..d06cdd9f4860 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_dag.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_dag.h @@ -33,7 +33,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Td_dag_base : public Handle @@ -436,7 +436,7 @@ template std::ostream& operator<<(std::ostream& out, return out ; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_ninetuple.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_ninetuple.h index 45420d321b45..ca5679e7bad0 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_ninetuple.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_ninetuple.h @@ -20,7 +20,7 @@ #ifndef CGAL_TD_NINETUPLE_H #define CGAL_TD_NINETUPLE_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -52,6 +52,6 @@ class Td_ninetuple : public Rep {} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_predicates.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_predicates.h index 01f9b961f3ba..c1bea74efdba 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_predicates.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_predicates.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Td_traits> class Trapezoidal_decomposition_2; @@ -73,6 +73,6 @@ struct Trapezoid_handle_less : public std::binary_function<_Tp, _Tp, bool> }; /* Return if two trapezoids are the same */ -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_TD_PREDICATES_H diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_traits.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_traits.h index 1aa46288dc9d..b91c7d020edd 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_traits.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_traits.h @@ -21,7 +21,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Td_traits : public Pm_traits_ { @@ -191,7 +191,7 @@ template class Td_traits : public Pm_traits_ static X_curve * CURVE_AT_INFINITY; }; -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_traits_functions.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_traits_functions.h index 59f5fbccee73..de0e522cf2c3 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_traits_functions.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_traits_functions.h @@ -20,7 +20,7 @@ #include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { template const typename Td_traits::Point& @@ -76,4 +76,4 @@ template typename Td_traits::X_curve * Td_traits::CURVE_AT_INFINITY = 0; -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Trapezoidal_decomposition_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Trapezoidal_decomposition_2.h index f99f9c1427e9..d739f64629ce 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Trapezoidal_decomposition_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Trapezoidal_decomposition_2.h @@ -34,7 +34,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define CGAL_POINT_IS_LEFT_LOW(p,q) \ (traits->compare_xy_2_object()((p),(q)) == SMALLER) @@ -3450,7 +3450,7 @@ class Trapezoidal_decomposition_2 double depth_threshold,size_threshold; }; -CGAL_END_NAMESPACE +} //namespace CGAL #ifndef CGAL_TD_X_TRAPEZOID_H #include diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Trapezoidal_decomposition_2_iostream.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Trapezoidal_decomposition_2_iostream.h index a19620559d47..c95fc04702b1 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Trapezoidal_decomposition_2_iostream.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Trapezoidal_decomposition_2_iostream.h @@ -23,7 +23,7 @@ #include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Traits> std::ostream& operator<<( @@ -270,6 +270,6 @@ std::ostream& operator<<(std::ostream &out,const Td_X_trapezoid& t) return out; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_TRAPEZOIDAL_DECOMPOSITION_2_IOSTREAM_H diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_polycurve_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_polycurve_traits_2.h index d56e2a1775d5..d3a5cc07b208 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_polycurve_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_polycurve_traits_2.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Arr_polyline_traits_2 { @@ -1114,6 +1114,6 @@ class Arr_polyline_traits_2 { }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_polyline_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_polyline_traits_2.h index d56e2a1775d5..d3a5cc07b208 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_polyline_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_polyline_traits_2.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Arr_polyline_traits_2 { @@ -1114,6 +1114,6 @@ class Arr_polyline_traits_2 { }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_rational_arc_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_rational_arc_traits_2.h index 25c65d66227b..ea618292c84c 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_rational_arc_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_rational_arc_traits_2.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A traits class for maintaining an arrangement of bounded arcs (segments) of @@ -756,6 +756,6 @@ class Arr_rational_arc_traits_2 //@} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_segment_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_segment_traits_2.h index ecb08e50303e..b057f89d64f0 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_segment_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_segment_traits_2.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Arr_segment_2; @@ -1167,6 +1167,6 @@ InputStream& operator>> (InputStream& is, Arr_segment_2& seg) return (is); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_simple_point_location.h b/Arrangement_on_surface_2/include/CGAL/Arr_simple_point_location.h index c9c235ce233c..560f82d8d05e 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_simple_point_location.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_simple_point_location.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A class that answers point-location and vertical ray-shooting queries @@ -164,7 +164,7 @@ class Arr_simple_point_location }; -CGAL_END_NAMESPACE +} //namespace CGAL // The member-function definitions can be found under: #include diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_on_sphere_transformation.h b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_on_sphere_transformation.h index a700170857f5..290e1a41df8b 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_on_sphere_transformation.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_on_sphere_transformation.h @@ -19,7 +19,7 @@ #ifndef CGAL_ARR_ON_SPHERE_TRANSFORMATION_H #define CGAL_ARR_ON_SPHERE_TRANSFORMATION_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { /* This function rotates the face when the arrangement is sgm */ @@ -32,6 +32,6 @@ class Arr_on_sphere_transformation } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif \ No newline at end of file diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm.h b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm.h index 92f86d6d4a4f..1b44ccab33fa 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm.h @@ -50,7 +50,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! */ @@ -817,6 +817,6 @@ class Arr_polyhedral_sgm : } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_arr_dcel.h b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_arr_dcel.h index 113f04e5aefd..8dcffde2032a 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_arr_dcel.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_arr_dcel.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! Extend the arrangement vertex */ template @@ -116,6 +116,6 @@ class Arr_polyhedral_sgm_arr_dcel : Arr_polyhedral_sgm_arr_dcel() {} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_initializer_visitor.h b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_initializer_visitor.h index a980ea0c91e9..78b41b5d54ba 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_initializer_visitor.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_initializer_visitor.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Arr_polyhedral_sgm_initializer_visitor { @@ -65,6 +65,6 @@ class Arr_polyhedral_sgm_initializer_visitor { {} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_overlay.h b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_overlay.h index 632a72145c79..0ee3f443826f 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_overlay.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_overlay.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Arr_polyhedral_sgm_overlay { @@ -190,6 +190,6 @@ class Arr_polyhedral_sgm_overlay { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_polyhedron_3.h b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_polyhedron_3.h index 0d11f13aaba5..39b1a64505a9 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_polyhedron_3.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_polyhedron_3.h @@ -48,7 +48,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! The extended Polyhedron vertex type */ template @@ -212,6 +212,6 @@ struct Arr_polyhedral_sgm_polyhedron_3 : Arr_polyhedral_sgm_polyhedron_3() {} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_traits.h b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_traits.h index 2f33470d78fd..8922a49a6a20 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_traits.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_traits.h @@ -29,7 +29,7 @@ #include "CGAL/Arr_counting_traits_2.h" #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \file * A traits class-template for constructing and maintaining Gaussian maps @@ -76,6 +76,6 @@ class Arr_polyhedral_sgm_traits : public: }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_transformation.h b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_transformation.h index d4cf9fb73395..aae0d5faa724 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_transformation.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_transformation.h @@ -20,7 +20,7 @@ #ifndef CGAL_ARR_POLYHEDRAL_SGM_TRANSFORMATION_H #define CGAL_ARR_POLYHEDRAL_SGM_TRANSFORMATION_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { /* This function rotates the face when the arrangement is Arr_polyhedral_sgm */ @@ -38,6 +38,6 @@ class Arr_polyhedral_sgm_transformation } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_spherical_gaussian_map_3.h b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_spherical_gaussian_map_3.h index 77912d6ada9a..7ed9c5efaf2e 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_spherical_gaussian_map_3.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_spherical_gaussian_map_3.h @@ -48,7 +48,7 @@ #endif #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { // #define CGAL_ARR_SPHERICAL_GAUSSIAN_MAP_3_DEBUG 1 @@ -408,6 +408,6 @@ class Arr_spherical_gaussian_map_3 : friend class CGAL::Arr_sgm_initializer; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_transform_on_sphere.h b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_transform_on_sphere.h index b0343552d7a7..94a7cee31269 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_transform_on_sphere.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_transform_on_sphere.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Arrangement, class Transformation_3, class TransformTraits> void Arr_transform_on_sphere(Arrangement & arr, @@ -223,4 +223,4 @@ void Arr_transform_on_sphere(Arrangement & arr, tran_tr.rotate_face(f1, aff); } -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h index 665ff78bd5fb..699eb6f937b8 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h @@ -53,7 +53,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Forward declaration: template @@ -786,7 +786,7 @@ class Arr_spherical_topology_traits_2 { //@} }; -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_tags.h b/Arrangement_on_surface_2/include/CGAL/Arr_tags.h index e4d49c9573a8..b29f72bf51f8 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_tags.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_tags.h @@ -34,7 +34,7 @@ * Definition of the tags for the arrangement package. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { struct Arr_boundary_side_tag {}; struct Arr_oblivious_side_tag : public virtual Arr_boundary_side_tag {}; @@ -431,6 +431,6 @@ struct Arr_sane_identified_tagging { }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_batched_pl_helper.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_batched_pl_helper.h index d6aa62501e12..8a5b7273535c 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_batched_pl_helper.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_batched_pl_helper.h @@ -25,7 +25,7 @@ * Definition of the Arr_bounded_planar_batched_pl_helper class-template. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { #include @@ -93,6 +93,6 @@ class Arr_bounded_planar_batched_pl_helper } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_construction_helper.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_construction_helper.h index 90485c5b9275..e3a1098fddce 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_construction_helper.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_construction_helper.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arr_bounded_planar_construction_helper * A helper class for the construction sweep-line visitor, suitable @@ -143,6 +143,6 @@ class Arr_bounded_planar_construction_helper } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_insertion_helper.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_insertion_helper.h index 633db059b039..146f6f3b8008 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_insertion_helper.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_insertion_helper.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arr_bounded_planar_insertion_helper * A helper class for the insertion sweep-line visitors, suitable @@ -79,6 +79,6 @@ class Arr_bounded_planar_insertion_helper : {} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_overlay_helper.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_overlay_helper.h index 58e8626713b7..ee3b711630f8 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_overlay_helper.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_overlay_helper.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arr_bounded_planar_overlay_helper * A helper class for the overlay sweep-line visitor, suitable for the overlay @@ -118,6 +118,6 @@ class Arr_bounded_planar_overlay_helper } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_topology_traits_2_impl.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_topology_traits_2_impl.h index a830c8dd6fda..2358b3f32ba9 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_topology_traits_2_impl.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_topology_traits_2_impl.h @@ -25,7 +25,7 @@ * Arr_bounded_planar_topology_traits_2 class. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------------- // Assign the contents of another topology-traits class. @@ -85,6 +85,6 @@ void Arr_bounded_planar_topology_traits_2::dcel_updated () return; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_vert_decomp_helper.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_vert_decomp_helper.h index 09f1ed07da4e..4d1988e09900 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_vert_decomp_helper.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_vert_decomp_helper.h @@ -24,7 +24,7 @@ * Definition of the Arr_bounded_planar_vert_decomp_helper class-template. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { #include @@ -101,6 +101,6 @@ class Arr_bounded_planar_vert_decomp_helper }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_inc_insertion_zone_visitor.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_inc_insertion_zone_visitor.h index 0a779e235545..5118e766313d 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_inc_insertion_zone_visitor.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_inc_insertion_zone_visitor.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A visitor class for Arrangement_zone_2, which performs incremental @@ -444,6 +444,6 @@ _split_edge (Halfedge_handle he, const Point_2& p, arr_access.split_edge_ex (he, p, sub_cv2, sub_cv1); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_planar_topology_traits_base_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_planar_topology_traits_base_2.h index ad4bc65acf17..d29b4734cebb 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_planar_topology_traits_base_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_planar_topology_traits_base_2.h @@ -43,7 +43,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arr_planar_topology_traits_base_2 * A base topology-traits class that encapsulates the embedding of 2D @@ -486,6 +486,6 @@ is_in_face(const Face *f, const Point_2& p, const Vertex *v) const return ((n_ray_intersections % 2) != 0); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_batched_pl_helper.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_batched_pl_helper.h index a5958a8b13c7..805e05131f8b 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_batched_pl_helper.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_batched_pl_helper.h @@ -26,7 +26,7 @@ * Definition of the Arr_spherical_batched_pl_helper class-template. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { #include @@ -91,6 +91,6 @@ class Arr_spherical_batched_pl_helper } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_construction_helper.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_construction_helper.h index 61da98804205..0d382f20700e 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_construction_helper.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_construction_helper.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arr_spherical_construction_helper * A helper class for the construction sweep-line visitor, suitable @@ -290,6 +290,6 @@ class Arr_spherical_construction_helper Face_handle top_face() const { return m_spherical_face; } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_insertion_helper.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_insertion_helper.h index 68719d8304f5..cf440e1dfbdb 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_insertion_helper.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_insertion_helper.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arr_spherical_insertion_helper * A helper class for the insertion sweep-line visitors, suitable @@ -154,6 +154,6 @@ void Arr_spherical_insertion_helper::before_handle_event return; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_overlay_helper.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_overlay_helper.h index 5877c0d46c08..c78f977fceac 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_overlay_helper.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_overlay_helper.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arr_spherical_overlay_helper * A helper class for the overlay sweep-line visitor, suitable for the overlay @@ -185,6 +185,6 @@ class Arr_spherical_overlay_helper } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_topology_traits_2_impl.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_topology_traits_2_impl.h index bae595454500..7689c3d9afd0 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_topology_traits_2_impl.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_topology_traits_2_impl.h @@ -25,7 +25,7 @@ * Arr_spherical_topology_traits_2 class. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \brief constructs default */ template @@ -931,6 +931,6 @@ is_on_new_perimetric_face_boundary(const Halfedge * prev1, return (counter == 1); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_vert_decomp_helper.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_vert_decomp_helper.h index 44c96b11ff8d..495da360de40 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_vert_decomp_helper.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_vert_decomp_helper.h @@ -25,7 +25,7 @@ * Definition of the Arr_spherical_vert_decomp_helper class-template. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { #include @@ -170,6 +170,6 @@ Arr_spherical_vert_decomp_helper::after_handle_event (Event *event) return; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_batched_pl_helper.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_batched_pl_helper.h index 7027e4aad567..49b55766a2ce 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_batched_pl_helper.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_batched_pl_helper.h @@ -26,7 +26,7 @@ * Definition of the Arr_unb_planar_batched_pl_helper class-template. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { #include @@ -144,6 +144,6 @@ after_handle_event (Event* event) return; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_construction_helper.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_construction_helper.h index 1d5bec5798ad..180392a302e9 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_construction_helper.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_construction_helper.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arr_unb_planar_construction_helper * A helper class for the construction sweep-line visitor, suitable @@ -331,6 +331,6 @@ before_handle_event (Event* event) return; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_insertion_helper.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_insertion_helper.h index d452c7ab386a..4f2ff28120ed 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_insertion_helper.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_insertion_helper.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arr_unb_planar_insertion_helper * A helper class for the insertion sweep-line visitors, suitable @@ -224,6 +224,6 @@ before_handle_event (Event* event) } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_overlay_helper.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_overlay_helper.h index 5478827f80cf..e994cfbd82e4 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_overlay_helper.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_overlay_helper.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arr_unb_planar_overlay_helper * A helper class for the overlay sweep-line visitor, suitable for the overlay @@ -214,6 +214,6 @@ before_handle_event (Event* e) return; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_topology_traits_2_impl.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_topology_traits_2_impl.h index b24d3a17b969..74461ea091d4 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_topology_traits_2_impl.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_topology_traits_2_impl.h @@ -26,7 +26,7 @@ * Arr_unb_planar_topology_traits_2 class. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------------- // Default constructor. @@ -918,6 +918,6 @@ _is_on_fictitious_edge (const X_monotone_curve_2& cv, Arr_curve_end ind, return (res1 != res2); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_vert_decomp_helper.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_vert_decomp_helper.h index 2686eab6adde..1718ca6ea920 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_vert_decomp_helper.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_vert_decomp_helper.h @@ -25,7 +25,7 @@ * Definition of the Arr_unb_planar_vert_decomp_helper class-template. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { #include @@ -184,6 +184,6 @@ after_handle_event (Event* event) return; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Sign_of_path.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Sign_of_path.h index 905f827d7856..dd9f4a50eca4 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Sign_of_path.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Sign_of_path.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -335,7 +335,7 @@ class Sign_of_path { } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ARR_TOPOLOGY_TRAITS_SIGN_OF_PATH_H // EOF diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h index d18b25cb8eb5..354e96d8b4af 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A model of the ArrangementTraits_2 concept that counts the methods invoked. @@ -1132,6 +1132,6 @@ OutputStream & operator<<(OutputStream & os, Comparison_result cr) return os; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_trapezoid_ric_point_location.h b/Arrangement_on_surface_2/include/CGAL/Arr_trapezoid_ric_point_location.h index a0e1213e8b78..ac054c069778 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_trapezoid_ric_point_location.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_trapezoid_ric_point_location.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * \class @@ -381,7 +381,7 @@ class Arr_trapezoid_ric_point_location : public Arr_observer const Point_2& p, bool shoot_up) const; }; -CGAL_END_NAMESPACE +} //namespace CGAL // The member-function definitions can be found under: #include diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_triangulation_point_location.h b/Arrangement_on_surface_2/include/CGAL/Arr_triangulation_point_location.h index bfe8278688a9..694971b4f6c5 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_triangulation_point_location.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_triangulation_point_location.h @@ -33,7 +33,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A class that answers point-location and queries @@ -342,7 +342,7 @@ class Arr_triangulation_point_location : public Arr_observer void build_triangulation(); }; -CGAL_END_NAMESPACE +} //namespace CGAL // The member-function definitions can be found under: #include diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_unb_planar_topology_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_unb_planar_topology_traits_2.h index 71b85845b275..9e6fee34189e 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_unb_planar_topology_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_unb_planar_topology_traits_2.h @@ -34,7 +34,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Forward declaration: template @@ -710,7 +710,7 @@ class Arr_unb_planar_topology_traits_2 : //@} }; -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_vertex_map.h b/Arrangement_on_surface_2/include/CGAL/Arr_vertex_map.h index c461d8e0558b..d80cf5ead93d 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_vertex_map.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_vertex_map.h @@ -34,7 +34,7 @@ #endif #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * An auxiliary class that automatically maintains a mapping of the @@ -379,6 +379,6 @@ void put (CGAL::Arr_vertex_property_map& prop_map, prop_map[v] = t; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_vertical_decomposition_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_vertical_decomposition_2.h index 8fd7b24d3a13..192887fde5ad 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_vertical_decomposition_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_vertical_decomposition_2.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * Perform a vertical decomposition of an arrangement, by performing a @@ -142,6 +142,6 @@ decompose(const Arrangement_on_surface_2& arr, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_walk_along_line_point_location.h b/Arrangement_on_surface_2/include/CGAL/Arr_walk_along_line_point_location.h index 71dc0c1b6f1a..13aeb4f7d9ad 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_walk_along_line_point_location.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_walk_along_line_point_location.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A class that answers point-location and vertical ray-shooting queries @@ -193,7 +193,7 @@ class Arr_walk_along_line_point_location bool shoot_up) const; }; -CGAL_END_NAMESPACE +} //namespace CGAL // The member-function definitions can be found under: #include diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2.h index 9c6e25b4799b..cf032ce464b5 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arrangement_2 * The arrangement class, representing planar subdivisions induced by @@ -253,6 +253,6 @@ class Arrangement_2 : }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_compute_zone_visitor.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_compute_zone_visitor.h index bbd28f8324b1..01262d3e8140 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_compute_zone_visitor.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_compute_zone_visitor.h @@ -24,7 +24,7 @@ * Definition of the Arr_compute_zone_visitor class. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A visitor class for Arrangement_zone_2, which outputs the @@ -188,6 +188,6 @@ class Arr_compute_zone_visitor }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_default_planar_topology.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_default_planar_topology.h index aad30fe69497..b5d19673ca99 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_default_planar_topology.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_default_planar_topology.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -71,6 +71,6 @@ struct Default_planar_topology : > {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_do_intersect_zone_visitor.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_do_intersect_zone_visitor.h index 065e3e42344d..aa81be82f649 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_do_intersect_zone_visitor.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_do_intersect_zone_visitor.h @@ -24,7 +24,7 @@ * Definition of the Arr_do_intersect_zone_visitor_2 class. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A visitor class for Arrangement_zone_2, which check whether @@ -131,6 +131,6 @@ class Arr_do_intersect_zone_visitor } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_on_surface_with_history_2_impl.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_on_surface_with_history_2_impl.h index 618615f6edf5..056a1baa15c3 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_on_surface_with_history_2_impl.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_on_surface_with_history_2_impl.h @@ -27,7 +27,7 @@ * class. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------------- // Default constructor. @@ -300,6 +300,6 @@ _unregister_observer(Arr_observer *p_obs) (reinterpret_cast*>(p_obs))); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_traits_adaptor_2.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_traits_adaptor_2.h index 35e577cbe9a8..ae39d4d12d30 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_traits_adaptor_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_traits_adaptor_2.h @@ -37,7 +37,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A traits-class adaptor that extends the basic traits-class interface. @@ -2021,6 +2021,6 @@ class Arr_traits_adaptor_2 : //@} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_traits_adaptor_2_dispatching.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_traits_adaptor_2_dispatching.h index eb08ea2b6432..47b4755fbfc2 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_traits_adaptor_2_dispatching.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_traits_adaptor_2_dispatching.h @@ -34,7 +34,7 @@ * Definition of the dispatching tags and classes for the traits adaptor */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { //! tag to specify to use a dummy implementation struct Arr_use_dummy_tag {}; @@ -773,6 +773,6 @@ struct Arr_bottom_top_implementation_dispatch { } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ARR_TRAITS_ADAPTOR_2_DISPATCHING_H diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_with_history_accessor.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_with_history_accessor.h index 705b5cd7a161..5a3f19a3c30d 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_with_history_accessor.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_with_history_accessor.h @@ -24,7 +24,7 @@ * Definition of the Arr_with_history_accessor class. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A class that provides access to some of the internal methods of the @@ -153,6 +153,6 @@ class Arr_with_history_accessor } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_2_iterators.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_2_iterators.h index 832e2435627b..0c4df3b78310 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_2_iterators.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_2_iterators.h @@ -24,7 +24,7 @@ * Definitions of auxiliary iterator adaptors. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * \class @@ -542,6 +542,6 @@ class I_Filtered_const_iterator } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h index 809858db55f3..e6c9cdb5a1c9 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h @@ -44,7 +44,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------------- // Insert a curve into the arrangement (incremental insertion). @@ -1596,6 +1596,6 @@ bool do_intersect (Arrangement_on_surface_2& arr, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_impl.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_impl.h index 91ee192241c3..95d1e32be35f 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_impl.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_impl.h @@ -43,7 +43,7 @@ #include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------------- // Default constructor. @@ -5168,6 +5168,6 @@ _are_curves_ordered_cw_around_vertrex (Vertex_const_handle v) const return (true); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_zone_2_impl.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_zone_2_impl.h index 0becd4c6095b..2d146fdcaddb 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_zone_2_impl.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_zone_2_impl.h @@ -26,7 +26,7 @@ * Member-function definitions for the Arrangement_zone_2 class. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------------- // Initialize the zone-computation process with a given curve and an object @@ -1533,6 +1533,6 @@ bool Arrangement_zone_2::_zone_in_overlap () return (false); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Open_hash.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Open_hash.h index 2bbefa2ed514..fe121d521c16 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Open_hash.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Open_hash.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A default equality functor. @@ -798,6 +798,6 @@ class Hash_map }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_on_surface_2.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_on_surface_2.h index c2d10cf44fdb..cd04954809b8 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_on_surface_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_on_surface_2.h @@ -48,7 +48,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arrangement_on_surface_2 * The arrangement class, representing 2-dimensional subdivisions induced on @@ -3061,7 +3061,7 @@ bool do_intersect (Arrangement_on_surface_2& arr, const Curve& c); -CGAL_END_NAMESPACE +} //namespace CGAL // The function definitions can be found under: #include diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_on_surface_with_history_2.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_on_surface_with_history_2.h index 800a8c4a4624..b3a37b32e0a8 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_on_surface_with_history_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_on_surface_with_history_2.h @@ -35,7 +35,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A class representing planar subdivisions induced by a set of arbitrary @@ -983,7 +983,7 @@ overlay (const Arrangement_on_surface_with_history_2& res._overlay (arr1, arr2, ovl_traits); } -CGAL_END_NAMESPACE +} //namespace CGAL // The function definitions can be found under: #include diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_with_history_2.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_with_history_2.h index 6cb824eee7c6..645f4dbcabf1 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_with_history_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_with_history_2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arrangement_on_history_2 * The arrangement with history class, representing planar subdivisions @@ -270,6 +270,6 @@ class Arrangement_with_history_2 : }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_zone_2.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_zone_2.h index 757eaa3d1082..caafc4c71034 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_zone_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_zone_2.h @@ -34,7 +34,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A class for computing the zone of a given $x$-monotone curve in a given @@ -431,7 +431,7 @@ class Arrangement_zone_2 bool _zone_in_overlap (); }; -CGAL_END_NAMESPACE +} //namespace CGAL // The function definitions can be found under: #include diff --git a/Arrangement_on_surface_2/include/CGAL/Basic_sweep_line_2.h b/Arrangement_on_surface_2/include/CGAL/Basic_sweep_line_2.h index f658260b2faf..57c257974b3e 100644 --- a/Arrangement_on_surface_2/include/CGAL/Basic_sweep_line_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Basic_sweep_line_2.h @@ -68,7 +68,7 @@ -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Basic_Sweep_line_2 * A class that implements the sweep line algorithm for general x-monotone @@ -588,7 +588,7 @@ class Basic_sweep_line_2 #include #endif -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Arrangement_on_surface_2/include/CGAL/CORE_algebraic_number_traits.h b/Arrangement_on_surface_2/include/CGAL/CORE_algebraic_number_traits.h index e82e0db5cd1c..00a1a2d6a953 100644 --- a/Arrangement_on_surface_2/include/CGAL/CORE_algebraic_number_traits.h +++ b/Arrangement_on_surface_2/include/CGAL/CORE_algebraic_number_traits.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * \class A traits class for CORE's algebraic number types. @@ -614,6 +614,6 @@ class CORE_algebraic_number_traits } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/IO/Arr_iostream.h b/Arrangement_on_surface_2/include/CGAL/IO/Arr_iostream.h index 9ebff6d0b8d1..4f15c2312875 100644 --- a/Arrangement_on_surface_2/include/CGAL/IO/Arr_iostream.h +++ b/Arrangement_on_surface_2/include/CGAL/IO/Arr_iostream.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * Write an arrangement to an output stream using a given formatter. @@ -120,6 +120,6 @@ std::istream& return (is); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h b/Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h index e10a565f4a7a..7894f849fecf 100644 --- a/Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h +++ b/Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A class defining a textual (ASCII) input/output format for arrangements @@ -618,6 +618,6 @@ class Arr_extended_dcel_text_formatter : } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/IO/Arr_with_history_2_reader.h b/Arrangement_on_surface_2/include/CGAL/IO/Arr_with_history_2_reader.h index 36f6903676b6..1fc14f567f55 100644 --- a/Arrangement_on_surface_2/include/CGAL/IO/Arr_with_history_2_reader.h +++ b/Arrangement_on_surface_2/include/CGAL/IO/Arr_with_history_2_reader.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * An auxiliary class for reading an arrangement with history from an @@ -128,6 +128,6 @@ class Arr_with_history_2_reader : private Arrangement_2_reader }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/IO/Arr_with_history_2_writer.h b/Arrangement_on_surface_2/include/CGAL/IO/Arr_with_history_2_writer.h index 33fbb0eb9430..a45029e2c8fa 100644 --- a/Arrangement_on_surface_2/include/CGAL/IO/Arr_with_history_2_writer.h +++ b/Arrangement_on_surface_2/include/CGAL/IO/Arr_with_history_2_writer.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * An auxiliary class for writing an arrangement with history to an @@ -119,6 +119,6 @@ class Arr_with_history_2_writer : private Arrangement_2_writer }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/IO/Arr_with_history_iostream.h b/Arrangement_on_surface_2/include/CGAL/IO/Arr_with_history_iostream.h index 65d9f6c22065..efdcd0a73743 100644 --- a/Arrangement_on_surface_2/include/CGAL/IO/Arr_with_history_iostream.h +++ b/Arrangement_on_surface_2/include/CGAL/IO/Arr_with_history_iostream.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * Write an arrangement with history to an output stream using a given @@ -128,6 +128,6 @@ std::istream& operator>> return (is); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/IO/Arr_with_history_text_formatter.h b/Arrangement_on_surface_2/include/CGAL/IO/Arr_with_history_text_formatter.h index 8d85d3cb0423..5da9e4c89d55 100644 --- a/Arrangement_on_surface_2/include/CGAL/IO/Arr_with_history_text_formatter.h +++ b/Arrangement_on_surface_2/include/CGAL/IO/Arr_with_history_text_formatter.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A class defining a textual (ASCII) input/output format for arrangements @@ -183,6 +183,6 @@ class Arr_with_history_text_formatter : public ArrFormatter_ }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/IO/Arrangement_2_reader.h b/Arrangement_on_surface_2/include/CGAL/IO/Arrangement_2_reader.h index be2e8da8773a..ff3026d88ca8 100644 --- a/Arrangement_on_surface_2/include/CGAL/IO/Arrangement_2_reader.h +++ b/Arrangement_on_surface_2/include/CGAL/IO/Arrangement_2_reader.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * An auxiliary class for reading an arrangement from an input stream. @@ -389,6 +389,6 @@ class Arrangement_2_reader }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_ARRANGEMENT_2_READER_H diff --git a/Arrangement_on_surface_2/include/CGAL/IO/Arrangement_2_writer.h b/Arrangement_on_surface_2/include/CGAL/IO/Arrangement_2_writer.h index c45832768332..7154c3cd3f0e 100644 --- a/Arrangement_on_surface_2/include/CGAL/IO/Arrangement_2_writer.h +++ b/Arrangement_on_surface_2/include/CGAL/IO/Arrangement_2_writer.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * An auxiliary class for writing an arrangement to an output stream. @@ -350,6 +350,6 @@ class Arrangement_2_writer } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_ARRANGEMENT_2_WRITER_H diff --git a/Arrangement_on_surface_2/include/CGAL/IO/Fig_stream.h b/Arrangement_on_surface_2/include/CGAL/IO/Fig_stream.h index 9a1e6ac735aa..c32ed7e47f3c 100644 --- a/Arrangement_on_surface_2/include/CGAL/IO/Fig_stream.h +++ b/Arrangement_on_surface_2/include/CGAL/IO/Fig_stream.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * FIG colors. @@ -1748,6 +1748,6 @@ class Fig_stream } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/IO/Qt_widget_Conic_arc_2.h b/Arrangement_on_surface_2/include/CGAL/IO/Qt_widget_Conic_arc_2.h index b7a165788f0f..85b234f49759 100644 --- a/Arrangement_on_surface_2/include/CGAL/IO/Qt_widget_Conic_arc_2.h +++ b/Arrangement_on_surface_2/include/CGAL/IO/Qt_widget_Conic_arc_2.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * Draw an x-monotone conic arc. @@ -106,6 +106,6 @@ Qt_widget& operator<< return (ws); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/IO/Qt_widget_Linear_object_2.h b/Arrangement_on_surface_2/include/CGAL/IO/Qt_widget_Linear_object_2.h index 6902fa5fc3ed..77a42e6adddf 100644 --- a/Arrangement_on_surface_2/include/CGAL/IO/Qt_widget_Linear_object_2.h +++ b/Arrangement_on_surface_2/include/CGAL/IO/Qt_widget_Linear_object_2.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * Export a polyline to a window stream @@ -49,6 +49,6 @@ Qt_widget & operator<<(Qt_widget & ws, const Arr_linear_object_2 & o) return ws; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/IO/Qt_widget_Polyline_2.h b/Arrangement_on_surface_2/include/CGAL/IO/Qt_widget_Polyline_2.h index 3f3b944c5cc7..3d6eb9239941 100644 --- a/Arrangement_on_surface_2/include/CGAL/IO/Qt_widget_Polyline_2.h +++ b/Arrangement_on_surface_2/include/CGAL/IO/Qt_widget_Polyline_2.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * Export a polyline to a window stream @@ -37,6 +37,6 @@ Qt_widget & operator<<(Qt_widget & ws, const _Polyline_2 & cv) return ws; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2.h index baa3e0c1e7df..de789c54c40c 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * Sweep_line_2 is a class that implements the sweep line algorithm based @@ -244,7 +244,7 @@ class Sweep_line_2 : public Basic_sweep_line_2 diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_basic_insertion_sl_visitor.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_basic_insertion_sl_visitor.h index 6dd090376936..d9bcc91cc04d 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_basic_insertion_sl_visitor.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_basic_insertion_sl_visitor.h @@ -26,7 +26,7 @@ * Definition of the Arr_basic_insertion_sl_visitor class-template. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arr_basic_insertion_sl_visitor * A sweep-line visitor for inserting new curves into an existing arrangement @@ -799,6 +799,6 @@ Arr_basic_insertion_sl_visitor::_ray_shoot_up (Subcurve* sc) return (this->m_helper.top_face()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_basic_insertion_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_basic_insertion_traits_2.h index 5c5fe0263942..b55d87d28964 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_basic_insertion_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_basic_insertion_traits_2.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * A basic meta-traits class that stores a halfedge handle with every @@ -843,6 +843,6 @@ class Arr_basic_insertion_traits_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_batched_pl_sl_visitor.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_batched_pl_sl_visitor.h index d32573c71da0..b67b61260e23 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_batched_pl_sl_visitor.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_batched_pl_sl_visitor.h @@ -25,7 +25,7 @@ * Definition of the Arr_batched_pl_sl_visitor class-template. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { #include @@ -192,6 +192,6 @@ bool Arr_batched_pl_sl_visitor::after_handle_event return (true); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_construction_event.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_construction_event.h index 4fb045316822..d2368d24c5ec 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_construction_event.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_construction_event.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arr_construction_event * @@ -262,6 +262,6 @@ class Arr_construction_event : }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_construction_sl_visitor.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_construction_sl_visitor.h index 46334e31ab88..76d43b115903 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_construction_sl_visitor.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_construction_sl_visitor.h @@ -37,7 +37,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \struct Integer_hash_function * An auxiliary hash functor for integers. @@ -1062,6 +1062,6 @@ _map_new_halfedge (unsigned int i, Halfedge_handle he) return; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_construction_subcurve.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_construction_subcurve.h index 1b68faf4e67f..0c282264f170 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_construction_subcurve.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_construction_subcurve.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arr_construction_subcurve * @@ -162,6 +162,6 @@ class Arr_construction_subcurve : public Sweep_line_subcurve }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_default_overlay_traits_base.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_default_overlay_traits_base.h index c934b180c357..8ff9a82969c8 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_default_overlay_traits_base.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_default_overlay_traits_base.h @@ -25,7 +25,7 @@ #ifndef CGAL_ARR_DEFAULT_OVERLAY_TRAITS_BASE_H #define CGAL_ARR_DEFAULT_OVERLAY_TRAITS_BASE_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * \class @@ -137,6 +137,6 @@ class _Arr_default_overlay_traits_base }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_insertion_sl_visitor.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_insertion_sl_visitor.h index 77f61576485b..03075d578985 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_insertion_sl_visitor.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_insertion_sl_visitor.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arr_insertion_sl_visitor * A sweep-line visitor for inserting new curves into an existing arrangement @@ -145,6 +145,6 @@ Arr_insertion_sl_visitor::split_edge return (new_he); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_insertion_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_insertion_traits_2.h index edb8f81f55f4..da3671c9bad0 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_insertion_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_insertion_traits_2.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A meta-traits class that stores a halfedge handle with every x-monotone @@ -190,6 +190,6 @@ class Arr_insertion_traits_2 : } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_sl_visitor.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_sl_visitor.h index 6faa51ba6841..2e9b5646ba80 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_sl_visitor.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_sl_visitor.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Arr_overlay_sl_visitor * A sweep-line visitor for overlaying a "red" arrangement and a "blue" @@ -1049,6 +1049,6 @@ _create_edge (Subcurve *sc, Halfedge_handle new_he) return; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_subcurve.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_subcurve.h index d7c544a2fbce..a09a339a4a6b 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_subcurve.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_subcurve.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * Representation of a subcurve in the overlay process. A subcurve can @@ -167,6 +167,6 @@ class Arr_overlay_subcurve : public Arr_construction_subcurve } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_traits_2.h index 1e881835386a..4408d7e81d43 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_traits_2.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A meta-traits class that stores a red or a blue halfedge handle with every @@ -1137,6 +1137,6 @@ class Arr_overlay_traits_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_vert_decomp_sl_visitor.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_vert_decomp_sl_visitor.h index a3a8ae764909..2c9d9934d052 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_vert_decomp_sl_visitor.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_vert_decomp_sl_visitor.h @@ -24,7 +24,7 @@ * Definition of the Arr_vert_decomp_sl_visitor class-template. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { #include @@ -323,6 +323,6 @@ void Arr_vert_decomp_sl_visitor::after_sweep () return; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Basic_sweep_line_2_impl.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Basic_sweep_line_2_impl.h index 0f20055b7524..3dd4b9f67bdb 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Basic_sweep_line_2_impl.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Basic_sweep_line_2_impl.h @@ -27,7 +27,7 @@ * Member-function definitions for the Basic_sweep_line_2 class. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------------- // Constructor. @@ -811,6 +811,6 @@ _push_event (const X_monotone_curve_2& cv, Arr_curve_end ind, return (std::make_pair(e, !exist)); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_impl.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_impl.h index 7b326a799d48..7130314c6c05 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_impl.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_impl.h @@ -26,7 +26,7 @@ * Member-function definitions of the Sweep_line_2 class-template. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------------- // Initialize the data structures for the sweep-line algorithm. @@ -889,6 +889,6 @@ _fix_finished_overlap_subcurve (Subcurve* sc) _fix_finished_overlap_subcurve(orig_sc_2); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_utils.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_utils.h index 74ed9642a26b..6c6ad23ad4b9 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_utils.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_utils.h @@ -34,7 +34,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * Subdivide a range of input curves into x-monotone objects. @@ -195,6 +195,6 @@ void prepare_for_sweep (Arrangement& arr, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_visitors.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_visitors.h index fac50db1b573..a7e54926697c 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_visitors.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_visitors.h @@ -33,7 +33,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A simple sweep-line visitor that reports all intersection points among a @@ -316,6 +316,6 @@ class Sweep_line_do_curves_x_visitor : } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_curve_pair.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_curve_pair.h index 17270619a175..884fe25b345a 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_curve_pair.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_curve_pair.h @@ -25,7 +25,7 @@ * Definition of the Curve_pair class and related functors. */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A pair of subcurves. @@ -213,6 +213,6 @@ class random_access_input_iterator } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_event.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_event.h index f84ab6cf97b8..2a1b531b851e 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_event.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_event.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Sweep_line_event * @@ -588,6 +588,6 @@ class Sweep_line_event } #endif // CGAL_SL_VERBOSE -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_functors.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_functors.h index f788ea2729f7..bdba37ec04eb 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_functors.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_functors.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A functor used to compare events and event points in an xy-lexicographic @@ -395,6 +395,6 @@ class Curve_comparer }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_subcurve.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_subcurve.h index f345be5517e3..47824623b6ec 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_subcurve.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_subcurve.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class Sweep_line_subcurve * @@ -344,6 +344,6 @@ class Sweep_line_subcurve } #endif -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2_algorithms.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2_algorithms.h index ecfc79341c13..1eed6caad2dc 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2_algorithms.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2_algorithms.h @@ -37,7 +37,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Default_arr_traits @@ -214,6 +214,6 @@ bool do_curves_intersect (CurveInputIterator curves_begin, return do_curves_intersect (curves_begin, curves_end, m_traits); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_empty_visitor.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_empty_visitor.h index d86bb6236300..af8c4ad98458 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_empty_visitor.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_empty_visitor.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * An empty sweep-line visitor that does nothing. It is used as a base-class @@ -276,6 +276,6 @@ class Sweep_line_empty_visitor } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/graph_traits_Arrangement_2.h b/Arrangement_on_surface_2/include/CGAL/graph_traits_Arrangement_2.h index 365723ce6b69..7dbca29d1700 100644 --- a/Arrangement_on_surface_2/include/CGAL/graph_traits_Arrangement_2.h +++ b/Arrangement_on_surface_2/include/CGAL/graph_traits_Arrangement_2.h @@ -351,7 +351,7 @@ class graph_traits > : } // namespace boost -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Functions required by the IncidenceGraph concept: // ------------------------------------------------- @@ -600,6 +600,6 @@ edges (const CGAL::Arrangement_on_surface_2& arr) return std::make_pair (gt_arr.edges_begin(), gt_arr.edges_end()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Arrangement_on_surface_2/include/CGAL/graph_traits_Dual_Arrangement_2.h b/Arrangement_on_surface_2/include/CGAL/graph_traits_Dual_Arrangement_2.h index aa8468fa9601..2703e65cecf3 100644 --- a/Arrangement_on_surface_2/include/CGAL/graph_traits_Dual_Arrangement_2.h +++ b/Arrangement_on_surface_2/include/CGAL/graph_traits_Dual_Arrangement_2.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Forward declaration. template class Dual; @@ -415,7 +415,7 @@ class Dual > : {} }; -CGAL_END_NAMESPACE +} //namespace CGAL #include #include @@ -503,7 +503,7 @@ class graph_traits > > : } // namespace boost -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Functions required by the IncidenceGraph concept: // ------------------------------------------------- @@ -739,6 +739,6 @@ edges (const CGAL::Dual -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Refs, class Pln, class ID> class HalfedgeDS_face_max_base_with_id : public HalfedgeDS_face_base< Refs, Tag_true, Pln> @@ -47,7 +47,7 @@ class HalfedgeDS_face_max_base_with_id : public HalfedgeDS_face_base< Refs, Tag_ size_type const& id() const { return mID; } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HALFEDGEDS_FACE_MAX_BASE_WITH_ID_H // // EOF // diff --git a/BGL/include/CGAL/HalfedgeDS_halfedge_max_base_with_id.h b/BGL/include/CGAL/HalfedgeDS_halfedge_max_base_with_id.h index 5c4093e46691..243eaf314718 100644 --- a/BGL/include/CGAL/HalfedgeDS_halfedge_max_base_with_id.h +++ b/BGL/include/CGAL/HalfedgeDS_halfedge_max_base_with_id.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Refs, class ID> class HalfedgeDS_halfedge_max_base_with_id : public HalfedgeDS_halfedge_base< Refs, Tag_true, Tag_true, Tag_true > @@ -46,7 +46,7 @@ class HalfedgeDS_halfedge_max_base_with_id : public HalfedgeDS_halfedge_base< Re size_type const& id() const { return mID; } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HALFEDGEDS_HALFEDGE_MAX_BASE_WITH_ID_H // // EOF // diff --git a/BGL/include/CGAL/HalfedgeDS_vertex_max_base_with_id.h b/BGL/include/CGAL/HalfedgeDS_vertex_max_base_with_id.h index bc3100cf9c4a..86e0bac8f5f2 100644 --- a/BGL/include/CGAL/HalfedgeDS_vertex_max_base_with_id.h +++ b/BGL/include/CGAL/HalfedgeDS_vertex_max_base_with_id.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Refs, class P, class ID> class HalfedgeDS_vertex_max_base_with_id : public HalfedgeDS_vertex_base< Refs, Tag_true, P> @@ -48,7 +48,7 @@ class HalfedgeDS_vertex_max_base_with_id : public HalfedgeDS_vertex_base< Refs, size_type const& id() const { return mID; } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HALFEDGEDS_VERTEX_MAX_BASE_WITH_ID_H // // EOF // diff --git a/BGL/include/CGAL/Polyhedron_items_with_id_3.h b/BGL/include/CGAL/Polyhedron_items_with_id_3.h index cda7142464a6..46e44a1b77c4 100644 --- a/BGL/include/CGAL/Polyhedron_items_with_id_3.h +++ b/BGL/include/CGAL/Polyhedron_items_with_id_3.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Polyhedron_items_with_id_3 { public: @@ -69,7 +69,7 @@ void set_halfedgeds_items_id ( HalfedgeDS_with_id& hds ) fit->id() = face_id ++ ; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYHEDRON_ITEMS_WITH_ID_3_H // // EOF // diff --git a/BGL/include/CGAL/Triangulation_vertex_base_with_id_2.h b/BGL/include/CGAL/Triangulation_vertex_base_with_id_2.h index 95a0aaabdaa0..dca6f4edee9e 100644 --- a/BGL/include/CGAL/Triangulation_vertex_base_with_id_2.h +++ b/BGL/include/CGAL/Triangulation_vertex_base_with_id_2.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename GT, typename Vb = Triangulation_vertex_base_2 > @@ -57,6 +57,6 @@ class Triangulation_vertex_base_with_id_2 int& id() { return _id; } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_VERTEX_BASE_WITH_ID_2_H diff --git a/BGL/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h b/BGL/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h index f989dd19e3d0..c9e326e4d653 100644 --- a/BGL/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h +++ b/BGL/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class HDS_in_halfedge_circulator : public Circ @@ -267,6 +267,6 @@ public : }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_BOOST_GRAPH_GRAPH_TRAITS_HALFEDGEDS_H diff --git a/BGL/include/CGAL/boost/graph/halfedge_graph_traits.h b/BGL/include/CGAL/boost/graph/halfedge_graph_traits.h index f1eb7051537a..9829a7a1123b 100644 --- a/BGL/include/CGAL/boost/graph/halfedge_graph_traits.h +++ b/BGL/include/CGAL/boost/graph/halfedge_graph_traits.h @@ -23,10 +23,10 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct halfedge_graph_traits ; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_BOOST_GRAPH_HALFEDGE_GRAPH_TRAITS_H diff --git a/BGL/include/CGAL/boost/graph/halfedge_graph_traits_HalfedgeDS.h b/BGL/include/CGAL/boost/graph/halfedge_graph_traits_HalfedgeDS.h index 25aa047ecc24..bbb8cc3f3c1d 100644 --- a/BGL/include/CGAL/boost/graph/halfedge_graph_traits_HalfedgeDS.h +++ b/BGL/include/CGAL/boost/graph/halfedge_graph_traits_HalfedgeDS.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class HDS > class HDS_all_undirected_edges_const_iterator @@ -70,6 +70,6 @@ public : typedef typename HDS::Vertex::Point Point ; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_BOOST_GRAPH_HALFEDGE_GRAPH_TRAITS_HALFEDGEDS_H diff --git a/BGL/include/CGAL/boost/graph/halfedge_graph_traits_Polyhedron_3.h b/BGL/include/CGAL/boost/graph/halfedge_graph_traits_Polyhedron_3.h index 14f65f4dc360..763e5d8dbb48 100644 --- a/BGL/include/CGAL/boost/graph/halfedge_graph_traits_Polyhedron_3.h +++ b/BGL/include/CGAL/boost/graph/halfedge_graph_traits_Polyhedron_3.h @@ -44,7 +44,7 @@ // hence the const_cast<> used below in the functions implementation. // -CGAL_BEGIN_NAMESPACE +namespace CGAL { // // Const versions @@ -187,7 +187,7 @@ next_edge_cw( typename boost::graph_traits< Polyhedron_3 >::edge_des } -CGAL_END_NAMESPACE +} //namespace CGAL #undef CGAL_HDS_ diff --git a/BGL/include/CGAL/boost/graph/named_function_params.h b/BGL/include/CGAL/boost/graph/named_function_params.h index 5cbdd6e1d974..f192cdb939f2 100644 --- a/BGL/include/CGAL/boost/graph/named_function_params.h +++ b/BGL/include/CGAL/boost/graph/named_function_params.h @@ -51,7 +51,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { enum vertex_is_fixed_t { vertex_is_fixed } ; enum set_cache_policy_t { set_cache_policy } ; @@ -266,6 +266,6 @@ CGAL_BEGIN_NAMESPACE return Dispatcher::const_get_value(p, t2, tag2); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_BOOST_GRAPH_NAMED_FUNCTION_PARAMS_HPP diff --git a/BGL/include/CGAL/boost/graph/properties.h b/BGL/include/CGAL/boost/graph/properties.h index a58a82ce1df0..1d4667d7de86 100644 --- a/BGL/include/CGAL/boost/graph/properties.h +++ b/BGL/include/CGAL/boost/graph/properties.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { enum vertex_is_border_t { vertex_is_border } ; enum vertex_point_t { vertex_point } ; @@ -34,6 +34,6 @@ enum vertex_external_index_t { vertex_external_index } ; enum edge_is_border_t { edge_is_border } ; enum edge_external_index_t { edge_external_index } ; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_BOOST_GRAPH_BGL_PROPERTIES_H diff --git a/BGL/include/CGAL/boost/graph/properties_Polyhedron_3.h b/BGL/include/CGAL/boost/graph/properties_Polyhedron_3.h index d892ee1cf052..3486b1919bbf 100644 --- a/BGL/include/CGAL/boost/graph/properties_Polyhedron_3.h +++ b/BGL/include/CGAL/boost/graph/properties_Polyhedron_3.h @@ -30,7 +30,7 @@ # define CGAL_HDS_PARAM_ class HDS #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Polyhedron_edge_weight_map : public boost::put_get_helper > @@ -302,7 +302,7 @@ struct Polyhedron_property_map }; }; -CGAL_END_NAMESPACE +} //namespace CGAL namespace boost { diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2.h index 833c40c92fcc..ca04bb0bb9d6 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// \name do_intersect() functions. //@{ @@ -1245,6 +1245,6 @@ Oriented_side oriented_side(const typename Polygon_::Point_2& p, //@} -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Bso_internal_functions.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Bso_internal_functions.h index 0d29b1810e64..dfef559daa03 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Bso_internal_functions.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Bso_internal_functions.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// \name _do_intersect() functions. //@{ @@ -202,6 +202,6 @@ void _complement(const Pgn& pgn, Pwh& res) //@} -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Ccb_curve_iterator.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Ccb_curve_iterator.h index 5d5e9427b54c..c88000249520 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Ccb_curve_iterator.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Ccb_curve_iterator.h @@ -20,7 +20,7 @@ #ifndef CGAL_CCB_CURVE_ITERATOR_H #define CGAL_CCB_CURVE_ITERATOR_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A circulator adapter that iterates over all curves in a CCB. @@ -113,6 +113,6 @@ CGAL_BEGIN_NAMESPACE }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Curve_with_halfedge.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Curve_with_halfedge.h index 6c24e00ab79e..f912de43201e 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Curve_with_halfedge.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Curve_with_halfedge.h @@ -20,7 +20,7 @@ #ifndef CGAL_CURVE_WITH_HALFEDGE_H #define CGAL_CURVE_WITH_HALFEDGE_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Curve_with_halfedge @@ -54,5 +54,5 @@ class Curve_with_halfedge } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h index 9b290ba6df66..d322c86da5a3 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Gps_agg_curve_data : public Curve_with_halfedge @@ -606,6 +606,6 @@ class Gps_agg_meta_traits : }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h index c06f2e9d451e..83b090365e64 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h @@ -44,7 +44,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Gps_agg_op @@ -172,6 +172,6 @@ class Gps_agg_op } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_sweep.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_sweep.h index 18ae195a0cfd..3f2d3b63e77d 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_sweep.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_sweep.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Gps_agg_op_base_visitor : @@ -311,6 +311,6 @@ class Gps_agg_op_visitor : }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_base_functor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_base_functor.h index 0e091729381c..02569b59b84f 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_base_functor.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_base_functor.h @@ -20,7 +20,7 @@ #ifndef CGAL_GPS_BASE_FUNCTOR_H #define CGAL_GPS_BASE_FUNCTOR_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -93,6 +93,6 @@ class Gps_base_functor }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_base_visitor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_base_visitor.h index 04619ba9168c..22f784758ed4 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_base_visitor.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_base_visitor.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //! Gps_bfs_base_visitor /*! This is a base class for all visitors that are responsible for merging @@ -103,6 +103,6 @@ class Gps_bfs_base_visitor } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_intersection_visitor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_intersection_visitor.h index 202528215989..92e46f624b02 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_intersection_visitor.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_intersection_visitor.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Gps_bfs_intersection_visitor : @@ -66,6 +66,6 @@ public Gps_bfs_base_visitor -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Gps_bfs_join_visitor : @@ -60,6 +60,6 @@ public Gps_bfs_base_visitor > }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_scanner.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_scanner.h index a97bc7a617c5..b26ea6b5ba16 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_scanner.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_scanner.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Gps_bfs_scanner @@ -116,6 +116,6 @@ class Gps_bfs_scanner } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_xor_visitor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_xor_visitor.h index f006507b5946..2484db8ab11e 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_xor_visitor.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_xor_visitor.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Gps_bfs_xor_visitor : @@ -94,6 +94,6 @@ public Gps_bfs_base_visitor > }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_default_dcel.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_default_dcel.h index 9730e9e65a52..96a34e365b62 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_default_dcel.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_default_dcel.h @@ -29,7 +29,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Gps_face_base : public Arr_face_base { @@ -101,6 +101,6 @@ class Gps_default_dcel : -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_default_traits.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_default_traits.h index 87cb63f1953f..ad44b464a812 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_default_traits.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_default_traits.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Gps_default_traits @@ -62,6 +62,6 @@ struct Gps_default_traits > typedef Gps_traits_2 Traits; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_difference_functor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_difference_functor.h index 46e3398e1772..225186a5e178 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_difference_functor.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_difference_functor.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Gps_difference_functor : public Gps_base_functor @@ -48,6 +48,6 @@ class Gps_difference_functor : public Gps_base_functor }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_do_intersect_functor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_do_intersect_functor.h index bf32fe86fdb2..bfe81d3712e0 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_do_intersect_functor.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_do_intersect_functor.h @@ -20,7 +20,7 @@ #ifndef CGAL_GPS_DO_INTERSECT_FUNCTOR_H #define CGAL_GPS_DO_INTERSECT_FUNCTOR_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Gps_do_intersect_functor @@ -125,6 +125,6 @@ class Gps_do_intersect_functor }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_insertion_meta_traits.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_insertion_meta_traits.h index aa67d85edd80..75609c9526d0 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_insertion_meta_traits.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_insertion_meta_traits.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Gps_insertion_meta_traits : @@ -132,6 +132,6 @@ class Gps_insertion_meta_traits : }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_intersection_functor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_intersection_functor.h index f3e5399a7630..be5b89e2c690 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_intersection_functor.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_intersection_functor.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Gps_intersection_functor : public Gps_base_functor @@ -47,6 +47,6 @@ class Gps_intersection_functor : public Gps_base_functor }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_join_functor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_join_functor.h index d8045dabcf5e..0c11a96e255d 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_join_functor.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_join_functor.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Gps_join_functor : public Gps_base_functor @@ -45,6 +45,6 @@ class Gps_join_functor : public Gps_base_functor }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_merge.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_merge.h index d6329c94882d..31f4ba09516a 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_merge.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_merge.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \file Gps_merge.h @@ -111,6 +111,6 @@ class Xor_merge : public Base_merge -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_GPS_ON_SURFACE_BASE_2_H diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_simplifier.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_simplifier.h index a4b938191892..acba60dcb76f 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_simplifier.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_simplifier.h @@ -33,7 +33,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Gps_polygon_simplifier @@ -148,6 +148,6 @@ class Gps_polygon_simplifier } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_validation.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_validation.h index 1d000dd19240..8f6382318937 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_validation.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_validation.h @@ -50,7 +50,7 @@ Construct_vertex_2 -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*Arrangement is templated with extended face dcel*/ template @@ -803,6 +803,6 @@ bool is_valid_unknown_polygon(const typename Traits_2::Polygon_2& pgn, return is_valid_polygon(pgn, traits); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_simplifier_traits.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_simplifier_traits.h index 8849e573ad50..24b2be01448c 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_simplifier_traits.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_simplifier_traits.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Gps_simplifier_curve_data { @@ -471,6 +471,6 @@ class Gps_simplifier_traits : } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_sym_diff_functor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_sym_diff_functor.h index c675c21d1b19..7b803c18d308 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_sym_diff_functor.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_sym_diff_functor.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Gps_sym_diff_functor : public Gps_base_functor @@ -46,6 +46,6 @@ class Gps_sym_diff_functor : public Gps_base_functor }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_traits_adaptor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_traits_adaptor.h index 410b52f55ae4..b202dfda20e9 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_traits_adaptor.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_traits_adaptor.h @@ -20,7 +20,7 @@ #ifndef CGAL_GPS_TRAITS_ADAPTOR_H #define CGAL_GPS_TRAITS_ADAPTOR_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Gps_traits_adaptor : public Traits_ @@ -166,6 +166,6 @@ class Gps_traits_adaptor : public Traits_ } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_traits_decorator.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_traits_decorator.h index 09282eeae5b0..d3712f6cb8c1 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_traits_decorator.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_traits_decorator.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Gps_traits_decorator @@ -553,6 +553,6 @@ class Gps_traits_decorator }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Point_with_vertex.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Point_with_vertex.h index 6e83a9a0564d..ca8c68c8d859 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Point_with_vertex.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Point_with_vertex.h @@ -20,7 +20,7 @@ #ifndef CGAL_POINT_WITH_VERTEX_H #define CGAL_POINT_WITH_VERTEX_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Point_with_vertex @@ -54,5 +54,5 @@ class Point_with_vertex } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Polygon_2_curve_iterator.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Polygon_2_curve_iterator.h index 471e0677ea18..48834b10aaff 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Polygon_2_curve_iterator.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Polygon_2_curve_iterator.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { @@ -186,6 +186,6 @@ value_type(const Polygon_2_curve_iterator&) -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/General_polygon_2.h b/Boolean_set_operations_2/include/CGAL/General_polygon_2.h index 3342db0df30c..68a1e3533f4d 100644 --- a/Boolean_set_operations_2/include/CGAL/General_polygon_2.h +++ b/Boolean_set_operations_2/include/CGAL/General_polygon_2.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class General_polygon_2 @@ -215,6 +215,6 @@ std::ostream } } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/General_polygon_set_2.h b/Boolean_set_operations_2/include/CGAL/General_polygon_set_2.h index 5b6c6515a17d..184b8011084c 100644 --- a/Boolean_set_operations_2/include/CGAL/General_polygon_set_2.h +++ b/Boolean_set_operations_2/include/CGAL/General_polygon_set_2.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // General_polygon_set_2 template > @@ -115,6 +115,6 @@ class General_polygon_set_2 : public General_polygon_set_on_surface_2 //@} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/General_polygon_set_on_surface_2.h b/Boolean_set_operations_2/include/CGAL/General_polygon_set_on_surface_2.h index 6aff8268e390..49e5ac8c01e4 100644 --- a/Boolean_set_operations_2/include/CGAL/General_polygon_set_on_surface_2.h +++ b/Boolean_set_operations_2/include/CGAL/General_polygon_set_on_surface_2.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Boolean_set_operation_2_internal @@ -149,6 +149,6 @@ template }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_GENERAL_POLYGON_SET_ON_SURFACE_2_H diff --git a/Boolean_set_operations_2/include/CGAL/General_polygon_with_holes_2.h b/Boolean_set_operations_2/include/CGAL/General_polygon_with_holes_2.h index 5aeac74269f6..70421ae5e08c 100644 --- a/Boolean_set_operations_2/include/CGAL/General_polygon_with_holes_2.h +++ b/Boolean_set_operations_2/include/CGAL/General_polygon_with_holes_2.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class General_polygon_with_holes_2 @@ -192,6 +192,6 @@ std::istream &operator>>(std::istream &is, General_polygon_with_holes_2 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Gps_circle_segment_traits_2 : @@ -38,6 +38,6 @@ class Gps_circle_segment_traits_2 : }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Gps_segment_traits_2.h b/Boolean_set_operations_2/include/CGAL/Gps_segment_traits_2.h index 3cfdb6b6cdac..b565d3d73968 100644 --- a/Boolean_set_operations_2/include/CGAL/Gps_segment_traits_2.h +++ b/Boolean_set_operations_2/include/CGAL/Gps_segment_traits_2.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Kernel_, class Container_ = std::vector, @@ -207,6 +207,6 @@ class Gps_segment_traits_2 : public Arr_seg_traits_ } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Gps_traits_2.h b/Boolean_set_operations_2/include/CGAL/Gps_traits_2.h index 5c2ebd2f25dc..97960e7d87d4 100644 --- a/Boolean_set_operations_2/include/CGAL/Gps_traits_2.h +++ b/Boolean_set_operations_2/include/CGAL/Gps_traits_2.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template > @@ -168,6 +168,6 @@ class Gps_traits_2 : public Arr_traits Is_unbounded construct_is_unbounded_object() { return Is_unbounded(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/IO/Dxf_bsop_reader.h b/Boolean_set_operations_2/include/CGAL/IO/Dxf_bsop_reader.h index 9e36fbc7d365..9e07f9a34bc7 100644 --- a/Boolean_set_operations_2/include/CGAL/IO/Dxf_bsop_reader.h +++ b/Boolean_set_operations_2/include/CGAL/IO/Dxf_bsop_reader.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Dxf_bsop_reader @@ -240,6 +240,6 @@ class Dxf_bsop_reader } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/IO/Gps_iostream.h b/Boolean_set_operations_2/include/CGAL/IO/Gps_iostream.h index 36fcbaff3d3c..068dfeb7d5d2 100644 --- a/Boolean_set_operations_2/include/CGAL/IO/Gps_iostream.h +++ b/Boolean_set_operations_2/include/CGAL/IO/Gps_iostream.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template std::ostream & operator<< (std::ostream& os, @@ -46,6 +46,6 @@ std::ostream & operator<< (std::ostream& os, return os; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Polygon_set_2.h b/Boolean_set_operations_2/include/CGAL/Polygon_set_2.h index 96029be1b021..54bce16b11e7 100644 --- a/Boolean_set_operations_2/include/CGAL/Polygon_set_2.h +++ b/Boolean_set_operations_2/include/CGAL/Polygon_set_2.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template , @@ -245,6 +245,6 @@ class Polygon_set_2 : }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/Polygon_with_holes_2.h b/Boolean_set_operations_2/include/CGAL/Polygon_with_holes_2.h index f85619ce1bbd..4fcf2f963229 100644 --- a/Boolean_set_operations_2/include/CGAL/Polygon_with_holes_2.h +++ b/Boolean_set_operations_2/include/CGAL/Polygon_with_holes_2.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template > @@ -221,6 +221,6 @@ inline bool operator!=(const Polygon_2& p1, -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Boolean_set_operations_2/include/CGAL/connect_holes.h b/Boolean_set_operations_2/include/CGAL/connect_holes.h index 3707443caba6..fe1ab06ec51f 100644 --- a/Boolean_set_operations_2/include/CGAL/connect_holes.h +++ b/Boolean_set_operations_2/include/CGAL/connect_holes.h @@ -33,7 +33,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct _Less_handle @@ -467,6 +467,6 @@ OutputIterator connect_holes(const Polygon_with_holes_2 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Box_intersection_d { @@ -231,6 +231,6 @@ class Box_d< NT_, N, ID_FROM_BOX_ADDRESS> : public Box_d< NT_, N, ID_NONE> { } // end namespace Box_intersection_d -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Box_intersection_d/include/CGAL/Box_intersection_d/Box_traits_d.h b/Box_intersection_d/include/CGAL/Box_intersection_d/Box_traits_d.h index af3fbaf061b3..a8f769f0ee1d 100644 --- a/Box_intersection_d/include/CGAL/Box_intersection_d/Box_traits_d.h +++ b/Box_intersection_d/include/CGAL/Box_intersection_d/Box_traits_d.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Box_intersection_d { @@ -163,6 +163,6 @@ struct Predicate_traits_d : public BoxTraits { } // end namespace Box_intersection_d -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Box_intersection_d/include/CGAL/Box_intersection_d/Box_with_handle_d.h b/Box_intersection_d/include/CGAL/Box_intersection_d/Box_with_handle_d.h index a9c50670cc79..2123895715a2 100644 --- a/Box_intersection_d/include/CGAL/Box_intersection_d/Box_with_handle_d.h +++ b/Box_intersection_d/include/CGAL/Box_intersection_d/Box_with_handle_d.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Box_intersection_d { @@ -72,6 +72,6 @@ class Box_with_handle_d } // end namespace Box_intersection_d -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Box_intersection_d/include/CGAL/Box_intersection_d/box_limits.h b/Box_intersection_d/include/CGAL/Box_intersection_d/box_limits.h index 911e3e51d3e0..9d9f38a7be73 100644 --- a/Box_intersection_d/include/CGAL/Box_intersection_d/box_limits.h +++ b/Box_intersection_d/include/CGAL/Box_intersection_d/box_limits.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Box_intersection_d { @@ -59,7 +59,7 @@ struct box_limits { } // end namespace Box_intersection_d -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Box_intersection_d/include/CGAL/Box_intersection_d/segment_tree.h b/Box_intersection_d/include/CGAL/Box_intersection_d/segment_tree.h index 046e0fb4fe98..5c9f8d821bcf 100644 --- a/Box_intersection_d/include/CGAL/Box_intersection_d/segment_tree.h +++ b/Box_intersection_d/include/CGAL/Box_intersection_d/segment_tree.h @@ -33,7 +33,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Box_intersection_d { @@ -399,6 +399,6 @@ void segment_tree( RandomAccessIter1 p_begin, RandomAccessIter1 p_end, -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Box_intersection_d/include/CGAL/box_intersection_d.h b/Box_intersection_d/include/CGAL/box_intersection_d.h index 27473c6454b1..23963411383a 100644 --- a/Box_intersection_d/include/CGAL/box_intersection_d.h +++ b/Box_intersection_d/include/CGAL/box_intersection_d.h @@ -29,7 +29,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Generic call with custom predicate traits parameter. template< class RandomAccessIter1, class RandomAccessIter2, @@ -390,6 +390,6 @@ void box_self_intersection_all_pairs_d( topology); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Cartesian_kernel/include/CGAL/Cartesian.h b/Cartesian_kernel/include/CGAL/Cartesian.h index fcced0df2e14..41af5cf7b485 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian.h +++ b/Cartesian_kernel/include/CGAL/Cartesian.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename FT_, typename Kernel_ > struct Cartesian_base_ref_count @@ -60,6 +60,6 @@ struct Cartesian Cartesian > {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_2.h index 070e3e1fb8d8..203665fe95fa 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Identity_transformation; template < class R > class Aff_transformation_rep_baseC2; @@ -36,14 +36,14 @@ template < class R > class Translation_repC2; template < class R > class Rotation_repC2; template < class R > class Scaling_repC2; -CGAL_END_NAMESPACE +} //namespace CGAL #include #include #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class Aff_transformationC2 @@ -196,6 +196,6 @@ operator<<(std::ostream& os, const Aff_transformationC2& t) } #endif // CGAL_NO_OSTREAM_INSERT_AFF_TRANSFORMATIONC2 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_AFF_TRANSFORMATION_2_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_3.h index 6006b48224f8..88c0a7c6d73a 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_3.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Identity_transformation; template class Aff_transformation_rep_baseC3; @@ -35,13 +35,13 @@ template class Aff_transformation_repC3; template class Translation_repC3; template class Scaling_repC3; -CGAL_END_NAMESPACE +} //namespace CGAL #include #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class Aff_transformationC3 @@ -191,6 +191,6 @@ std::ostream &operator<<(std::ostream &os, } #endif // CGAL_NO_OSTREAM_INSERT_AFF_TRANSFORMATIONC3 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_AFF_TRANSFORMATION_3_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_rep_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_rep_2.h index 3666f3a4f5b3..ed191ef776b5 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_rep_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_rep_2.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R > class Aff_transformation_rep_baseC2 @@ -248,6 +248,6 @@ compose(const Scaling_repC2 &t) const t.scalefactor_ * t23); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_AFF_TRANSFORMATION_REP_2_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_rep_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_rep_3.h index 1795855e57c7..8f4df059fbe6 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_rep_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Aff_transformation_rep_3.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R > class Aff_transformation_rep_baseC3 @@ -309,6 +309,6 @@ Aff_transformation_repC3::transpose() const t13, t23, t33, t34); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_AFF_TRANSFORMATION_REP_3_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Cartesian_base.h b/Cartesian_kernel/include/CGAL/Cartesian/Cartesian_base.h index 200f223e8a36..e0c4bce90b2d 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Cartesian_base.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Cartesian_base.h @@ -67,7 +67,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename K_, typename FT_> struct Cartesian_base @@ -144,6 +144,6 @@ struct Cartesian_base typedef ConicCPA2 Conic_2; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_BASE_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Circle_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Circle_2.h index 4a07f00de230..a935cd034971 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Circle_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Circle_2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class CircleC2 @@ -76,6 +76,6 @@ class CircleC2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_CIRCLE_2_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Circle_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Circle_3.h index be0824bc8215..842482f3e5de 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Circle_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Circle_3.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class CircleC3 { @@ -293,6 +293,6 @@ CircleC3::operator!=(const CircleC3 &t) const return !(*this == t); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_CIRCLEC3_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Data_accessor_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Data_accessor_2.h index 32f3e797ceaf..75458992dbc7 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Data_accessor_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Data_accessor_2.h @@ -24,7 +24,7 @@ #ifndef CGAL_CARTESIAN_DATA_ACCESSOR_2_H #define CGAL_CARTESIAN_DATA_ACCESSOR_2_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { // 2D Cartesian point data accessor template < class R_ > @@ -44,6 +44,6 @@ class Data_accessorC2 void set( Point& p, const FT &x, const FT &y) const { p=Point(x,y); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_DATA_ACCESSOR_2_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Direction_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Direction_2.h index 1a9e25ad98f0..420743d4dd58 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Direction_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Direction_2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class DirectionC2 @@ -98,6 +98,6 @@ DirectionC2::to_vector() const return Vector_2(dx(), dy()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_DIRECTION_2_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Direction_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Direction_3.h index 193bbf2646ce..a1a0230d7db8 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Direction_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Direction_3.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class DirectionC3 @@ -130,6 +130,6 @@ DirectionC3::to_vector() const return Vector_3(dx(), dy(), dz()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_DIRECTION_3_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Iso_cuboid_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Iso_cuboid_3.h index a1706af43ca6..cb76f9b10450 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Iso_cuboid_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Iso_cuboid_3.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class Iso_cuboidC3 @@ -332,6 +332,6 @@ Iso_cuboidC3::is_degenerate() const || (this->min)().hz() == (this->max)().hz(); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_ISO_CUBOID_3_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Iso_rectangle_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Iso_rectangle_2.h index 4c35cffa3e5c..b4b2f3fe8f3a 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Iso_rectangle_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Iso_rectangle_2.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Iso_rectangleC2 @@ -67,6 +67,6 @@ class Iso_rectangleC2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_ISO_RECTANGLE_2_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Line_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Line_2.h index a6ab92059890..92ccf5f89104 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Line_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Line_2.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class LineC2 @@ -91,6 +91,6 @@ LineC2::operator!=(const LineC2 &l) const return ! (*this == l); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_LINE_2_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Line_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Line_3.h index 373c0b44538d..b54406ea9b80 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Line_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Line_3.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class LineC3 @@ -151,6 +151,6 @@ LineC3::is_degenerate() const return to_vector() == NULL_VECTOR; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_LINE_3_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Plane_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Plane_3.h index 0c8eb31a0249..abbe413a25c2 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Plane_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Plane_3.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class PlaneC3 @@ -304,6 +304,6 @@ is_degenerate() const CGAL_NTS is_zero(c()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_PLANE_3_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Point_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Point_2.h index bd1a508de649..772f3c694487 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Point_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Point_2.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class PointC2 @@ -100,6 +100,6 @@ class PointC2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_POINT_2_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Point_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Point_3.h index 420527d910e5..197e0c6c1966 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Point_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Point_3.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class PointC3 @@ -133,6 +133,6 @@ PointC3::homogeneous(int i) const return base.homogeneous(i); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_POINT_3_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Ray_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Ray_2.h index caa38ac8ff6b..65614ba1e2ec 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Ray_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Ray_2.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class RayC2 @@ -70,6 +70,6 @@ class RayC2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_RAY_2_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Ray_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Ray_3.h index 0900d0454225..31c9918557ce 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Ray_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Ray_3.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class RayC3 @@ -186,6 +186,6 @@ collinear_has_on(const typename RayC3::Point_3 &p) const return true; // p == source() } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_RAY_3_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Rotation_rep_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Rotation_rep_2.h index 0dd8a6e1019e..293fe8be0ac2 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Rotation_rep_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Rotation_rep_2.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R > class Rotation_repC2: public Aff_transformation_rep_baseC2 @@ -175,6 +175,6 @@ friend class Scaling_repC2; FT sinus_, cosinus_; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_ROTATION_REP_2_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Scaling_rep_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Scaling_rep_2.h index c38f82fb84e8..042d6aac726f 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Scaling_rep_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Scaling_rep_2.h @@ -24,7 +24,7 @@ #ifndef CGAL_CARTESIAN_SCALING_REP_2_H #define CGAL_CARTESIAN_SCALING_REP_2_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R > class Scaling_repC2: public Aff_transformation_rep_baseC2 @@ -135,6 +135,6 @@ friend class Rotation_repC2; FT scalefactor_; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_SCALING_REP_2_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Scaling_rep_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Scaling_rep_3.h index f0579fb97c0d..5bb1b123779e 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Scaling_rep_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Scaling_rep_3.h @@ -24,7 +24,7 @@ #ifndef CGAL_CARTESIAN_SCALING_REP_3_H #define CGAL_CARTESIAN_SCALING_REP_3_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R > class Scaling_repC3 : public Aff_transformation_rep_baseC3 @@ -145,6 +145,6 @@ class Scaling_repC3 : public Aff_transformation_rep_baseC3 FT scalefactor_; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_SCALING_REP_3_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Segment_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Segment_2.h index c0d3142838ed..264965ecd3f9 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Segment_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Segment_2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class SegmentC2 { @@ -63,6 +63,6 @@ class SegmentC2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_SEGMENT_2_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Segment_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Segment_3.h index bae27d55af69..9ab9eb54cfa0 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Segment_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Segment_3.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class SegmentC3 @@ -215,6 +215,6 @@ collinear_has_on(const typename SegmentC3::Point_3 &p) const return collinear_are_ordered_along_line(source(), p, target()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_SEGMENT_3_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Sphere_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Sphere_3.h index c3362e4580cf..0ad9462ed2dd 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Sphere_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Sphere_3.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SphereC3 @@ -286,6 +286,6 @@ SphereC3::opposite() const CGAL::opposite(orientation()) ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_SPHERE_3_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Tetrahedron_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Tetrahedron_3.h index 023788be38ac..0845ff7d7a77 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Tetrahedron_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Tetrahedron_3.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class TetrahedronC3 @@ -217,6 +217,6 @@ TetrahedronC3::is_degenerate() const return orientation() == COPLANAR; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_TETRAHEDRON_3_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Translation_rep_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Translation_rep_2.h index 5d410b22c121..02223b0baaf4 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Translation_rep_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Translation_rep_2.h @@ -24,7 +24,7 @@ #ifndef CGAL_CARTESIAN_TRANSLATION_REP_2_H #define CGAL_CARTESIAN_TRANSLATION_REP_2_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R > class Translation_repC2 : public Aff_transformation_rep_baseC2 @@ -139,6 +139,6 @@ friend class Scaling_repC2; Vector_2 translationvector_; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_TRANSLATION_REP_2_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Translation_rep_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Translation_rep_3.h index 93f429c64e97..8da458e39853 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Translation_rep_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Translation_rep_3.h @@ -24,7 +24,7 @@ #ifndef CGAL_CARTESIAN_TRANSLATION_REP_3_H #define CGAL_CARTESIAN_TRANSLATION_REP_3_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R > class Translation_repC3 : public Aff_transformation_rep_baseC3 @@ -151,6 +151,6 @@ class Translation_repC3 : public Aff_transformation_rep_baseC3 Vector_3 translationvector_; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_TRANSLATION_REP_3_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Triangle_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Triangle_2.h index 0d49ec61e83d..41122319499d 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Triangle_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Triangle_2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class TriangleC2 @@ -69,6 +69,6 @@ class TriangleC2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_TRIANGLE_2_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Triangle_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Triangle_3.h index 69648428e315..111b2c485349 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Triangle_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Triangle_3.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class TriangleC3 @@ -140,6 +140,6 @@ TriangleC3::is_degenerate() const return collinear(vertex(0),vertex(1),vertex(2)); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_TRIANGLE_3_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Vector_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Vector_2.h index 36d3d4e0161c..e38614eb047c 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Vector_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Vector_2.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class VectorC2 @@ -147,6 +147,6 @@ operator!=(const Null_vector &n, const VectorC2 &v) return !(v == n); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_VECTOR_2_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h index f84189682149..d93d0433ee68 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class VectorC3 @@ -259,6 +259,6 @@ VectorC3::direction() const return Direction_3(*this); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_VECTOR_3_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/ft_constructions_2.h b/Cartesian_kernel/include/CGAL/Cartesian/ft_constructions_2.h index c848d59906ff..fbd4a67a2198 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/ft_constructions_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/ft_constructions_2.h @@ -24,7 +24,7 @@ #ifndef CGAL_CARTESIAN_FT_CONSTRUCTIONS_2_H #define CGAL_CARTESIAN_FT_CONSTRUCTIONS_2_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class K > inline @@ -70,6 +70,6 @@ line_x_at_y(const LineC2 &l, const typename K::FT &y) return line_y_at_xC2(l.b(), l.a(), l.c(), y); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_FT_CONSTRUCTIONS_2_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/ft_constructions_3.h b/Cartesian_kernel/include/CGAL/Cartesian/ft_constructions_3.h index b19431d07f64..f4f33df34503 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/ft_constructions_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/ft_constructions_3.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class K > inline @@ -64,6 +64,6 @@ scaled_distance_to_plane(const PointC3 &hp, p.x(), p.y(), p.z()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_FT_CONSTRUCTIONS_3_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/function_objects.h b/Cartesian_kernel/include/CGAL/Cartesian/function_objects.h index 66c18644bed8..8fc979705198 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/function_objects.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/function_objects.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace CartesianKernelFunctors { @@ -4044,6 +4044,6 @@ namespace CartesianKernelFunctors { } // namespace CartesianKernelFunctors -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_FUNCTION_OBJECTS_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/line_constructions_2.h b/Cartesian_kernel/include/CGAL/Cartesian/line_constructions_2.h index 4ab6cc7c6269..798abb435ff8 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/line_constructions_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/line_constructions_2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class K > inline @@ -49,6 +49,6 @@ perpendicular_through_point(const LineC2 &l, return LineC2(a, b, c); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_LINE_CONSTRUCTIONS_2_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/plane_constructions_3.h b/Cartesian_kernel/include/CGAL/Cartesian/plane_constructions_3.h index 08f89062c981..1b7892e32efc 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/plane_constructions_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/plane_constructions_3.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template CGAL_KERNEL_LARGE_INLINE @@ -56,6 +56,6 @@ plane_from_point_direction(const PointC3 &p, return PlaneC3(A, B, C, D); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_PLANE_CONSTRUCTIONS_3_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/point_constructions_2.h b/Cartesian_kernel/include/CGAL/Cartesian/point_constructions_2.h index 485d8b91943d..ef84def37931 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/point_constructions_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/point_constructions_2.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class K > inline @@ -49,6 +49,6 @@ line_project_point(const LineC2 &l, return PointC2(x, y); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_POINT_CONSTRUCTIONS_2_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/point_constructions_3.h b/Cartesian_kernel/include/CGAL/Cartesian/point_constructions_3.h index db0f329e061a..c880a8a6ee8b 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/point_constructions_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/point_constructions_3.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template CGAL_KERNEL_LARGE_INLINE @@ -52,6 +52,6 @@ projection_plane(const PointC3 &p, return PointC3(x, y, z); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_POINT_CONSTRUCTIONS_3_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_directions_2.h b/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_directions_2.h index b97b5cc77030..739cf89d199b 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_directions_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_directions_2.h @@ -24,7 +24,7 @@ #ifndef CGAL_CARTESIAN_PREDICATES_ON_DIRECTIONS_2_H #define CGAL_CARTESIAN_PREDICATES_ON_DIRECTIONS_2_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class K > inline @@ -44,6 +44,6 @@ compare_angle_with_x_axis(const DirectionC2 &d1, return K().compare_angle_with_x_axis_2_object()(d1, d2); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_PREDICATES_ON_DIRECTIONS_2_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_planes_3.h b/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_planes_3.h index 7a96732547af..05af1ba6a2f2 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_planes_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_planes_3.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class K > inline @@ -47,6 +47,6 @@ equal_plane(const PlaneC3 &h, const PlaneC3 &p) p.a(), p.b(), p.c(), p.d()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_PREDICATES_ON_PLANES_3_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_points_2.h b/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_points_2.h index 42cf16a2f20b..e662d1039d35 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_points_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_points_2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class K > inline @@ -60,6 +60,6 @@ compare_lexicographically_yx(const PointC2 &p, return compare_lexicographically_xyC2(p.y(), p.x(), q.y(), q.x()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_PREDICATES_ON_POINTS_2_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_points_3.h b/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_points_3.h index 6631c69ad1b0..0de9df816a20 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_points_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/predicates_on_points_3.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class K > inline @@ -98,6 +98,6 @@ dominance(const PointC3 &p, q.x(), q.y(), q.z()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_PREDICATES_ON_POINTS_3_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian/solve_3.h b/Cartesian_kernel/include/CGAL/Cartesian/solve_3.h index 43c65bfa1d64..36fa642945ea 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/solve_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/solve_3.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Cartesian_internal { @@ -47,6 +47,6 @@ void solve (const VectorC3 &v0, } // namespace Cartesian_internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_CARTESIAN_SOLVE_3_H diff --git a/Cartesian_kernel/include/CGAL/Cartesian_converter.h b/Cartesian_kernel/include/CGAL/Cartesian_converter.h index bb2c74790103..8275270d4542 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian_converter.h +++ b/Cartesian_kernel/include/CGAL/Cartesian_converter.h @@ -38,7 +38,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Guess which compiler needs this work around ? namespace internal { @@ -313,6 +313,6 @@ class Cartesian_converter const T& operator()(const T&t) const { return t; } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_CONVERTER_H diff --git a/Cartesian_kernel/include/CGAL/Simple_cartesian.h b/Cartesian_kernel/include/CGAL/Simple_cartesian.h index b0052fc390e4..13a6160d241c 100644 --- a/Cartesian_kernel/include/CGAL/Simple_cartesian.h +++ b/Cartesian_kernel/include/CGAL/Simple_cartesian.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename FT_, typename Kernel_ > struct Cartesian_base_no_ref_count @@ -59,6 +59,6 @@ struct Simple_cartesian Simple_cartesian > {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SIMPLE_CARTESIAN_H diff --git a/Cartesian_kernel/include/CGAL/constructions/kernel_ftC2.h b/Cartesian_kernel/include/CGAL/constructions/kernel_ftC2.h index 00e2b1b1a7ec..482b10d60143 100644 --- a/Cartesian_kernel/include/CGAL/constructions/kernel_ftC2.h +++ b/Cartesian_kernel/include/CGAL/constructions/kernel_ftC2.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class FT > CGAL_KERNEL_INLINE @@ -416,6 +416,6 @@ scaled_distance_to_lineC2( const FT &px, const FT &py, return determinant(px-rx, py-ry, qx-rx, qy-ry); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CONSTRUCTIONS_KERNEL_FTC2_H diff --git a/Cartesian_kernel/include/CGAL/constructions/kernel_ftC3.h b/Cartesian_kernel/include/CGAL/constructions/kernel_ftC3.h index d011c05be0cb..986af988388f 100644 --- a/Cartesian_kernel/include/CGAL/constructions/kernel_ftC3.h +++ b/Cartesian_kernel/include/CGAL/constructions/kernel_ftC3.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class FT > CGAL_KERNEL_INLINE @@ -401,6 +401,6 @@ squared_areaC3(const FT &px, const FT &py, const FT &pz, return (CGAL_NTS square(vx) + CGAL_NTS square(vy) + CGAL_NTS square(vz))/4; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CONSTRUCTIONS_KERNEL_FTC3_H diff --git a/Cartesian_kernel/include/CGAL/predicates/kernel_ftC2.h b/Cartesian_kernel/include/CGAL/predicates/kernel_ftC2.h index a9f79fd092ce..9042ecb169eb 100644 --- a/Cartesian_kernel/include/CGAL/predicates/kernel_ftC2.h +++ b/Cartesian_kernel/include/CGAL/predicates/kernel_ftC2.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class FT > inline @@ -606,6 +606,6 @@ side_of_oriented_lineC2(const FT &a, const FT &b, const FT &c, return CGAL_NTS sign(a*x+b*y+c); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PREDICATES_KERNEL_FTC2_H diff --git a/Cartesian_kernel/include/CGAL/predicates/kernel_ftC3.h b/Cartesian_kernel/include/CGAL/predicates/kernel_ftC3.h index c5d882ddbccc..f238bcea8592 100644 --- a/Cartesian_kernel/include/CGAL/predicates/kernel_ftC3.h +++ b/Cartesian_kernel/include/CGAL/predicates/kernel_ftC3.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class FT > inline @@ -532,6 +532,6 @@ has_smaller_signed_dist_to_planeC3( prx, pry, prz, px, py, pz, qx, qy, qz) == SMALLER; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PREDICATES_KERNEL_FTC3_H diff --git a/Circular_kernel_2/include/CGAL/Circular_arc_2.h b/Circular_kernel_2/include/CGAL/Circular_arc_2.h index ee2bed0cb129..08eed2e63d01 100644 --- a/Circular_kernel_2/include/CGAL/Circular_arc_2.h +++ b/Circular_kernel_2/include/CGAL/Circular_arc_2.h @@ -25,7 +25,7 @@ #ifndef CGAL_CIRCULAR_ARC_2_H #define CGAL_CIRCULAR_ARC_2_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Circular_arc_2 @@ -425,6 +425,6 @@ class Circular_arc_2 < Filtered_bbox_circular_kernel_2 < CK > > { -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CIRCULAR_ARC_2_H diff --git a/Circular_kernel_2/include/CGAL/Circular_arc_point_2.h b/Circular_kernel_2/include/CGAL/Circular_arc_point_2.h index b42867d59246..d90badb85403 100644 --- a/Circular_kernel_2/include/CGAL/Circular_arc_point_2.h +++ b/Circular_kernel_2/include/CGAL/Circular_arc_point_2.h @@ -25,7 +25,7 @@ #ifndef CGAL_CIRCULAR_ARC_POINT_2_H #define CGAL_CIRCULAR_ARC_POINT_2_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename CircularKernel > class Circular_arc_point_2 @@ -270,6 +270,6 @@ bool has_no_bbox() const }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CIRCULAR_ARC_POINT_2_H diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2.h index c6a9a822d96c..48b3cd9487d0 100644 --- a/Circular_kernel_2/include/CGAL/Circular_kernel_2.h +++ b/Circular_kernel_2/include/CGAL/Circular_kernel_2.h @@ -41,7 +41,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -95,6 +95,6 @@ struct Circular_kernel_2 > {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CIRCULAR_KERNEL_2_H diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h index 41839294265c..fd6f929d88cd 100644 --- a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h +++ b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h @@ -25,7 +25,7 @@ #ifndef CGAL_CIRCULAR_KERNEL_INTERNAL_FUNCTIONS_ON_CIRCLE_2_H #define CGAL_CIRCULAR_KERNEL_INTERNAL_FUNCTIONS_ON_CIRCLE_2_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { // temporary function : where to put it, if we want to keep it ? template< class CK> @@ -189,6 +189,6 @@ namespace CircularFunctors { } // namespace CircularFunctors -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CIRCULAR_KERNEL_INTERNAL_FUNCTIONS_ON_CIRCLE_2_H diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_converter.h b/Circular_kernel_2/include/CGAL/Circular_kernel_converter.h index ec37758825f6..4c0bd5b583d5 100644 --- a/Circular_kernel_2/include/CGAL/Circular_kernel_converter.h +++ b/Circular_kernel_2/include/CGAL/Circular_kernel_converter.h @@ -32,7 +32,7 @@ // TODO : // - we should have a better default than Cartesian_converter. -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class C1, class C2, class LK_converter = Cartesian_converter, @@ -227,6 +227,6 @@ class Circular_kernel_converter }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CCIRCULAR_KERNEL_CONVERTER_H diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_intersections.h b/Circular_kernel_2/include/CGAL/Circular_kernel_intersections.h index 7a55a079adb2..7b24b0a029c2 100644 --- a/Circular_kernel_2/include/CGAL/Circular_kernel_intersections.h +++ b/Circular_kernel_2/include/CGAL/Circular_kernel_intersections.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define CGAL_CIRCULAR_KERNEL_MACRO_GLOBAL_FUNCTION_INTERSECTION_(A,B) \ template < class OutputIterator, class K > \ @@ -96,6 +96,6 @@ CGAL_CIRCULAR_KERNEL_MACRO_GLOBAL_FUNCTION_INTERSECTION_(Line_2, Line_arc_2) CGAL_CIRCULAR_KERNEL_MACRO_GLOBAL_FUNCTION_INTERSECTION_(Circular_arc_2, Line_2) CGAL_CIRCULAR_KERNEL_MACRO_GLOBAL_FUNCTION_INTERSECTION_(Line_arc_2, Line_2) -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CIRCULAR_KERNEL_INTERSECTIONS_H diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_type_equality_wrapper.h b/Circular_kernel_2/include/CGAL/Circular_kernel_type_equality_wrapper.h index 86ed1079ad47..dd236732e469 100644 --- a/Circular_kernel_2/include/CGAL/Circular_kernel_type_equality_wrapper.h +++ b/Circular_kernel_2/include/CGAL/Circular_kernel_type_equality_wrapper.h @@ -34,7 +34,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // This is a kernel wrapper which provides the type equality between // Kernel::Point_2 and CGAL::Point_2, by deriving from @@ -58,6 +58,6 @@ struct Circular_kernel_type_equality_wrapper //typedef Root_of_2 Root_of_2; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CIRCULAR_KERNEL_TYPE_EQUALITY_WRAPPER_H diff --git a/Circular_kernel_2/include/CGAL/Exact_circular_kernel_2.h b/Circular_kernel_2/include/CGAL/Exact_circular_kernel_2.h index bd1bf666c86e..777b232e036c 100644 --- a/Circular_kernel_2/include/CGAL/Exact_circular_kernel_2.h +++ b/Circular_kernel_2/include/CGAL/Exact_circular_kernel_2.h @@ -45,7 +45,7 @@ //#include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -73,6 +73,6 @@ namespace internal { typedef Filtered_bbox_circular_kernel_2 Exact_circular_kernel_2; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_EXACT_CIRCULAR_2_KERNEL_H diff --git a/Circular_kernel_2/include/CGAL/Filtered_bbox_circular_kernel_2.h b/Circular_kernel_2/include/CGAL/Filtered_bbox_circular_kernel_2.h index 03b41c1a00f3..98f72703228a 100644 --- a/Circular_kernel_2/include/CGAL/Filtered_bbox_circular_kernel_2.h +++ b/Circular_kernel_2/include/CGAL/Filtered_bbox_circular_kernel_2.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -95,6 +95,6 @@ struct Filtered_bbox_circular_kernel_2 typedef Filtered_bbox_circular_kernel_2< CircularKernel > Self; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_FILTERED_BBOX_CIRCULAR_KERNEL_2_H diff --git a/Circular_kernel_2/include/CGAL/Filtered_bbox_circular_kernel_2/bbox_filtered_predicates.h b/Circular_kernel_2/include/CGAL/Filtered_bbox_circular_kernel_2/bbox_filtered_predicates.h index 1f67befedf0d..8860041b3627 100644 --- a/Circular_kernel_2/include/CGAL/Filtered_bbox_circular_kernel_2/bbox_filtered_predicates.h +++ b/Circular_kernel_2/include/CGAL/Filtered_bbox_circular_kernel_2/bbox_filtered_predicates.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Bbox_functors { @@ -1381,6 +1381,6 @@ class Construct_bbox_2 : public BK::Circular_kernel::Construct_bbox_2 } //Bbox_functors -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_BBOX_FILTERED_PREDICATES_H diff --git a/Circular_kernel_2/include/CGAL/Filtered_hexagon_circular_kernel_2.h b/Circular_kernel_2/include/CGAL/Filtered_hexagon_circular_kernel_2.h index c900660d0078..dd44c93bfbf5 100644 --- a/Circular_kernel_2/include/CGAL/Filtered_hexagon_circular_kernel_2.h +++ b/Circular_kernel_2/include/CGAL/Filtered_hexagon_circular_kernel_2.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Filtered_hexagon_circular_kernel_2 : public CK { @@ -164,6 +164,6 @@ template { return Is_vertical_2(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_FILTERED_HEXAGON_CIRCULAR_KERNEL_2_H diff --git a/Circular_kernel_2/include/CGAL/Filtered_hexagon_circular_kernel_2/Circular_arc_with_hexagon_2.h b/Circular_kernel_2/include/CGAL/Filtered_hexagon_circular_kernel_2/Circular_arc_with_hexagon_2.h index 4c86418374cb..53b4e548c40c 100644 --- a/Circular_kernel_2/include/CGAL/Filtered_hexagon_circular_kernel_2/Circular_arc_with_hexagon_2.h +++ b/Circular_kernel_2/include/CGAL/Filtered_hexagon_circular_kernel_2/Circular_arc_with_hexagon_2.h @@ -33,7 +33,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class HK, @@ -256,6 +256,6 @@ class Circular_arc_with_hexagon_2 { << " ]]" << std::endl; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CIRCULAR_ARC_WITH_HEXAGON_2_H diff --git a/Circular_kernel_2/include/CGAL/Filtered_hexagon_circular_kernel_2/Line_arc_with_hexagon_2.h b/Circular_kernel_2/include/CGAL/Filtered_hexagon_circular_kernel_2/Line_arc_with_hexagon_2.h index d1b3035aeeb9..ac0b14f72729 100644 --- a/Circular_kernel_2/include/CGAL/Filtered_hexagon_circular_kernel_2/Line_arc_with_hexagon_2.h +++ b/Circular_kernel_2/include/CGAL/Filtered_hexagon_circular_kernel_2/Line_arc_with_hexagon_2.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class HK > class Line_arc_with_hexagon_2 { @@ -212,6 +212,6 @@ class Line_arc_with_hexagon_2 { return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LINE_ARC_WITH_HEXAGON_2_H diff --git a/Circular_kernel_2/include/CGAL/Filtered_hexagon_circular_kernel_2/hexagon_filtered_predicates.h b/Circular_kernel_2/include/CGAL/Filtered_hexagon_circular_kernel_2/hexagon_filtered_predicates.h index 20d59492a08b..3e0b589b4859 100644 --- a/Circular_kernel_2/include/CGAL/Filtered_hexagon_circular_kernel_2/hexagon_filtered_predicates.h +++ b/Circular_kernel_2/include/CGAL/Filtered_hexagon_circular_kernel_2/hexagon_filtered_predicates.h @@ -34,7 +34,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Hexagon_functors { @@ -703,6 +703,6 @@ class Do_overlap_2 } //Hexagon_functors -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HEXAGON_FILTERED_PREDICATES_H diff --git a/Circular_kernel_2/include/CGAL/IO/Dxf_reader.h b/Circular_kernel_2/include/CGAL/IO/Dxf_reader.h index f7458359752a..8ac66cf1b4a3 100644 --- a/Circular_kernel_2/include/CGAL/IO/Dxf_reader.h +++ b/Circular_kernel_2/include/CGAL/IO/Dxf_reader.h @@ -34,7 +34,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Dxf_reader { @@ -300,6 +300,6 @@ void operator()(std::istream& is, Polygons& polygons, Centers_and_radii& car) } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_DXF_READER_H diff --git a/Circular_kernel_2/include/CGAL/IO/Dxf_reader_doubles.h b/Circular_kernel_2/include/CGAL/IO/Dxf_reader_doubles.h index 8b13f8653356..f9da0f3ce263 100644 --- a/Circular_kernel_2/include/CGAL/IO/Dxf_reader_doubles.h +++ b/Circular_kernel_2/include/CGAL/IO/Dxf_reader_doubles.h @@ -36,7 +36,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Dxf_reader_doubles { @@ -238,6 +238,6 @@ void operator()(std::istream& is, Polygons& polygons, Circles& circles) }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_DXF_READER_DOUBLES_H diff --git a/Circular_kernel_2/include/CGAL/Lazy_circular_kernel_2.h b/Circular_kernel_2/include/CGAL/Lazy_circular_kernel_2.h index 7551abdf5603..42a7aa99882b 100644 --- a/Circular_kernel_2/include/CGAL/Lazy_circular_kernel_2.h +++ b/Circular_kernel_2/include/CGAL/Lazy_circular_kernel_2.h @@ -41,7 +41,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Some specializations (move to another file ?) template < typename K1, typename K2 > @@ -210,6 +210,6 @@ struct Lazy_circular_kernel_2 Lazy_circular_kernel_2 > {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LAZY_CIRCULAR_KERNEL_H diff --git a/Circular_kernel_2/include/CGAL/Lazy_circular_kernel_constructions.h b/Circular_kernel_2/include/CGAL/Lazy_circular_kernel_constructions.h index f1f5b0b229dc..c313ddacb829 100644 --- a/Circular_kernel_2/include/CGAL/Lazy_circular_kernel_constructions.h +++ b/Circular_kernel_2/include/CGAL/Lazy_circular_kernel_constructions.h @@ -31,7 +31,7 @@ //TODO : More if-else's with object cast for all the possible // types that could be returned by object-returning functions -CGAL_BEGIN_NAMESPACE +namespace CGAL { template Object @@ -407,6 +407,6 @@ template }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LAZY_CIRCULAR_KERNEL_CONSTRUCTIONS_H diff --git a/Circular_kernel_2/include/CGAL/Line_arc_2.h b/Circular_kernel_2/include/CGAL/Line_arc_2.h index 2d605eeb1c31..15969dcf6ecb 100644 --- a/Circular_kernel_2/include/CGAL/Line_arc_2.h +++ b/Circular_kernel_2/include/CGAL/Line_arc_2.h @@ -25,7 +25,7 @@ #ifndef CGAL_LINE_ARC_2_H #define CGAL_LINE_ARC_2_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Line_arc_2 @@ -323,7 +323,7 @@ class Line_arc_2 < Filtered_bbox_circular_kernel_2 < CK > > { }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LINE_ARC_2_H diff --git a/Circular_kernel_2/include/CGAL/Simple_circular_kernel_2.h b/Circular_kernel_2/include/CGAL/Simple_circular_kernel_2.h index 5b9a970eb1a8..129721d4090d 100644 --- a/Circular_kernel_2/include/CGAL/Simple_circular_kernel_2.h +++ b/Circular_kernel_2/include/CGAL/Simple_circular_kernel_2.h @@ -41,7 +41,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -92,6 +92,6 @@ struct Circular_kernel_2 > {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SIMPLE_CIRCULAR_KERNEL_2_H diff --git a/Circular_kernel_2/include/CGAL/global_functions_circular_kernel_2.h b/Circular_kernel_2/include/CGAL/global_functions_circular_kernel_2.h index e1c1583804e2..c5b2b8d0f52f 100644 --- a/Circular_kernel_2/include/CGAL/global_functions_circular_kernel_2.h +++ b/Circular_kernel_2/include/CGAL/global_functions_circular_kernel_2.h @@ -33,7 +33,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template Circular_arc_point_2 @@ -185,6 +185,6 @@ make_xy_monotone(const Line_arc_2 &A, OutputIterator it) return CK().make_xy_monotone_2_object()(A, it); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CIRCULAR_KERNEL_GLOBAL_FUNCTIONS_CIRCULAR_KERNEL_2_H diff --git a/Circular_kernel_3/include/CGAL/Exact_spherical_kernel_3.h b/Circular_kernel_3/include/CGAL/Exact_spherical_kernel_3.h index 915b94c73373..24ea9a54ec4d 100644 --- a/Circular_kernel_3/include/CGAL/Exact_spherical_kernel_3.h +++ b/Circular_kernel_3/include/CGAL/Exact_spherical_kernel_3.h @@ -35,7 +35,7 @@ # include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { #ifdef CGAL_USE_GMP @@ -48,6 +48,6 @@ CGAL_BEGIN_NAMESPACE typedef CGAL::Algebraic_kernel_for_spheres_2_3 Algebraic_k1; typedef CGAL::Spherical_kernel_3 Exact_spherical_kernel_3; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_EXACT_SPHERICAL_3_KERNEL_H diff --git a/Circular_kernel_3/include/CGAL/Spherical_kernel_intersections.h b/Circular_kernel_3/include/CGAL/Spherical_kernel_intersections.h index 8350a9ed0ac4..80d3f4648110 100644 --- a/Circular_kernel_3/include/CGAL/Spherical_kernel_intersections.h +++ b/Circular_kernel_3/include/CGAL/Spherical_kernel_intersections.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define CGAL_SPHERICAL_KERNEL_MACRO_GLOBAL_FUNCTION_INTERSECTION_2_(A,B) \ template < class OutputIterator, class K > \ @@ -99,6 +99,6 @@ CGAL_SPHERICAL_KERNEL_MACRO_GLOBAL_FUNCTION_INTERSECTION_2_(Circular_arc_3, Plan CGAL_SPHERICAL_KERNEL_MACRO_GLOBAL_FUNCTION_INTERSECTION_2_(Circular_arc_3, Line_arc_3) CGAL_SPHERICAL_KERNEL_MACRO_GLOBAL_FUNCTION_INTERSECTION_2_(Line_arc_3, Circular_arc_3) -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SPHERICAL_KERNEL_INTERNAL_FUNCTIONS_ON_INTERSECTION_3_H diff --git a/Circular_kernel_3/include/CGAL/global_functions_spherical_kernel_3.h b/Circular_kernel_3/include/CGAL/global_functions_spherical_kernel_3.h index 8798e5e1fddd..7c66bd09228b 100644 --- a/Circular_kernel_3/include/CGAL/global_functions_spherical_kernel_3.h +++ b/Circular_kernel_3/include/CGAL/global_functions_spherical_kernel_3.h @@ -27,7 +27,7 @@ #define CGAL_SPHERICAL_KERNEL_GLOBAL_FUNCTIONS_CIRCULAR_KERNEL_3_H // global functions -CGAL_BEGIN_NAMESPACE +namespace CGAL { template Circular_arc_point_3 @@ -216,6 +216,6 @@ theta_extremal_points(const Circle_3& circle,const Sphere_3& sphere,Outp return SphericalFunctors::theta_extremal_points(circle,sphere,out_it); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SPHERICAL_KERNEL_GLOBAL_FUNCTIONS_CIRCULAR_KERNEL_3_H diff --git a/Circulator/include/CGAL/Safe_circulator_from_iterator.h b/Circulator/include/CGAL/Safe_circulator_from_iterator.h index fabdcfd24722..7c402e8a1a18 100644 --- a/Circulator/include/CGAL/Safe_circulator_from_iterator.h +++ b/Circulator/include/CGAL/Safe_circulator_from_iterator.h @@ -31,7 +31,7 @@ #include "boost/optional.hpp" -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Note: Tt, Ss, and Dd are here for backwards compatibility, they are @@ -210,7 +210,7 @@ operator+( D n, const return tmp += Dist(n); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CIRCULATOR_H // // EOF // diff --git a/Circulator/include/CGAL/circulator.h b/Circulator/include/CGAL/circulator.h index 99fe22b22e04..d6023c69e5a5 100644 --- a/Circulator/include/CGAL/circulator.h +++ b/Circulator/include/CGAL/circulator.h @@ -69,7 +69,7 @@ -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct I_Circulator_traits { @@ -1113,6 +1113,6 @@ operator+( D n, const return tmp += Dist(n); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CIRCULATOR_H // diff --git a/Circulator/include/CGAL/circulator_bases.h b/Circulator/include/CGAL/circulator_bases.h index 75916c4274af..025c32e12997 100644 --- a/Circulator/include/CGAL/circulator_bases.h +++ b/Circulator/include/CGAL/circulator_bases.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { struct Circulator_tag {}; // any circulator. struct Iterator_tag {}; // any iterator. @@ -128,7 +128,7 @@ class Random_access_circulator_ptrbase // random access circulator. Random_access_circulator_ptrbase(void* p) : _ptr(p) {} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CIRCULATOR_BASES_H // // EOF // diff --git a/Circulator/include/CGAL/circulator_impl.h b/Circulator/include/CGAL/circulator_impl.h index e5fbeeb6b9d6..59e7f9667bc5 100644 --- a/Circulator/include/CGAL/circulator_impl.h +++ b/Circulator/include/CGAL/circulator_impl.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class S> class Forward_circulator_over_struct @@ -683,7 +683,7 @@ operator+=( I n) { return *this; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CIRCULATOR_IMPL_H // // EOF // diff --git a/Conic_2/include/CGAL/ConicCPA2.h b/Conic_2/include/CGAL/ConicCPA2.h index 8e01c322db60..21a4a1f12396 100644 --- a/Conic_2/include/CGAL/ConicCPA2.h +++ b/Conic_2/include/CGAL/ConicCPA2.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class PT, class DA> class ConicCPA2; @@ -625,7 +625,7 @@ std::istream& operator >> ( std::istream& is, ConicCPA2<_PT,_DA>& c) } #endif // CGAL_NO_OSTREAM_INSERT_CONICCPA2 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CONICCPA2_H diff --git a/Conic_2/include/CGAL/ConicHPA2.h b/Conic_2/include/CGAL/ConicHPA2.h index 86fd8e7394a5..3b921831fd32 100644 --- a/Conic_2/include/CGAL/ConicHPA2.h +++ b/Conic_2/include/CGAL/ConicHPA2.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class PT, class DA> class ConicHPA2; @@ -627,7 +627,7 @@ std::istream& operator >> ( std::istream& is, ConicHPA2<_PT,_DA>& c) } #endif // CGAL_NO_OSTREAM_INSERT_CONICHPA2 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CONICHPA2_H diff --git a/Conic_2/include/CGAL/Conic_2.h b/Conic_2/include/CGAL/Conic_2.h index c30f75d43398..7ac34ff0a719 100644 --- a/Conic_2/include/CGAL/Conic_2.h +++ b/Conic_2/include/CGAL/Conic_2.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class Optimisation_ellipse_2; @@ -303,7 +303,7 @@ std::ostream& operator << ( std::ostream& os, const Conic_2& c) } #endif // CGAL_NO_OSTREAM_INSERT_CONIC_2 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CONIC_2_H diff --git a/Conic_2/include/CGAL/Conic_misc.h b/Conic_2/include/CGAL/Conic_misc.h index 8a3bf2ec6478..1874161d74ba 100644 --- a/Conic_2/include/CGAL/Conic_misc.h +++ b/Conic_2/include/CGAL/Conic_misc.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R> class Conic_2; @@ -153,7 +153,7 @@ int solve_cubic (NT c3, NT c2, NT c1, NT c0, -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CONIC_MISC_H diff --git a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Edge_sorter.h b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Edge_sorter.h index 67113d6dc798..bb583126b1de 100644 --- a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Edge_sorter.h +++ b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Edge_sorter.h @@ -29,7 +29,7 @@ #define CGAL_NEF_DEBUG 547 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Compare_halfedges_in_reflex_edge_sorter @@ -272,5 +272,5 @@ template } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_CD3_EDGE_SORTER_H diff --git a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/External_structure_builder.h b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/External_structure_builder.h index 0fca0ebb22c3..a16d31dbbfce 100644 --- a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/External_structure_builder.h +++ b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/External_structure_builder.h @@ -27,7 +27,7 @@ #define CGAL_NEF_DEBUG 43 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class External_structure_builder : public Modifier_base { @@ -138,5 +138,5 @@ class External_structure_builder : public Modifier_base -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Insert_vertex_into_edge { @@ -73,5 +73,5 @@ class Insert_vertex_into_edge { }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CD3_INSERT_VERTEX_INTO_EDGE_H diff --git a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Ray_hit_generator.h b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Ray_hit_generator.h index db517916d7d6..ac55130bb14c 100644 --- a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Ray_hit_generator.h +++ b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Ray_hit_generator.h @@ -27,7 +27,7 @@ #define CGAL_NEF_DEBUG 233 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Ray_hit_generator : public Modifier_base { @@ -176,5 +176,5 @@ class Ray_hit_generator : public Modifier_base { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_CD3_RAY_HIT_GENERATOR_H diff --git a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Ray_hit_generator2.h b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Ray_hit_generator2.h index 5805cf312049..ebb754f88c25 100644 --- a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Ray_hit_generator2.h +++ b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Ray_hit_generator2.h @@ -27,7 +27,7 @@ #define CGAL_NEF_DEBUG 233 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Ray_hit_generator2 : public Modifier_base { @@ -209,5 +209,5 @@ class Ray_hit_generator2 : public Modifier_base { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_CD3_RAY_HIT_GENERATOR2_H diff --git a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Reflex_edge_searcher.h b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Reflex_edge_searcher.h index 3d68066ac3c7..cc6227e7d624 100644 --- a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Reflex_edge_searcher.h +++ b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Reflex_edge_searcher.h @@ -22,7 +22,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Reflex_edge_searcher : public Modifier_base { @@ -129,5 +129,5 @@ class Reflex_edge_searcher : public Modifier_base Negative_reflex_edge_iterator negative_redges_end() { return neg.end(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CD3_REFLEX_EDGE_SEARCHER_H diff --git a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Reflex_vertex_searcher.h b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Reflex_vertex_searcher.h index 6fe9f2485f34..8eb6e8702041 100644 --- a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Reflex_vertex_searcher.h +++ b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Reflex_vertex_searcher.h @@ -25,7 +25,7 @@ #define CGAL_NEF_DEBUG 229 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Reflex_vertex_searcher : public Modifier_base { @@ -215,5 +215,5 @@ class Reflex_vertex_searcher : public Modifier_base #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SFace_separator : public Modifier_base { @@ -82,5 +82,5 @@ class SFace_separator : public Modifier_base { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_CD3_SFACE_SEPARATOR_H diff --git a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/SM_walls.h b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/SM_walls.h index bf758ffe3739..b143580021c4 100644 --- a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/SM_walls.h +++ b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/SM_walls.h @@ -23,7 +23,7 @@ #define CGAL_NEF_DEBUG 227 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SM_walls : SM_decorator { @@ -582,5 +582,5 @@ class SM_walls : SM_decorator { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_CD3_SM_WALLS_H diff --git a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Single_wall_creator.h b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Single_wall_creator.h index 93d70a7cccf1..6e2d70ad249b 100644 --- a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Single_wall_creator.h +++ b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Single_wall_creator.h @@ -27,7 +27,7 @@ #define CGAL_NEF_DEBUG 229 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Single_wall_creator : public Modifier_base { @@ -369,5 +369,5 @@ class Single_wall_creator : public Modifier_base { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_CD3_SINGLE_WALL_CREATOR_H diff --git a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Single_wall_creator2.h b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Single_wall_creator2.h index 74ce73e01ed6..04dc7b1cd5db 100644 --- a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Single_wall_creator2.h +++ b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Single_wall_creator2.h @@ -28,7 +28,7 @@ #define CGAL_NEF_DEBUG 229 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Single_wall_creator2 : public Modifier_base { @@ -194,5 +194,5 @@ class Single_wall_creator2 : public Modifier_base { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_CD3_SINGLE_WALL_CREATOR2_H diff --git a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Single_wall_creator3.h b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Single_wall_creator3.h index 943c834ff672..447ac5523cad 100644 --- a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Single_wall_creator3.h +++ b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Single_wall_creator3.h @@ -28,7 +28,7 @@ #define CGAL_NEF_DEBUG 229 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Single_wall_creator3 : public Modifier_base { @@ -204,5 +204,5 @@ class Single_wall_creator3 : public Modifier_base { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_CD3_SINGLE_WALL_CREATOR3_H diff --git a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/YVertical_wall_builder.h b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/YVertical_wall_builder.h index 5335fa03bfe2..f36ad7b13ee0 100644 --- a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/YVertical_wall_builder.h +++ b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/YVertical_wall_builder.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class YVertical_wall_builder : public Modifier_base { @@ -108,5 +108,5 @@ class YVertical_wall_builder : public Modifier_base { Vertical_redge_iterator redges_end() { return redges.end(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CD3_YVERTICAL_WALL_BUILDER_H diff --git a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/is_reflex_sedge.h b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/is_reflex_sedge.h index 186c68ca4a67..5779c00062ae 100644 --- a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/is_reflex_sedge.h +++ b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/is_reflex_sedge.h @@ -23,7 +23,7 @@ #define CGAL_NEF_DEBUG 239 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /* int is_reflex_edge(Halfedge_handle e) { @@ -164,5 +164,5 @@ int is_reflex_sedge(typename SNC_structure::SHalfedge_handle se, return result; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CD3_IS_REFLEX_SEDGE_H diff --git a/Convex_decomposition_3/include/CGAL/convex_decomposition_3.h b/Convex_decomposition_3/include/CGAL/convex_decomposition_3.h index 0e277007be5e..862fe1dfe57a 100644 --- a/Convex_decomposition_3/include/CGAL/convex_decomposition_3.h +++ b/Convex_decomposition_3/include/CGAL/convex_decomposition_3.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void convex_decomposition_3(Nef_polyhedron& N) @@ -159,5 +159,5 @@ void convex_decomposition_3(Nef_polyhedron& N) CGAL_assertion(!CGAL::is_reflex_sedge_in_any_direction(cse))); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CONVEX_DECOMPOSITION_3_H diff --git a/Convex_hull_2/examples/Convex_hull_2/include/CGAL/ch_timing_2.h b/Convex_hull_2/examples/Convex_hull_2/include/CGAL/ch_timing_2.h index d97c2aa5a052..a21a676a52ae 100644 --- a/Convex_hull_2/examples/Convex_hull_2/include/CGAL/ch_timing_2.h +++ b/Convex_hull_2/examples/Convex_hull_2/include/CGAL/ch_timing_2.h @@ -9,7 +9,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void @@ -18,7 +18,7 @@ ch_timing( ForwardIterator first, ForwardIterator last, int iterations, const Traits& ch_traits); -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Convex_hull_2/examples/Convex_hull_2/include/CGAL/ch_timing_2_impl.h b/Convex_hull_2/examples/Convex_hull_2/include/CGAL/ch_timing_2_impl.h index 0555ff1e2d07..a496ba84d998 100644 --- a/Convex_hull_2/examples/Convex_hull_2/include/CGAL/ch_timing_2_impl.h +++ b/Convex_hull_2/examples/Convex_hull_2/include/CGAL/ch_timing_2_impl.h @@ -9,7 +9,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void @@ -108,6 +108,6 @@ ch_timing( ForwardIterator first, ForwardIterator last, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CH_TIMING_2_IMPL_H diff --git a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_akl_toussaint_impl.h b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_akl_toussaint_impl.h index 3e308da6f396..7e75eee7c843 100644 --- a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_akl_toussaint_impl.h +++ b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_akl_toussaint_impl.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template OutputIterator @@ -146,6 +146,6 @@ ch_akl_toussaint(ForwardIterator first, ForwardIterator last, #endif // no postconditions ... } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CH_AKL_TOUSSAINT_C diff --git a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_bykat_impl.h b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_bykat_impl.h index 409713104f20..dcbea40335b6 100644 --- a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_bykat_impl.h +++ b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_bykat_impl.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template OutputIterator ch_bykat(InputIterator first, InputIterator last, @@ -246,6 +246,6 @@ ch_bykat_with_threshold(InputIterator first, InputIterator last, #endif // no postconditions ... } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CH_BYKAT_C diff --git a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_eddy_impl.h b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_eddy_impl.h index ebe5d3c37b36..d3277a183131 100644 --- a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_eddy_impl.h +++ b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_eddy_impl.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void @@ -135,6 +135,6 @@ ch_eddy(InputIterator first, InputIterator last, return std::copy( L.begin(), w, result ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CH_EDDY_C diff --git a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h index 2b96b2c0bfdb..dbbab0842614 100644 --- a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h +++ b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template OutputIterator @@ -312,6 +312,6 @@ ch_upper_hull_scan( InputIterator first, return res.to_output_iterator(); #endif // no postconditions ... } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CH_GRAHAM_ANDREW_C diff --git a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_jarvis_impl.h b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_jarvis_impl.h index a23adde8c720..5b157dc60949 100644 --- a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_jarvis_impl.h +++ b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_jarvis_impl.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -114,6 +114,6 @@ ch_jarvis(ForwardIterator first, ForwardIterator last, return ch_jarvis_march( first, last, *start, *start, result, ch_traits); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CH_JARVIS_C diff --git a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_melkman_impl.h b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_melkman_impl.h index 4a2a48bf230e..173a3f12f3c8 100644 --- a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_melkman_impl.h +++ b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_melkman_impl.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template OutputIterator @@ -124,6 +124,6 @@ ch_melkman( InputIterator first, InputIterator last, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CH_MELKMAN_IMPL_H diff --git a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_selected_extreme_points_2_impl.h b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_selected_extreme_points_2_impl.h index 84f81176cd1d..9c554aa91f7e 100644 --- a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_selected_extreme_points_2_impl.h +++ b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_selected_extreme_points_2_impl.h @@ -25,7 +25,7 @@ #include #endif // CGAL_CH_NO_POSTCONDITIONS -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void ch_nswe_point( ForwardIterator first, ForwardIterator last, @@ -150,6 +150,6 @@ ch_w_point( ForwardIterator first, ForwardIterator last, ++first; } } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CH_SELECTED_EXTREME_POINTS_2_C diff --git a/Convex_hull_2/include/CGAL/Convex_hull_2/convexity_check_2_impl.h b/Convex_hull_2/include/CGAL/Convex_hull_2/convexity_check_2_impl.h index f833993efab1..b29681f595be 100644 --- a/Convex_hull_2/include/CGAL/Convex_hull_2/convexity_check_2_impl.h +++ b/Convex_hull_2/include/CGAL/Convex_hull_2/convexity_check_2_impl.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template bool @@ -215,6 +215,6 @@ ch_brute_force_chain_check_2(ForwardIterator1 first1, return true; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CONVEXITY_CHECK_2_C diff --git a/Convex_hull_2/include/CGAL/IO/Tee_for_output_iterator.h b/Convex_hull_2/include/CGAL/IO/Tee_for_output_iterator.h index 10a04b7ece5a..e27b7b00aeee 100644 --- a/Convex_hull_2/include/CGAL/IO/Tee_for_output_iterator.h +++ b/Convex_hull_2/include/CGAL/IO/Tee_for_output_iterator.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class _Tee_for_output_iterator_rep; template @@ -99,6 +99,6 @@ class _Tee_for_output_iterator_rep : public Rep std::vector output_so_far; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_TEE_FOR_OUTPUT_ITERATOR_H diff --git a/Convex_hull_2/include/CGAL/ch_akl_toussaint.h b/Convex_hull_2/include/CGAL/ch_akl_toussaint.h index 07f85a8ec11d..d588f1a75111 100644 --- a/Convex_hull_2/include/CGAL/ch_akl_toussaint.h +++ b/Convex_hull_2/include/CGAL/ch_akl_toussaint.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // same as |convex_hull_2(first,last,result)|. // {\sc traits}: operates on |Traits::Point_2| using |Traits::Less_xy_2|, @@ -48,7 +48,7 @@ ch_akl_toussaint(ForwardIterator first, ForwardIterator last, return ch_akl_toussaint( first, last, result, Kernel()); } -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Convex_hull_2/include/CGAL/ch_bykat.h b/Convex_hull_2/include/CGAL/ch_bykat.h index 26564b7af484..05f54a716a1e 100644 --- a/Convex_hull_2/include/CGAL/ch_bykat.h +++ b/Convex_hull_2/include/CGAL/ch_bykat.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // same as |convex_hull_2(first,last,result)|. {\sc traits}: // uses |Traits::Point_2|, |Traits::Less_signed_distance_to_line_2|, @@ -67,7 +67,7 @@ ch_bykat_with_threshold(InputIterator first, InputIterator last, return ch_bykat_with_threshold( first, last, result, Kernel()); } -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Convex_hull_2/include/CGAL/ch_eddy.h b/Convex_hull_2/include/CGAL/ch_eddy.h index 3c25cdc7103f..221ea7e68fc7 100644 --- a/Convex_hull_2/include/CGAL/ch_eddy.h +++ b/Convex_hull_2/include/CGAL/ch_eddy.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // same as |convex_hull_2(first,last,result)|. {\sc traits}: uses // |Traits::Point_2|, |Traits::Less_signed_distance_to_line_2|, @@ -47,7 +47,7 @@ ch_eddy(InputIterator first, InputIterator last, OutputIterator result) return ch_eddy( first, last, result, Kernel()); } -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Convex_hull_2/include/CGAL/ch_function_objects_2.h b/Convex_hull_2/include/CGAL/ch_function_objects_2.h index d60bf0742911..a0dfdeffa3a0 100644 --- a/Convex_hull_2/include/CGAL/ch_function_objects_2.h +++ b/Convex_hull_2/include/CGAL/ch_function_objects_2.h @@ -20,7 +20,7 @@ #ifndef CGAL_CH_FUNCTION_OBJECTS_2_H #define CGAL_CH_FUNCTION_OBJECTS_2_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -66,6 +66,6 @@ class r_Less_dist_to_line } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CH_FUNCTION_OBJECTS_2_H diff --git a/Convex_hull_2/include/CGAL/ch_graham_andrew.h b/Convex_hull_2/include/CGAL/ch_graham_andrew.h index 4d2190fd7443..2fbff0672475 100644 --- a/Convex_hull_2/include/CGAL/ch_graham_andrew.h +++ b/Convex_hull_2/include/CGAL/ch_graham_andrew.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // computes the sorted sequence of extreme points which are not left // of $pq$ and reports this sequence in a range starting at |result|, @@ -105,7 +105,7 @@ ch_upper_hull_scan( InputIterator first, OutputIterator result, const Traits& ch_traits); -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Convex_hull_2/include/CGAL/ch_jarvis.h b/Convex_hull_2/include/CGAL/ch_jarvis.h index a61de6a826c4..53dccf03a20f 100644 --- a/Convex_hull_2/include/CGAL/ch_jarvis.h +++ b/Convex_hull_2/include/CGAL/ch_jarvis.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // generates the counterclockwise ordered subsequence of // extreme points between |start_p| and |stop_p| of the points in the @@ -81,7 +81,7 @@ ch_jarvis(ForwardIterator first, ForwardIterator last, OutputIterator result) -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Convex_hull_2/include/CGAL/ch_melkman.h b/Convex_hull_2/include/CGAL/ch_melkman.h index df4ba69226dd..260f0b75343e 100644 --- a/Convex_hull_2/include/CGAL/ch_melkman.h +++ b/Convex_hull_2/include/CGAL/ch_melkman.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template OutputIterator @@ -43,7 +43,7 @@ ch_melkman( InputIterator first, InputIterator last, OutputIterator result) return ch_melkman( first, last, result, Kernel()); } -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Convex_hull_2/include/CGAL/ch_selected_extreme_points_2.h b/Convex_hull_2/include/CGAL/ch_selected_extreme_points_2.h index 1c173ddc2d41..b1dc8b78b928 100644 --- a/Convex_hull_2/include/CGAL/ch_selected_extreme_points_2.h +++ b/Convex_hull_2/include/CGAL/ch_selected_extreme_points_2.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // traverses the range [|first|,|last|). After execution, the value of |n| is @@ -206,7 +206,7 @@ ch_w_point( ForwardIterator first, ForwardIterator last, ForwardIterator& w) ch_w_point(first, last, w, Kernel()); } -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Convex_hull_2/include/CGAL/convex_hull_2.h b/Convex_hull_2/include/CGAL/convex_hull_2.h index 232288b45064..8d677915a55d 100644 --- a/Convex_hull_2/include/CGAL/convex_hull_2.h +++ b/Convex_hull_2/include/CGAL/convex_hull_2.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template inline @@ -188,6 +188,6 @@ upper_hull_points_2(ForwardIterator first, ForwardIterator last, return upper_hull_points_2(first, last, result, Kernel()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CONVEX_HULL_2_H diff --git a/Convex_hull_2/include/CGAL/convex_hull_constructive_traits_2.h b/Convex_hull_2/include/CGAL/convex_hull_constructive_traits_2.h index 18677185d972..9020cc763838 100644 --- a/Convex_hull_2/include/CGAL/convex_hull_constructive_traits_2.h +++ b/Convex_hull_2/include/CGAL/convex_hull_constructive_traits_2.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Convex_hull_constructive_traits_2 : public K_ { @@ -75,6 +75,6 @@ class convex_hull_constructive_traits_2 : { }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CONVEX_HULL_CONSTRUCTIVE_TRAITS_2_H diff --git a/Convex_hull_2/include/CGAL/convex_hull_traits_2.h b/Convex_hull_2/include/CGAL/convex_hull_traits_2.h index 2a95f5b7febd..256174b51f0d 100644 --- a/Convex_hull_2/include/CGAL/convex_hull_traits_2.h +++ b/Convex_hull_2/include/CGAL/convex_hull_traits_2.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Convex_hull_traits_2 : public K_ @@ -75,6 +75,6 @@ template class convex_hull_traits_2 : public Convex_hull_traits_2 {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CONVEX_HULL_TRAITS_2_H diff --git a/Convex_hull_2/include/CGAL/convexity_check_2.h b/Convex_hull_2/include/CGAL/convexity_check_2.h index 32626c785014..e48d77b24ea5 100644 --- a/Convex_hull_2/include/CGAL/convexity_check_2.h +++ b/Convex_hull_2/include/CGAL/convexity_check_2.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // returns true, if the point elements in [|first|,|last|) form a // counterclockwise oriented strongly convex polygon. Strongly means, @@ -122,7 +122,7 @@ ch_brute_force_chain_check_2(ForwardIterator1 first1, ForwardIterator1 last1, Kernel()); } -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Convex_hull_2/test/Convex_hull_2/include/CGAL/_test_fct_ch_I_2.h b/Convex_hull_2/test/Convex_hull_2/include/CGAL/_test_fct_ch_I_2.h index 699e01b1b2e9..94d2e512655f 100644 --- a/Convex_hull_2/test/Convex_hull_2/include/CGAL/_test_fct_ch_I_2.h +++ b/Convex_hull_2/test/Convex_hull_2/include/CGAL/_test_fct_ch_I_2.h @@ -25,13 +25,13 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template bool ch__batch_test( const Traits& chI ); -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Convex_hull_2/test/Convex_hull_2/include/CGAL/_test_fct_ch_I_2_impl.h b/Convex_hull_2/test/Convex_hull_2/include/CGAL/_test_fct_ch_I_2_impl.h index 6a36603d5cd3..13fc0f1b16a8 100644 --- a/Convex_hull_2/test/Convex_hull_2/include/CGAL/_test_fct_ch_I_2_impl.h +++ b/Convex_hull_2/test/Convex_hull_2/include/CGAL/_test_fct_ch_I_2_impl.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template bool @@ -132,6 +132,6 @@ ch__batch_test( const Traits& chI ) return true; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // _TEST_FCT_CH_I_2_IMPL_H diff --git a/Convex_hull_2/test/Convex_hull_2/include/CGAL/ch__test.h b/Convex_hull_2/test/Convex_hull_2/include/CGAL/ch__test.h index 3ee36750c603..6074d0fc7c85 100644 --- a/Convex_hull_2/test/Convex_hull_2/include/CGAL/ch__test.h +++ b/Convex_hull_2/test/Convex_hull_2/include/CGAL/ch__test.h @@ -31,7 +31,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { enum ch_Algorithm{ ch_JARVIS, ch_GRAHAM_ANDREW, @@ -67,7 +67,7 @@ ch__test(InputIterator first, InputIterator last, const Traits& ch_traits); -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Convex_hull_2/test/Convex_hull_2/include/CGAL/ch__test_impl.h b/Convex_hull_2/test/Convex_hull_2/include/CGAL/ch__test_impl.h index 225919bc3b31..0be67d473ce6 100644 --- a/Convex_hull_2/test/Convex_hull_2/include/CGAL/ch__test_impl.h +++ b/Convex_hull_2/test/Convex_hull_2/include/CGAL/ch__test_impl.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template bool ch__test(InputIterator first, InputIterator last, const Traits& ch_traits) @@ -285,6 +285,6 @@ ch__test(InputIterator first, InputIterator last, const Traits& ch_traits, } } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CH__TEST_IMPL_H diff --git a/Convex_hull_3/include/CGAL/convex_hull_incremental_3.h b/Convex_hull_3/include/CGAL/convex_hull_incremental_3.h index 8ddddc8f3851..e80ca9d72360 100644 --- a/Convex_hull_3/include/CGAL/convex_hull_incremental_3.h +++ b/Convex_hull_3/include/CGAL/convex_hull_incremental_3.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void @@ -44,6 +44,6 @@ convex_hull_incremental_3(InputIterator first, InputIterator beyond, CGAL::convex_hull_d_to_polyhedron_3(CH,P); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CONVEX_HULL_INCREMENTAL_3_H diff --git a/Convex_hull_d/include/CGAL/Convex_hull_d.h b/Convex_hull_d/include/CGAL/Convex_hull_d.h index 1308fbdae42c..b5ab12a3181e 100644 --- a/Convex_hull_d/include/CGAL/Convex_hull_d.h +++ b/Convex_hull_d/include/CGAL/Convex_hull_d.h @@ -77,7 +77,7 @@ Let |j = C.index_of_vertex_in_opposite_facet(f,i)|. Then #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Facet_iterator_rep_; template class Facet_iterator_; @@ -1502,5 +1502,5 @@ visible_facets_search(Simplex_handle S, const Point_d& x, -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CONVEX_HULL_D_H diff --git a/Convex_hull_d/include/CGAL/Convex_hull_d_to_polyhedron_3.h b/Convex_hull_d/include/CGAL/Convex_hull_d_to_polyhedron_3.h index 4fa89dd15852..9767952e9f84 100644 --- a/Convex_hull_d/include/CGAL/Convex_hull_d_to_polyhedron_3.h +++ b/Convex_hull_d/include/CGAL/Convex_hull_d_to_polyhedron_3.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Build_polyhedron_from_chull : public Modifier_base< _HDS> @@ -116,5 +116,5 @@ void convex_hull_d_to_polyhedron_3( P.delegate( get_surface ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_CONVEX_HULL_D_TO_POLYHEDRON_3_H diff --git a/Convex_hull_d/include/CGAL/Convex_hull_d_traits_3.h b/Convex_hull_d/include/CGAL/Convex_hull_d_traits_3.h index 15444dcfcc43..fe1c16ef9481 100644 --- a/Convex_hull_d/include/CGAL/Convex_hull_d_traits_3.h +++ b/Convex_hull_d/include/CGAL/Convex_hull_d_traits_3.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Convex_hull_d_traits_3 { @@ -269,6 +269,6 @@ template struct Convex_hull_d_traits_3 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CONVEX_HULL_D_TRAITS_3_H diff --git a/Convex_hull_d/include/CGAL/Delaunay_d.h b/Convex_hull_d/include/CGAL/Delaunay_d.h index 5ba7642e4774..724bb28e6ca7 100644 --- a/Convex_hull_d/include/CGAL/Delaunay_d.h +++ b/Convex_hull_d/include/CGAL/Delaunay_d.h @@ -85,7 +85,7 @@ the furthest site triangulation. #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Delaunay_d : public Convex_hull_d @@ -1053,5 +1053,5 @@ all_points() const } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_DELAUNAY_D_H diff --git a/Convex_hull_d/include/CGAL/Regular_complex_d.h b/Convex_hull_d/include/CGAL/Regular_complex_d.h index 0e7c73cd8864..37bd8f529351 100644 --- a/Convex_hull_d/include/CGAL/Regular_complex_d.h +++ b/Convex_hull_d/include/CGAL/Regular_complex_d.h @@ -45,7 +45,7 @@ #endif #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class RC_simplex_d; template class RC_vertex_d; @@ -728,5 +728,5 @@ of simplices. }*/ -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_REGULAR_COMPLEX_D_H diff --git a/Distance_2/include/CGAL/squared_distance_2_1.h b/Distance_2/include/CGAL/squared_distance_2_1.h index 183d8b160de5..3825d8fc4c64 100644 --- a/Distance_2/include/CGAL/squared_distance_2_1.h +++ b/Distance_2/include/CGAL/squared_distance_2_1.h @@ -39,7 +39,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -759,6 +759,6 @@ squared_distance(const Line_2 &line1, const Line_2 &line2) return internal::squared_distance(line1, line2, K()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Distance_2/include/CGAL/squared_distance_2_2.h b/Distance_2/include/CGAL/squared_distance_2_2.h index bea994323119..a752cb31ddb8 100644 --- a/Distance_2/include/CGAL/squared_distance_2_2.h +++ b/Distance_2/include/CGAL/squared_distance_2_2.h @@ -38,7 +38,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -568,6 +568,6 @@ squared_distance(const Triangle_2 &triangle1, return internal::squared_distance(triangle1, triangle2, K()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Distance_2/include/CGAL/squared_distance_utils.h b/Distance_2/include/CGAL/squared_distance_utils.h index df5989955614..d369726f23ca 100644 --- a/Distance_2/include/CGAL/squared_distance_utils.h +++ b/Distance_2/include/CGAL/squared_distance_utils.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -304,6 +304,6 @@ same_direction(const typename K::Vector_2 &u, } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SQUARED_DISTANCE_UTILS_H diff --git a/Distance_3/include/CGAL/squared_distance_3_0.h b/Distance_3/include/CGAL/squared_distance_3_0.h index 568355eb6723..c2f1512549ea 100644 --- a/Distance_3/include/CGAL/squared_distance_3_0.h +++ b/Distance_3/include/CGAL/squared_distance_3_0.h @@ -33,7 +33,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -327,7 +327,7 @@ squared_distance_to_line(const Vector_3 & dir, -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Distance_3/include/CGAL/squared_distance_3_1.h b/Distance_3/include/CGAL/squared_distance_3_1.h index 8e6ef9524319..57efc6c7d5b5 100644 --- a/Distance_3/include/CGAL/squared_distance_3_1.h +++ b/Distance_3/include/CGAL/squared_distance_3_1.h @@ -33,7 +33,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -921,7 +921,7 @@ squared_distance( -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Distance_3/include/CGAL/squared_distance_3_2.h b/Distance_3/include/CGAL/squared_distance_3_2.h index bb8c930e7636..b92c209221ea 100644 --- a/Distance_3/include/CGAL/squared_distance_3_2.h +++ b/Distance_3/include/CGAL/squared_distance_3_2.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -295,7 +295,7 @@ squared_distance( } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Envelope_2/include/CGAL/Env_default_diagram_1.h b/Envelope_2/include/CGAL/Env_default_diagram_1.h index 1a98c8e3aebd..c2143a821c1d 100644 --- a/Envelope_2/include/CGAL/Env_default_diagram_1.h +++ b/Envelope_2/include/CGAL/Env_default_diagram_1.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A minimization (or a maximization) diagram that represents the lower (or the @@ -461,6 +461,6 @@ class Env_default_diagram_1 } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Envelope_2/include/CGAL/Envelope_2/Env_divide_and_conquer_2.h b/Envelope_2/include/CGAL/Envelope_2/Env_divide_and_conquer_2.h index 7b1bcde195bb..773fc5d7e4c3 100644 --- a/Envelope_2/include/CGAL/Envelope_2/Env_divide_and_conquer_2.h +++ b/Envelope_2/include/CGAL/Envelope_2/Env_divide_and_conquer_2.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A class implementing the divide-and-conquer algorithm for computing the @@ -367,7 +367,7 @@ class Envelope_divide_and_conquer_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Envelope_2/include/CGAL/Envelope_2/Env_divide_and_conquer_2_impl.h b/Envelope_2/include/CGAL/Envelope_2/Env_divide_and_conquer_2_impl.h index 7ab1e0970e12..febfa69a5113 100644 --- a/Envelope_2/include/CGAL/Envelope_2/Env_divide_and_conquer_2_impl.h +++ b/Envelope_2/include/CGAL/Envelope_2/Env_divide_and_conquer_2_impl.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // --------------------------------------------------------------------------- // Construct the lower/upper envelope of the given list of non-vertical curves. @@ -1332,6 +1332,6 @@ Envelope_divide_and_conquer_2::_split_edge return (new_v); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Envelope_2/include/CGAL/envelope_2.h b/Envelope_2/include/CGAL/envelope_2.h index 3b18767447d9..1c43bb473edc 100644 --- a/Envelope_2/include/CGAL/envelope_2.h +++ b/Envelope_2/include/CGAL/envelope_2.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * Compute the lower envelope of a range of curves. @@ -120,6 +120,6 @@ void upper_envelope_x_monotone_2 (InputIterator begin, InputIterator end, return; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Envelope_3/include/CGAL/Env_plane_traits_3.h b/Envelope_3/include/CGAL/Env_plane_traits_3.h index 41c9b51d261a..55cdd1ba6998 100644 --- a/Envelope_3/include/CGAL/Env_plane_traits_3.h +++ b/Envelope_3/include/CGAL/Env_plane_traits_3.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Env_plane_traits_3 : public Arr_linear_traits_2 @@ -484,6 +484,6 @@ class Env_plane_traits_3 : public Arr_linear_traits_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Envelope_3/include/CGAL/Env_sphere_traits_3.h b/Envelope_3/include/CGAL/Env_sphere_traits_3.h index 3cea659edd14..a37063ce28f3 100644 --- a/Envelope_3/include/CGAL/Env_sphere_traits_3.h +++ b/Envelope_3/include/CGAL/Env_sphere_traits_3.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Env_sphere_traits_3 : public ConicTraits_2 @@ -1284,6 +1284,6 @@ bool operator== (const typename Kernel::Sphere_3& a, return (CGAL::compare (a.squared_radius(), b.squared_radius()) == EQUAL); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // ENVELOPE_SPHERES_TRAITS_3_H diff --git a/Envelope_3/include/CGAL/Env_surface_data_traits_3.h b/Envelope_3/include/CGAL/Env_surface_data_traits_3.h index bac7da8ca716..73a6471fda2f 100644 --- a/Envelope_3/include/CGAL/Env_surface_data_traits_3.h +++ b/Envelope_3/include/CGAL/Env_surface_data_traits_3.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A generic traits class for maintaining the envelope of surfaces that have @@ -129,6 +129,6 @@ class Env_surface_data_traits_3 : public Traits_ }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Envelope_3/include/CGAL/Env_tracing_traits_3.h b/Envelope_3/include/CGAL/Env_tracing_traits_3.h index 047669b59ac8..7a6ce1f3298c 100644 --- a/Envelope_3/include/CGAL/Env_tracing_traits_3.h +++ b/Envelope_3/include/CGAL/Env_tracing_traits_3.h @@ -41,7 +41,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * \class The traits class @@ -261,6 +261,6 @@ class Env_tracing_traits_3 : public Traits_ }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Envelope_3/include/CGAL/Env_triangle_traits_3.h b/Envelope_3/include/CGAL/Env_triangle_traits_3.h index dd9e6e0ca7e4..6d293619f846 100644 --- a/Envelope_3/include/CGAL/Env_triangle_traits_3.h +++ b/Envelope_3/include/CGAL/Env_triangle_traits_3.h @@ -33,7 +33,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Env_triangle_3; @@ -1660,6 +1660,6 @@ InputStream& operator>> (InputStream& is, Env_triangle_3& tri) return (is); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Envelope_3/include/CGAL/Envelope_3/Env_plane_traits_3_functions.h b/Envelope_3/include/CGAL/Envelope_3/Env_plane_traits_3_functions.h index a57eba69bbe4..e8af5a6a07c1 100644 --- a/Envelope_3/include/CGAL/Envelope_3/Env_plane_traits_3_functions.h +++ b/Envelope_3/include/CGAL/Envelope_3/Env_plane_traits_3_functions.h @@ -22,7 +22,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template Object plane_half_plane_proj_intersection(const typename K::Plane_3 &h1, @@ -199,6 +199,6 @@ Object ray_under_linear_constraint(const typename K::Ray_2& ray, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Envelope_3/include/CGAL/Envelope_3/Envelope_base.h b/Envelope_3/include/CGAL/Envelope_3/Envelope_base.h index 8575bbfa5aad..3945fbcf92d9 100644 --- a/Envelope_3/include/CGAL/Envelope_3/Envelope_base.h +++ b/Envelope_3/include/CGAL/Envelope_3/Envelope_base.h @@ -21,7 +21,7 @@ #ifndef CGAL_ENVELOPE_BASE_H #define CGAL_ENVELOPE_BASE_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Envelope types: enum Envelope_type { @@ -45,6 +45,6 @@ enum Dac_decision DAC_DECISION_NOT_SET }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ENVELOPE_BASE_3_H diff --git a/Envelope_3/include/CGAL/Envelope_3/Envelope_diagram_on_surface_2.h b/Envelope_3/include/CGAL/Envelope_3/Envelope_diagram_on_surface_2.h index c081a712d628..3205024f5e63 100644 --- a/Envelope_3/include/CGAL/Envelope_3/Envelope_diagram_on_surface_2.h +++ b/Envelope_3/include/CGAL/Envelope_3/Envelope_diagram_on_surface_2.h @@ -30,7 +30,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * Representation of an envelope diagram (a minimization diagram or a @@ -190,6 +190,6 @@ class is_arrangement_2< // }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Envelope_3/include/CGAL/Envelope_3/Envelope_divide_and_conquer_3.h b/Envelope_3/include/CGAL/Envelope_3/Envelope_divide_and_conquer_3.h index a86cd3bb5523..26aab81d159b 100644 --- a/Envelope_3/include/CGAL/Envelope_3/Envelope_divide_and_conquer_3.h +++ b/Envelope_3/include/CGAL/Envelope_3/Envelope_divide_and_conquer_3.h @@ -77,7 +77,7 @@ // 1. overlapping surfaces // 2. a vertical surface that contributes only edge (or edges) to the envelope -CGAL_BEGIN_NAMESPACE +namespace CGAL { // The algorithm has 5 template parameters: // 1. EnvelopeTraits_3 - the geometric traits class @@ -1823,6 +1823,6 @@ class Envelope_divide_and_conquer_3 bool m_is_lower; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_ENVELOPE_DIVIDE_AND_CONQUER_3_H diff --git a/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h b/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h index 80af350545df..73be77739287 100644 --- a/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h +++ b/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h @@ -36,7 +36,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Return the comparison result of the halfedge's source and target vertices. #ifndef HE_COMP_RES @@ -3239,6 +3239,6 @@ class Envelope_element_visitor_3 #undef HE_COMP_RES -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Envelope_3/include/CGAL/Envelope_3/Envelope_overlay_2.h b/Envelope_3/include/CGAL/Envelope_3/Envelope_overlay_2.h index acac7b3dedd0..1a8b2f35347e 100644 --- a/Envelope_3/include/CGAL/Envelope_3/Envelope_overlay_2.h +++ b/Envelope_3/include/CGAL/Envelope_3/Envelope_overlay_2.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template > @@ -247,6 +247,6 @@ class Envelope_overlay_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Envelope_3/include/CGAL/Envelope_3/Envelope_overlay_functor.h b/Envelope_3/include/CGAL/Envelope_3/Envelope_overlay_functor.h index 18176a2c5d51..96e9b5a70220 100644 --- a/Envelope_3/include/CGAL/Envelope_3/Envelope_overlay_functor.h +++ b/Envelope_3/include/CGAL/Envelope_3/Envelope_overlay_functor.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class MinimizationDiagram_2> class Envelope_overlay_functor @@ -462,6 +462,6 @@ class Envelope_overlay_functor Boundary_cache traversed_vertices; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Envelope_3/include/CGAL/envelope_3.h b/Envelope_3/include/CGAL/envelope_3.h index d5f02959d8f1..f68f951e37f1 100644 --- a/Envelope_3/include/CGAL/envelope_3.h +++ b/Envelope_3/include/CGAL/envelope_3.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * Construct the lower envelope of a given set of surfaces. @@ -124,6 +124,6 @@ upper_envelope_xy_monotone_3 (InputIterator begin, InputIterator end, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Envelope_3/test/Envelope_3/Envelope_test_3.h b/Envelope_3/test/Envelope_3/Envelope_test_3.h index 540dba38f07d..3bd8207fc1a9 100644 --- a/Envelope_3/test/Envelope_3/Envelope_test_3.h +++ b/Envelope_3/test/Envelope_3/Envelope_test_3.h @@ -44,7 +44,7 @@ // Then it computes for each part in the arragement the surfaces on the envelope over it // by comparing them all. -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Envelope_test_3 @@ -519,6 +519,6 @@ class Envelope_test_3 Point_2 current_point_inside_edge; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Envelope_3/test/Envelope_3/Envelope_test_overlay_functor.h b/Envelope_3/test/Envelope_3/Envelope_test_overlay_functor.h index fbf7a5826dbb..9b68463fb6be 100644 --- a/Envelope_3/test/Envelope_3/Envelope_test_overlay_functor.h +++ b/Envelope_3/test/Envelope_3/Envelope_test_overlay_functor.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // this overlay functor compares the data over the 2 features that create new // features in the new map @@ -164,7 +164,7 @@ class Envelope_test_overlay_functor }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Envelope_3/test/Envelope_3/Envelope_triangles_test_3.h b/Envelope_3/test/Envelope_3/Envelope_triangles_test_3.h index 263b5d0b92fc..3f32cef80302 100644 --- a/Envelope_3/test/Envelope_3/Envelope_triangles_test_3.h +++ b/Envelope_3/test/Envelope_3/Envelope_triangles_test_3.h @@ -43,7 +43,7 @@ // Then it computes for each part in the arragement the surfaces on the envelope over it // by comparing them all. -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Envelope_triangles_test_3 @@ -672,6 +672,6 @@ class Envelope_triangles_test_3 Point_2 current_point_inside_edge; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_ENVELOPE_TRIANGLES_TEST_3_H diff --git a/Filtered_kernel/examples/Filtered_kernel/Cartesian_I.h b/Filtered_kernel/examples/Filtered_kernel/Cartesian_I.h index 3dabbca76745..06899ea1bd0b 100644 --- a/Filtered_kernel/examples/Filtered_kernel/Cartesian_I.h +++ b/Filtered_kernel/examples/Filtered_kernel/Cartesian_I.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace CartesianKernelFunctors { @@ -103,6 +103,6 @@ struct Cartesian_I Cartesian_I > {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_I_H diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel.h b/Filtered_kernel/include/CGAL/Filtered_kernel.h index 81a4c6ee2827..a8447a220363 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel.h @@ -45,7 +45,7 @@ // so maybe they should not be passed as template parameter, but use a // traits-like mechanism ? -CGAL_BEGIN_NAMESPACE +namespace CGAL { // CK = eventually rebound construction kernel (gets Point_2 from). // Exact_kernel = exact kernel called when needed by the filter. @@ -130,6 +130,6 @@ struct Filtered_kernel UseStaticFilters > {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_FILTERED_KERNEL_H diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/Cartesian_coordinate_iterator_2.h b/Filtered_kernel/include/CGAL/Filtered_kernel/Cartesian_coordinate_iterator_2.h index f50313e2b386..3c96a7b45284 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/Cartesian_coordinate_iterator_2.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/Cartesian_coordinate_iterator_2.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // This class should go away. // It is now only used by the Filtered_kernel. @@ -145,6 +145,6 @@ class Cartesian_coordinate_iterator_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_COORDINATE_ITERATOR_2_H diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel/Cartesian_coordinate_iterator_3.h b/Filtered_kernel/include/CGAL/Filtered_kernel/Cartesian_coordinate_iterator_3.h index 0a2b1ff35b9c..42fe46ab9c63 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel/Cartesian_coordinate_iterator_3.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel/Cartesian_coordinate_iterator_3.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // This class should go away. // It is now only used by the Filtered_kernel. @@ -142,6 +142,6 @@ class Cartesian_coordinate_iterator_3 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_COORDINATE_ITERATOR_3_H diff --git a/Filtered_kernel/include/CGAL/Filtered_predicate.h b/Filtered_kernel/include/CGAL/Filtered_predicate.h index 86a50c1c9b9d..565c53d8f361 100644 --- a/Filtered_kernel/include/CGAL/Filtered_predicate.h +++ b/Filtered_kernel/include/CGAL/Filtered_predicate.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // This template class is a wrapper that implements the filtering for any // predicate (dynamic filters with IA). @@ -414,6 +414,6 @@ Filtered_predicate:: #endif -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_FILTERED_PREDICATE_H diff --git a/Filtered_kernel/include/CGAL/Kernel_profiler.h b/Filtered_kernel/include/CGAL/Kernel_profiler.h index 62e1c022687f..1e123b2fe726 100644 --- a/Filtered_kernel/include/CGAL/Kernel_profiler.h +++ b/Filtered_kernel/include/CGAL/Kernel_profiler.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Primitive wrapper which handles the profiling. template < typename P > @@ -130,6 +130,6 @@ struct Kernel_profiler #include }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_KERNEL_PROFILER_H diff --git a/Filtered_kernel/include/CGAL/Lazy.h b/Filtered_kernel/include/CGAL/Lazy.h index ddc02e695fcc..6dcbdcc80503 100644 --- a/Filtered_kernel/include/CGAL/Lazy.h +++ b/Filtered_kernel/include/CGAL/Lazy.h @@ -38,7 +38,7 @@ # include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Lazy; @@ -1850,6 +1850,6 @@ struct Lazy_construction }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LAZY_H diff --git a/Filtered_kernel/include/CGAL/Lazy_kernel.h b/Filtered_kernel/include/CGAL/Lazy_kernel.h index 09f86cd7cbe7..2e0f6f4b5b0f 100644 --- a/Filtered_kernel/include/CGAL/Lazy_kernel.h +++ b/Filtered_kernel/include/CGAL/Lazy_kernel.h @@ -33,7 +33,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Exact_kernel = exact kernel that will be made lazy // Kernel = lazy kernel @@ -275,6 +275,6 @@ struct Lazy_kernel Lazy_kernel > {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LAZY_KERNEL_H diff --git a/Filtered_kernel/include/CGAL/Restricted_double.h b/Filtered_kernel/include/CGAL/Restricted_double.h index 2875b8f33e33..05bc252573b6 100644 --- a/Filtered_kernel/include/CGAL/Restricted_double.h +++ b/Filtered_kernel/include/CGAL/Restricted_double.h @@ -33,7 +33,7 @@ #include // #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #ifdef CGAL_IA_CHECK_RESTRICT struct Restricted_double @@ -84,6 +84,6 @@ to_double(const Restricted_double &f) typedef double Restricted_double; #endif -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_RESTRICTED_DOUBLE_H diff --git a/Filtered_kernel/include/CGAL/Robust_construction.h b/Filtered_kernel/include/CGAL/Robust_construction.h index ac7a0c9e8ab0..aa96f6a06561 100644 --- a/Filtered_kernel/include/CGAL/Robust_construction.h +++ b/Filtered_kernel/include/CGAL/Robust_construction.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // This template class is a functor adaptor targetting geometric constructions. // @@ -136,6 +136,6 @@ class Robust_construction #endif }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ROBUST_CONSTRUCTION_H diff --git a/Generator/include/CGAL/Random_convex_set_traits_2.h b/Generator/include/CGAL/Random_convex_set_traits_2.h index 0e8719087046..9024480ee808 100644 --- a/Generator/include/CGAL/Random_convex_set_traits_2.h +++ b/Generator/include/CGAL/Random_convex_set_traits_2.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Kernel > struct Random_convex_set_traits_2 : public Kernel { @@ -111,6 +111,6 @@ CGAL_random_convex_set_2( int n, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // ! (CGAL_RANDOM_CONVEX_SET_TRAITS_2_H) diff --git a/Generator/include/CGAL/Random_polygon_traits_2.h b/Generator/include/CGAL/Random_polygon_traits_2.h index 650c39eedcdf..d39e2db42900 100644 --- a/Generator/include/CGAL/Random_polygon_traits_2.h +++ b/Generator/include/CGAL/Random_polygon_traits_2.h @@ -24,7 +24,7 @@ #ifndef CGAL_RANDOM_POLYGON_TRAITS_2_H #define CGAL_RANDOM_POLYGON_TRAITS_2_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { //-----------------------------------------------------------------------// // Random_polygon_traits_2 @@ -49,6 +49,6 @@ class Random_polygon_traits_2 { return Orientation_2(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_RANDOM_POLYGON_TRAITS_2_H diff --git a/Generator/include/CGAL/generators.h b/Generator/include/CGAL/generators.h index 019e42bf0391..748bf2469e26 100644 --- a/Generator/include/CGAL/generators.h +++ b/Generator/include/CGAL/generators.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class T > class Generator_base { protected: @@ -104,6 +104,6 @@ class Random_double_in_interval : public Random_generator_base { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_GENERATORS_H // // EOF // diff --git a/Generator/include/CGAL/point_generators_2.h b/Generator/include/CGAL/point_generators_2.h index 7f419f838d80..e3b97d30a9dc 100644 --- a/Generator/include/CGAL/point_generators_2.h +++ b/Generator/include/CGAL/point_generators_2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class P, class Creator = Creator_uniform_2::Kernel::RT,P> > @@ -497,6 +497,6 @@ OutputIterator random_collinear_points_2( -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POINT_GENERATORS_2_H // // EOF // diff --git a/Generator/include/CGAL/point_generators_3.h b/Generator/include/CGAL/point_generators_3.h index 936f527329ff..740f1ef3eff1 100644 --- a/Generator/include/CGAL/point_generators_3.h +++ b/Generator/include/CGAL/point_generators_3.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class P, class Creator = Creator_uniform_3::Kernel::RT,P> > @@ -193,7 +193,7 @@ points_on_cube_grid_3( double a, std::size_t n, OutputIterator o) } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POINT_GENERATORS_3_H // // EOF // diff --git a/Generator/include/CGAL/point_generators_d.h b/Generator/include/CGAL/point_generators_d.h index e5589d720cbd..9c85310e6658 100644 --- a/Generator/include/CGAL/point_generators_d.h +++ b/Generator/include/CGAL/point_generators_d.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class P> class Random_points_in_iso_box_d : public Generator_base

{ @@ -72,6 +72,6 @@ generate_point() creator( N_Random_double_iterator(rdii), N_Random_double_iterator(d)); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POINT_GENERATORS_D_H // // EOF // diff --git a/Generator/include/CGAL/random_convex_set_2.h b/Generator/include/CGAL/random_convex_set_2.h index 600cac6802c7..07068b7b4759 100644 --- a/Generator/include/CGAL/random_convex_set_2.h +++ b/Generator/include/CGAL/random_convex_set_2.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class OutputIterator, class Point_generator, class Traits > OutputIterator @@ -119,6 +119,6 @@ random_convex_set_2( int n, } // random_convex_set_2( n, o, pg, t) -CGAL_END_NAMESPACE +} //namespace CGAL #endif // ! (CGAL_RANDOM_CONVEX_SET_2_H) diff --git a/Generator/include/CGAL/random_selection.h b/Generator/include/CGAL/random_selection.h index eb22be15414b..20c154583d5f 100644 --- a/Generator/include/CGAL/random_selection.h +++ b/Generator/include/CGAL/random_selection.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -59,6 +59,6 @@ OutputIterator random_selection( RandomAccessIterator first, return random_selection( first, last, n, result, default_random); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_RANDOM_SELECTION_H // diff --git a/Geomview/include/CGAL/IO/Geomview_stream.h b/Geomview/include/CGAL/IO/Geomview_stream.h index ffdeb81b1eba..53a017b677d2 100644 --- a/Geomview/include/CGAL/IO/Geomview_stream.h +++ b/Geomview/include/CGAL/IO/Geomview_stream.h @@ -37,7 +37,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Geomview_stream { public: @@ -588,6 +588,6 @@ operator>>(Geomview_stream &gv, Point_3 &point) } #endif -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_GEOMVIEW_STREAM_H diff --git a/Geomview/src/CGAL/Geomview_stream.cpp b/Geomview/src/CGAL/Geomview_stream.cpp index 2912740c38b9..28fc576c6432 100644 --- a/Geomview/src/CGAL/Geomview_stream.cpp +++ b/Geomview/src/CGAL/Geomview_stream.cpp @@ -38,7 +38,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { Geomview_stream::Geomview_stream(const Bbox_3 &bbox, const char *machine, @@ -548,15 +548,15 @@ Geomview_stream::get_new_id(const std::string & s) return str.str(); } -CGAL_END_NAMESPACE +} //namespace CGAL #else // Add a dummy symbol to prevent warnings of empty translation unit. -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace { int dummy; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_USE_GEOMVIEW diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_const_decorator.h b/HalfedgeDS/include/CGAL/HalfedgeDS_const_decorator.h index 325fa44d44b6..4de5fb3033a5 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_const_decorator.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_const_decorator.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class p_HDS > class HalfedgeDS_const_decorator @@ -370,7 +370,7 @@ is_valid( bool verb, int level) const { return valid; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HALFEDGEDS_CONST_DECORATOR_H // // EOF // diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_decorator.h b/HalfedgeDS/include/CGAL/HalfedgeDS_decorator.h index 89b48575ab4a..4a6c02e05cf0 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_decorator.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_decorator.h @@ -33,7 +33,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class p_HDS > class HalfedgeDS_decorator : public HalfedgeDS_items_decorator { @@ -1128,7 +1128,7 @@ inside_out( Tag_true) { } } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HALFEDGEDS_DECORATOR_H // // EOF // diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_default.h b/HalfedgeDS/include/CGAL/HalfedgeDS_default.h index a7a09391af32..2c665d8bfd15 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_default.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_default.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #ifndef CGAL_CFG_NO_TMPL_IN_TMPL_PARAM @@ -66,6 +66,6 @@ struct HalfedgeDS_default { #endif // CGAL_CFG_NO_TMPL_IN_TMPL_PARAM // -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HALFEDGEDS_DEFAULT_H // // EOF // diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_face_base.h b/HalfedgeDS/include/CGAL/HalfedgeDS_face_base.h index 1883bdc2e45b..19cb85f02091 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_face_base.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_face_base.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // We use Tag_false to indicate that no plane type is provided. @@ -153,7 +153,7 @@ class HalfedgeDS_face_base< Refs, Tag_true, Pln> { //Normal normal() const { return pln.orthogonal_vector();} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HALFEDGEDS_FACE_BASE_H // // EOF // diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_face_min_base.h b/HalfedgeDS/include/CGAL/HalfedgeDS_face_min_base.h index 852444f36934..e3ad293c6279 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_face_min_base.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_face_min_base.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Refs> class HalfedgeDS_face_min_base { @@ -48,7 +48,7 @@ class HalfedgeDS_face_min_base { typedef Plane_not_supported Plane; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HALFEDGEDS_FACE_MIN_BASE_H // // EOF // diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_halfedge_base.h b/HalfedgeDS/include/CGAL/HalfedgeDS_halfedge_base.h index 28667ed767dd..5388793c3e0b 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_halfedge_base.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_halfedge_base.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Refs, class TP, class TV, class TF> struct HalfedgeDS_halfedge_base_base { @@ -331,7 +331,7 @@ class HalfedgeDS_halfedge_base< Refs, // is true if `h' is a border halfedge. }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HALFEDGEDS_HALFEDGE_BASE_H // // EOF // diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_halfedge_min_base.h b/HalfedgeDS/include/CGAL/HalfedgeDS_halfedge_min_base.h index 9d670cc0f5b8..c1b819f92652 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_halfedge_min_base.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_halfedge_min_base.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Refs> struct HalfedgeDS_halfedge_min_base_base { @@ -74,7 +74,7 @@ class HalfedgeDS_halfedge_min_base void set_opposite( Halfedge_handle h) { Base_base::set_opposite(h);} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HALFEDGEDS_HALFEDGE_MIN_BASE_H // // EOF // diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_items_2.h b/HalfedgeDS/include/CGAL/HalfedgeDS_items_2.h index 765527d40ef1..9b9290830dbc 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_items_2.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_items_2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class HalfedgeDS_items_2 { public: @@ -46,6 +46,6 @@ class HalfedgeDS_items_2 { }; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HALFEDGEDS_ITEMS_2_H // // EOF // diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_items_decorator.h b/HalfedgeDS/include/CGAL/HalfedgeDS_items_decorator.h index 15c200395e38..4314907ef699 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_items_decorator.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_items_decorator.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class p_HDS > class HalfedgeDS_items_decorator { @@ -521,7 +521,7 @@ class HalfedgeDS_items_decorator { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HALFEDGEDS_ITEMS_DECORATOR_H // // EOF // diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_iterator.h b/HalfedgeDS/include/CGAL/HalfedgeDS_iterator.h index 536993a9dcaf..5366cc9e0391 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_iterator.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_iterator.h @@ -25,7 +25,7 @@ #define CGAL_HALFEDGEDS_ITERATOR_H 1 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { @@ -410,6 +410,6 @@ class _HalfedgeDS_vertex_const_circ : public It { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HALFEDGEDS_ITERATOR_H // // EOF // diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_iterator_adaptor.h b/HalfedgeDS/include/CGAL/HalfedgeDS_iterator_adaptor.h index ffe9bbef3196..6d335874f629 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_iterator_adaptor.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_iterator_adaptor.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // The iterator identity adaptor will be used for the HDS implementations // that are based on STL (or other) container classes which do not @@ -156,7 +156,7 @@ class HalfedgeDS_iterator_adaptor { bool operator>=( const Self& i) const { return !(*this < i); } }; -CGAL_END_NAMESPACE +} //namespace CGAL // we don't need Koenig lookup here template < class D, class I> diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_list.h b/HalfedgeDS/include/CGAL/HalfedgeDS_list.h index fbc34e7587c9..c45124ab84da 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_list.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_list.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class VertexBase> class HalfedgeDS_in_place_list_vertex @@ -714,6 +714,6 @@ class HDS : public HalfedgeDS_list_types { // #undef CGAL__HDS_IP_List -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HALFEDGEDS_LIST_H // // EOF // diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_min_items.h b/HalfedgeDS/include/CGAL/HalfedgeDS_min_items.h index 8b80a7eec366..6373a847c3a4 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_min_items.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_min_items.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class HalfedgeDS_min_items { public: @@ -45,6 +45,6 @@ class HalfedgeDS_min_items { }; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HALFEDGEDS_MIN_ITEMS_H // // EOF // diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_vector.h b/HalfedgeDS/include/CGAL/HalfedgeDS_vector.h index af961b313034..32f32ec41230 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_vector.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_vector.h @@ -41,7 +41,7 @@ #include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Traits_, class HalfedgeDSItems, class Alloc> @@ -673,6 +673,6 @@ class HDS : public HalfedgeDS_vector_types { #endif -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HALFEDGEDS_VECTOR_H // // EOF // diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_vertex_base.h b/HalfedgeDS/include/CGAL/HalfedgeDS_vertex_base.h index cda96f7640b1..48e78cc34774 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_vertex_base.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_vertex_base.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // We use Tag_false to indicate that no point type is provided. @@ -127,7 +127,7 @@ class HalfedgeDS_vertex_base< Refs, Tag_true, P> { const Point& point() const { return p; } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HALFEDGEDS_VERTEX_BASE_H // // EOF // diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_vertex_min_base.h b/HalfedgeDS/include/CGAL/HalfedgeDS_vertex_min_base.h index 8e7bad540223..40d336e0324a 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_vertex_min_base.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_vertex_min_base.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Refs> class HalfedgeDS_vertex_min_base { @@ -45,7 +45,7 @@ class HalfedgeDS_vertex_min_base { typedef typename Refs::Face Face; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HALFEDGEDS_VERTEX_MIN_BASE_H // // EOF // diff --git a/HalfedgeDS/include/CGAL/Polyhedron_items_3.h b/HalfedgeDS/include/CGAL/Polyhedron_items_3.h index 71526e019177..633a696e3358 100644 --- a/HalfedgeDS/include/CGAL/Polyhedron_items_3.h +++ b/HalfedgeDS/include/CGAL/Polyhedron_items_3.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Polyhedron_items_3 { public: @@ -47,6 +47,6 @@ class Polyhedron_items_3 { }; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYHEDRON_ITEMS_3_H // // EOF // diff --git a/HalfedgeDS/include/CGAL/halfedgeDS_cut_component.h b/HalfedgeDS/include/CGAL/halfedgeDS_cut_component.h index 059b3e98b341..2d9abe1134a7 100644 --- a/HalfedgeDS/include/CGAL/halfedgeDS_cut_component.h +++ b/HalfedgeDS/include/CGAL/halfedgeDS_cut_component.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class HDS, class Predicate > @@ -147,6 +147,6 @@ halfedgeDS_cut_component( HDS& hds, return hnew; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HALFEDGEDS_CUT_COMPONENT_H // // EOF // diff --git a/HalfedgeDS/include/CGAL/halfedgeds_connected_components.h b/HalfedgeDS/include/CGAL/halfedgeds_connected_components.h index ca139cb9f893..84e964b6992a 100644 --- a/HalfedgeDS/include/CGAL/halfedgeds_connected_components.h +++ b/HalfedgeDS/include/CGAL/halfedgeds_connected_components.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -85,6 +85,6 @@ halfedgeds_connected_components( HDS& hds) { } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HALFEDGEDS_CONNECTED_COMPONENTS_H // // EOF // diff --git a/Hash_map/include/CGAL/Handle_hash_function.h b/Hash_map/include/CGAL/Handle_hash_function.h index 44837f63576c..40ee5b5eb5f0 100644 --- a/Hash_map/include/CGAL/Handle_hash_function.h +++ b/Hash_map/include/CGAL/Handle_hash_function.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { struct Handle_hash_function { typedef std::size_t result_type; @@ -39,7 +39,7 @@ struct Handle_hash_function { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HANDLE_HASH_FUNCTION_H // EOF diff --git a/Hash_map/include/CGAL/Tools/chained_map.h b/Hash_map/include/CGAL/Tools/chained_map.h index 6ec751b1a62b..9f763b24bb46 100644 --- a/Hash_map/include/CGAL/Tools/chained_map.h +++ b/Hash_map/include/CGAL/Tools/chained_map.h @@ -23,7 +23,7 @@ #ifndef CGAL_CHAINED_MAP_H #define CGAL_CHAINED_MAP_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -346,6 +346,6 @@ void chained_map::statistics() const } } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CHAINED_MAP_H diff --git a/Hash_map/include/CGAL/Unique_hash_map.h b/Hash_map/include/CGAL/Unique_hash_map.h index 0a2d8eedba2a..b65e0b88f3b5 100644 --- a/Hash_map/include/CGAL/Unique_hash_map.h +++ b/Hash_map/include/CGAL/Unique_hash_map.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -117,7 +117,7 @@ class Unique_hash_map { -CGAL_END_NAMESPACE +} //namespace CGAL namespace boost { template diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous.h b/Homogeneous_kernel/include/CGAL/Homogeneous.h index 40d88c3f5fca..3ab254931e9e 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename RT_, typename FT_, typename Kernel > struct Homogeneous_base_ref_count @@ -55,6 +55,6 @@ struct Homogeneous Homogeneous > {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HOMOGENEOUS_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH2.h index 4d7ba3d3df7d..c294e2433f3d 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Aff_transformationH2; @@ -1053,6 +1053,6 @@ cartesian(int i, int j) const return FT(0); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_AFF_TRANSFORMATIONH2_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH3.h index 1109e488e153..6e2b16f4d23a 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/Aff_transformationH3.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // forward declaration template < class R > @@ -891,6 +891,6 @@ operator<< ( std::ostream & out, << "| "<< RT0 <<' '<< RT0 <<' '<< RT0 <<' '<< r.t33 << " |\n"; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_AFF_TRANSFORMATIONH3_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/CircleH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/CircleH2.h index 2b3bb52a1eb4..077477103ad9 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/CircleH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/CircleH2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class CircleH2 @@ -249,6 +249,6 @@ bool CircleH2::operator!=(const CircleH2& c) const { return !(*this == c); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CIRCLEH2_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/Data_accessorH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Data_accessorH2.h index a2d4cef52b84..89d7d8887654 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/Data_accessorH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/Data_accessorH2.h @@ -25,7 +25,7 @@ #ifndef CGAL_DATA_ACCESSORH2_H #define CGAL_DATA_ACCESSORH2_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R > class Data_accessorH2 @@ -54,6 +54,6 @@ class Data_accessorH2 } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_DATA_ACCESSORH2_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH2.h index 4fa0b9e53d9a..777311bf0b95 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH2.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class DirectionH2 @@ -99,11 +99,11 @@ bool DirectionH2::operator!=( const DirectionH2& d) const { return !(*this == d); } -CGAL_END_NAMESPACE +} //namespace CGAL #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template CGAL_KERNEL_INLINE @@ -111,6 +111,6 @@ typename DirectionH2::Vector_2 DirectionH2::to_vector() const { return Vector_2(dx(), dy()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HOMOGENEOUS_DIRECTION_2_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH3.h index 4e1242fa8207..fc14bd0c8125 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH3.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class DirectionH3 @@ -129,6 +129,6 @@ cross_product( const DirectionH3& d1, const DirectionH3& d2) { return cross_product(d1.to_vector(),d2.to_vector()).direction(); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HOMOGENEOUS_DIRECTION_3_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h index 62d5ecbbb3a5..5caac45a94b8 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h @@ -73,7 +73,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Homogeneous_base @@ -157,6 +157,6 @@ struct Homogeneous_base }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HOMOGENEOUS_BASE_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_cuboidH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_cuboidH3.h index 81d00f4f4813..23b54fc82d64 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_cuboidH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_cuboidH3.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Iso_cuboidH3 @@ -389,6 +389,6 @@ transform(const typename Iso_cuboidH3::Aff_transformation_3&t) const t.transform((this->max)() ) ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ISO_CUBOIDH3_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_rectangleH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_rectangleH2.h index c8276826393f..ce59a821d3da 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_rectangleH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_rectangleH2.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Iso_rectangleH2 @@ -96,6 +96,6 @@ bounded_side(const typename Iso_rectangleH2::Point_2& p) const return ON_BOUNDED_SIDE; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ISO_RECTANGLEH2_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/LineH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/LineH2.h index 4a75595fdd64..c423cac2490f 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/LineH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/LineH2.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class LineH2 @@ -93,6 +93,6 @@ bool LineH2::operator!=(const LineH2& l) const { return !(*this == l); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LINEH2_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/PlaneH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/PlaneH3.h index d59b8a810afe..813af9b216ce 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/PlaneH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/PlaneH3.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class PlaneH3 @@ -539,6 +539,6 @@ PlaneH3::to_3d(const typename PlaneH3::Point_2& p) const return hp.transform( transform_to_2d().inverse() ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PLANEH3_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/PointH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/PointH2.h index d71c03eb3883..fdd1071cce64 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/PointH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/PointH2.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class PointH2 @@ -149,6 +149,6 @@ typename PointH2::Direction_2 PointH2::direction() const { return typename PointH2::Direction_2(*this); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HOMOGENEOUS_POINT_2_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/PointH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/PointH3.h index ca966a064e9c..cb16480ff1b9 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/PointH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/PointH3.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class PointH3 @@ -201,6 +201,6 @@ typename R::Point_3 PointH3::transform(const typename PointH3::Aff_transformation_3& t) const { return t.transform(static_cast(*this)); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HOMOGENEOUS_POINT_3_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/RayH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/RayH3.h index 7c2ad642ab99..c8b9b72a6854 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/RayH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/RayH3.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class RayH3 @@ -168,6 +168,6 @@ bool RayH3::operator!=( const RayH3& r) const { return !operator==(r); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_RAYH3_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/SphereH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/SphereH3.h index 19f1e9c5f19b..cb14f69bae4e 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/SphereH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/SphereH3.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SphereH3 @@ -224,6 +224,6 @@ SphereH3::opposite() const CGAL::opposite(orientation()) ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SPHEREH3_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h index fbcb87c27d24..55a38bb033b1 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class VectorH2 @@ -245,6 +245,6 @@ VectorH2::perpendicular(const Orientation& o) const return typename R::Vector_2(hy(), -hx(), hw()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HOMOGENEOUS_VECTOR_2_h diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h index d2fa6e561f2a..1f7e72f4d9b4 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R_ > class VectorH3 @@ -241,6 +241,6 @@ VectorH3::operator/(const typename VectorH3::FT& f) const { return typename R::Vector_3(hx()*f.denominator(), hy()*f.denominator(), hz()*f.denominator(), hw()*f.numerator() ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HOMOGENEOUS_VECTOR_3_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/basic_constructionsH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/basic_constructionsH2.h index cce339a04711..50880186f2da 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/basic_constructionsH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/basic_constructionsH2.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template CGAL_KERNEL_MEDIUM_INLINE @@ -70,6 +70,6 @@ squared_distance( const PointH2& p, const PointH2& q ) return FT( sq_dist_numerator ) / FT( sq_dist_denominator ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_BASIC_CONSTRUCTIONSH2_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/basic_constructionsH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/basic_constructionsH3.h index b27ba4172f97..5e77c58c0e77 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/basic_constructionsH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/basic_constructionsH3.h @@ -25,7 +25,7 @@ #ifndef CGAL_BASIC_CONSTRUCTIONSH3_H #define CGAL_BASIC_CONSTRUCTIONSH3_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template typename R::Point_3 @@ -80,6 +80,6 @@ typename R::FT squared_distance( PointH3 const& p, PointH3 const& q) { return (p-q)*(p-q); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_BASIC_CONSTRUCTIONSH3_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/distance_predicatesH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/distance_predicatesH2.h index 774a2da930e9..90fa23d90c07 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/distance_predicatesH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/distance_predicatesH2.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R> CGAL_KERNEL_MEDIUM_INLINE @@ -278,6 +278,6 @@ has_larger_signed_distance_to_line(const PointH2& p, return ( scaled_dist_r_minus_scaled_dist_s > RT0 ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_DISTANCE_PREDICATESH2_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/distance_predicatesH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/distance_predicatesH3.h index f01655b024cc..c683c7653c7a 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/distance_predicatesH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/distance_predicatesH3.h @@ -25,7 +25,7 @@ #ifndef CGAL_DISTANCE_PREDICATESH3_H #define CGAL_DISTANCE_PREDICATESH3_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template Comparison_result @@ -328,6 +328,6 @@ has_smaller_signed_distance_to_plane(const PointH3& p, const PointH3& t) { return cmp_signed_dist_to_plane(p,q,r,s,t) == SMALLER; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_DISTANCE_PREDICATESH3_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/function_objects.h b/Homogeneous_kernel/include/CGAL/Homogeneous/function_objects.h index 44e6e2d26f04..5a028e72c79b 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/function_objects.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/function_objects.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace HomogeneousKernelFunctors { @@ -4572,6 +4572,6 @@ namespace HomogeneousKernelFunctors { } // namespace HomogeneousKernelFunctors -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HOMOGENEOUS_FUNCTION_OBJECTS_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_pointsH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_pointsH2.h index 9191f6c73bee..220ac71d23b9 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_pointsH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_pointsH2.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R> CGAL_KERNEL_INLINE @@ -75,6 +75,6 @@ compare_deltax_deltay(const PointH2& p, } #endif -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PREDICATES_ON_POINTSH2_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_pointsH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_pointsH3.h index d0b1fcd5e0bd..0a8cf2389fdf 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_pointsH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/predicates_on_pointsH3.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R > CGAL_KERNEL_MEDIUM_INLINE @@ -124,6 +124,6 @@ bool less_z(const PointH3 &p, const PointH3 &q) { return (p.hz() * q.hw() < q.hz() * p.hw() ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PREDICATES_ON_POINTSH3_H diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous_converter.h b/Homogeneous_kernel/include/CGAL/Homogeneous_converter.h index e13021bb90fc..267c8913ad31 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous_converter.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous_converter.h @@ -36,7 +36,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template , @@ -246,6 +246,6 @@ struct Homogeneous_converter const T& operator()(const T&t) const { return t; } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HOMOGENEOUS_CONVERTER_H diff --git a/Homogeneous_kernel/include/CGAL/Simple_homogeneous.h b/Homogeneous_kernel/include/CGAL/Simple_homogeneous.h index 95a1b0c3400c..9dcfc0e104de 100644 --- a/Homogeneous_kernel/include/CGAL/Simple_homogeneous.h +++ b/Homogeneous_kernel/include/CGAL/Simple_homogeneous.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename RT_, typename FT_, typename Kernel > struct Homogeneous_base_no_ref_count @@ -56,6 +56,6 @@ struct Simple_homogeneous Simple_homogeneous > {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SIMPLE_HOMOGENEOUS_H diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h index 378a3a73ca0d..1ef5505771a4 100644 --- a/Installation/include/CGAL/config.h +++ b/Installation/include/CGAL/config.h @@ -70,9 +70,6 @@ // It only works for public releases. #define CGAL_VERSION_NUMBER(x,y,z) (1000001 + 10000*x + 100*y + 10*z) * 1000 -#define CGAL_BEGIN_NAMESPACE namespace CGAL { -#define CGAL_END_NAMESPACE } - #ifndef CGAL_CFG_NO_CPP0X_LONG_LONG # define CGAL_USE_LONG_LONG #endif @@ -236,11 +233,11 @@ using std::max; #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Typedef for the type of NULL. typedef const void * Nullptr_t; // Anticipate C++0x's std::nullptr_t -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CONFIG_H diff --git a/Interpolation/include/CGAL/Interpolation_gradient_fitting_traits_2.h b/Interpolation/include/CGAL/Interpolation_gradient_fitting_traits_2.h index ed37a6490148..eaae5e1574cd 100644 --- a/Interpolation/include/CGAL/Interpolation_gradient_fitting_traits_2.h +++ b/Interpolation/include/CGAL/Interpolation_gradient_fitting_traits_2.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //-----------------------------------------------------------------------// // Interpolation_gradient_fitting_traits_2 @@ -149,6 +149,6 @@ class Interpolation_gradient_fitting_traits_2 {return Compute_squared_distance_d();} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_INTERPOLATION_GRADIENT_FITTING_TRAITS_2_H diff --git a/Interpolation/include/CGAL/Interpolation_traits_2.h b/Interpolation/include/CGAL/Interpolation_traits_2.h index 19746236677b..9096a6028d9e 100644 --- a/Interpolation/include/CGAL/Interpolation_traits_2.h +++ b/Interpolation/include/CGAL/Interpolation_traits_2.h @@ -20,7 +20,7 @@ #ifndef CGAL_INTERPOLATION_TRAITS_2_H #define CGAL_INTERPOLATION_TRAITS_2_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { //-----------------------------------------------------------------------// // Interpolation_traits_2 @@ -55,6 +55,6 @@ class Interpolation_traits_2 {return Compute_squared_distance_d();} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_INTERPOLATION_TRAITS_2_H diff --git a/Interpolation/include/CGAL/Voronoi_intersection_2_traits_3.h b/Interpolation/include/CGAL/Voronoi_intersection_2_traits_3.h index ed3aac17c6fa..d4feb08c1f39 100644 --- a/Interpolation/include/CGAL/Voronoi_intersection_2_traits_3.h +++ b/Interpolation/include/CGAL/Voronoi_intersection_2_traits_3.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Orientation_with_normal_plane_2_3 @@ -548,6 +548,6 @@ plane_intersected_bisector_3(const Point &a, const Vector& n, return Line(Point(x1,y1,z1), Point(x2,y2,z2)); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_INTERSECTION_2_TRAITS_3_H diff --git a/Interpolation/include/CGAL/constructions/constructions_for_voronoi_intersection_cartesian_2_3.h b/Interpolation/include/CGAL/constructions/constructions_for_voronoi_intersection_cartesian_2_3.h index fad28803eda5..080d0bebdeeb 100644 --- a/Interpolation/include/CGAL/constructions/constructions_for_voronoi_intersection_cartesian_2_3.h +++ b/Interpolation/include/CGAL/constructions/constructions_for_voronoi_intersection_cartesian_2_3.h @@ -20,7 +20,7 @@ #ifndef CGAL_CONSTRUCTIONS_FOR_VORONOI_INTERSECTION_CARTESIAN_2_3_H #define CGAL_CONSTRUCTIONS_FOR_VORONOI_INTERSECTION_CARTESIAN_2_3_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class RT> void @@ -224,6 +224,6 @@ bisector_plane_intersectionC3(const RT &ax, const RT &ay, const RT &az, } } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CONSTRUCTIONS_FOR_VORONOI_INTERSECTION_CARTESIAN_2_3_H diff --git a/Interpolation/include/CGAL/interpolation_functions.h b/Interpolation/include/CGAL/interpolation_functions.h index c0c2e8d4bf0f..f8d0bbe8e4aa 100644 --- a/Interpolation/include/CGAL/interpolation_functions.h +++ b/Interpolation/include/CGAL/interpolation_functions.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //Functor class for accessing the function values/gradients template< class Map > @@ -336,6 +336,6 @@ farin_c1_interpolation(RandomAccessIterator first, return std::make_pair(result/(CGAL_NTS square(norm)*norm), true); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_INTERPOLATION_FUNCTIONS_H diff --git a/Interpolation/include/CGAL/natural_neighbor_coordinates_2.h b/Interpolation/include/CGAL/natural_neighbor_coordinates_2.h index b5ea753f3972..96d86be8160e 100644 --- a/Interpolation/include/CGAL/natural_neighbor_coordinates_2.h +++ b/Interpolation/include/CGAL/natural_neighbor_coordinates_2.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // the struct "Project_vertex_output_iterator" // is used in the (next two) functions @@ -368,6 +368,6 @@ class natural_neighbor_coordinates_2_object } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NATURAL_NEIGHBOR_COORDINATES_2_H diff --git a/Interpolation/include/CGAL/natural_neighbor_coordinates_3.h b/Interpolation/include/CGAL/natural_neighbor_coordinates_3.h index a2f6d04f1e64..cc14a07c1d6f 100644 --- a/Interpolation/include/CGAL/natural_neighbor_coordinates_3.h +++ b/Interpolation/include/CGAL/natural_neighbor_coordinates_3.h @@ -24,7 +24,7 @@ #include //TO DO : to remove -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ====================== Geometric Traits utilities ========================================= // === Declarations @@ -367,6 +367,6 @@ construct_circumcenter(const typename DT::Facet &f,const typename DT::Geom_trait Q); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NATURAL_NEIGHBORS_3_H diff --git a/Interpolation/include/CGAL/predicates/predicates_for_voronoi_intersection_cartesian_2_3.h b/Interpolation/include/CGAL/predicates/predicates_for_voronoi_intersection_cartesian_2_3.h index b9f87c470b55..686de8a5978f 100644 --- a/Interpolation/include/CGAL/predicates/predicates_for_voronoi_intersection_cartesian_2_3.h +++ b/Interpolation/include/CGAL/predicates/predicates_for_voronoi_intersection_cartesian_2_3.h @@ -20,7 +20,7 @@ #ifndef CGAL_PREDICATES_FOR_VORONOI_INTERSECTION_CARTESIAN_2_3_H #define CGAL_PREDICATES_FOR_VORONOI_INTERSECTION_CARTESIAN_2_3_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class RT> Oriented_side @@ -146,6 +146,6 @@ side_of_plane_centered_sphereC3(const RT &ax, const RT &ay, const RT &az, rx-px, ry-py,rz-pz); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PREDICATES_FOR_VORONOI_INTERSECTION_CARTESIAN_2_3_H diff --git a/Interpolation/include/CGAL/regular_neighbor_coordinates_2.h b/Interpolation/include/CGAL/regular_neighbor_coordinates_2.h index 5713c1876e88..60817c9430f5 100644 --- a/Interpolation/include/CGAL/regular_neighbor_coordinates_2.h +++ b/Interpolation/include/CGAL/regular_neighbor_coordinates_2.h @@ -26,7 +26,7 @@ //for definition of class Project_vertex_output_iterator #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // in this functions, the traits class is defined via the regular // triangulation @@ -412,6 +412,6 @@ class regular_neighbor_coordinates_2_object } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_REGULAR_NEIGHBOR_COORDINATES_2_H diff --git a/Interpolation/include/CGAL/sibson_gradient_fitting.h b/Interpolation/include/CGAL/sibson_gradient_fitting.h index b16bbe60f41e..1958b8f3edcf 100644 --- a/Interpolation/include/CGAL/sibson_gradient_fitting.h +++ b/Interpolation/include/CGAL/sibson_gradient_fitting.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class ForwardIterator, class Functor, class Traits> typename Traits::Vector_d @@ -146,6 +146,6 @@ sibson_gradient_fitting_rn_2(const Rt& rt, traits); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SIBSON_GRADIENT_FITTING_H diff --git a/Interpolation/include/CGAL/surface_neighbor_coordinates_3.h b/Interpolation/include/CGAL/surface_neighbor_coordinates_3.h index 4f4e8103e755..7b0acd5770c8 100644 --- a/Interpolation/include/CGAL/surface_neighbor_coordinates_3.h +++ b/Interpolation/include/CGAL/surface_neighbor_coordinates_3.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template inline @@ -278,6 +278,6 @@ surface_neighbor_coordinates_3(const Dt& dt, p, out, traits); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SURFACE_NEIGHBOR_COORDINATES_3_H diff --git a/Interpolation/include/CGAL/surface_neighbors_3.h b/Interpolation/include/CGAL/surface_neighbors_3.h index e673faf29e89..0d132cbbb878 100644 --- a/Interpolation/include/CGAL/surface_neighbors_3.h +++ b/Interpolation/include/CGAL/surface_neighbors_3.h @@ -29,7 +29,7 @@ // the function object Project_vertex_iterator_to_point #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //without Delaunay filtering template @@ -261,6 +261,6 @@ surface_neighbors_3(const Dt& dt, p, out, traits); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SURFACE_NEIGHBORS_3_H diff --git a/Intersections_2/include/CGAL/Bbox_2_Line_2_intersection.h b/Intersections_2/include/CGAL/Bbox_2_Line_2_intersection.h index d7f338dcda1e..677b1e1ff79c 100644 --- a/Intersections_2/include/CGAL/Bbox_2_Line_2_intersection.h +++ b/Intersections_2/include/CGAL/Bbox_2_Line_2_intersection.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Bbox_2_Line_2_pair_impl; @@ -93,6 +93,6 @@ inline bool do_intersect( return do_intersect(box, line); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Intersections_2/include/CGAL/Circle_2_Circle_2_intersection.h b/Intersections_2/include/CGAL/Circle_2_Circle_2_intersection.h index c951c529dce6..19df63743861 100644 --- a/Intersections_2/include/CGAL/Circle_2_Circle_2_intersection.h +++ b/Intersections_2/include/CGAL/Circle_2_Circle_2_intersection.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -60,6 +60,6 @@ do_intersect(const Circle_2 & circ1, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Intersections_2/include/CGAL/Circle_2_Line_2_intersection.h b/Intersections_2/include/CGAL/Circle_2_Line_2_intersection.h index 4bb09ee02de6..a419a0100f44 100644 --- a/Intersections_2/include/CGAL/Circle_2_Line_2_intersection.h +++ b/Intersections_2/include/CGAL/Circle_2_Line_2_intersection.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -75,6 +75,6 @@ do_intersect(const Line_2 & l, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Intersections_2/include/CGAL/Intersections_2/Triangle_2_Triangle_2_intersection_impl.h b/Intersections_2/include/CGAL/Intersections_2/Triangle_2_Triangle_2_intersection_impl.h index 11865bff070d..39fbb33adcab 100644 --- a/Intersections_2/include/CGAL/Intersections_2/Triangle_2_Triangle_2_intersection_impl.h +++ b/Intersections_2/include/CGAL/Intersections_2/Triangle_2_Triangle_2_intersection_impl.h @@ -30,7 +30,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -347,4 +347,4 @@ intersection(const typename K::Triangle_2 &tr1, } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Intersections_2/include/CGAL/Iso_rectangle_2_Iso_rectangle_2_intersection.h b/Intersections_2/include/CGAL/Iso_rectangle_2_Iso_rectangle_2_intersection.h index 7bf432ce1134..205a513dfb98 100644 --- a/Intersections_2/include/CGAL/Iso_rectangle_2_Iso_rectangle_2_intersection.h +++ b/Intersections_2/include/CGAL/Iso_rectangle_2_Iso_rectangle_2_intersection.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -101,6 +101,6 @@ do_intersect(const Iso_rectangle_2 &irect1, return ! intersection(irect1, irect2).is_empty(); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Intersections_2/include/CGAL/Line_2_Iso_rectangle_2_intersection.h b/Intersections_2/include/CGAL/Line_2_Iso_rectangle_2_intersection.h index 92788c6494ee..5ee0d697410f 100644 --- a/Intersections_2/include/CGAL/Line_2_Iso_rectangle_2_intersection.h +++ b/Intersections_2/include/CGAL/Line_2_Iso_rectangle_2_intersection.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -249,6 +249,6 @@ intersection(const Iso_rectangle_2 &iso, const Line_2 &line) return Intersect()(line, iso); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Intersections_2/include/CGAL/Line_2_Line_2_intersection.h b/Intersections_2/include/CGAL/Line_2_Line_2_intersection.h index ca0b86bf0e87..98d6086938d9 100644 --- a/Intersections_2/include/CGAL/Line_2_Line_2_intersection.h +++ b/Intersections_2/include/CGAL/Line_2_Line_2_intersection.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -218,6 +218,6 @@ intersection(const Line_2 &line1, const Line_2 &line2) return Intersect()(line1, line2); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Intersections_2/include/CGAL/Line_2_Triangle_2_intersection.h b/Intersections_2/include/CGAL/Line_2_Triangle_2_intersection.h index 00685064e1af..d74aa0db37d9 100644 --- a/Intersections_2/include/CGAL/Line_2_Triangle_2_intersection.h +++ b/Intersections_2/include/CGAL/Line_2_Triangle_2_intersection.h @@ -34,7 +34,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -226,6 +226,6 @@ intersection(const Triangle_2 &tr, const Line_2 &line) return Intersect()(line, tr); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Intersections_2/include/CGAL/Point_2_Iso_rectangle_2_intersection.h b/Intersections_2/include/CGAL/Point_2_Iso_rectangle_2_intersection.h index 9df323d3152b..06e7f630ec20 100644 --- a/Intersections_2/include/CGAL/Point_2_Iso_rectangle_2_intersection.h +++ b/Intersections_2/include/CGAL/Point_2_Iso_rectangle_2_intersection.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -121,6 +121,6 @@ intersection(const Point_2 &pt, return Intersect()(pt, iso); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Intersections_2/include/CGAL/Point_2_Line_2_intersection.h b/Intersections_2/include/CGAL/Point_2_Line_2_intersection.h index 458194506099..1a7496a8f931 100644 --- a/Intersections_2/include/CGAL/Point_2_Line_2_intersection.h +++ b/Intersections_2/include/CGAL/Point_2_Line_2_intersection.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -117,6 +117,6 @@ intersection(const Point_2 &pt, return Intersect()(pt, line); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Intersections_2/include/CGAL/Point_2_Point_2_intersection.h b/Intersections_2/include/CGAL/Point_2_Point_2_intersection.h index 87d3d654d5a0..48019f8ee740 100644 --- a/Intersections_2/include/CGAL/Point_2_Point_2_intersection.h +++ b/Intersections_2/include/CGAL/Point_2_Point_2_intersection.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -73,6 +73,6 @@ intersection(const Point_2 &pt1, const Point_2 &pt2) return Intersect()(pt1, pt2); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Intersections_2/include/CGAL/Point_2_Ray_2_intersection.h b/Intersections_2/include/CGAL/Point_2_Ray_2_intersection.h index 567a9d7f4a2c..ecb01a4c5b4a 100644 --- a/Intersections_2/include/CGAL/Point_2_Ray_2_intersection.h +++ b/Intersections_2/include/CGAL/Point_2_Ray_2_intersection.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -117,6 +117,6 @@ intersection(const Point_2 &pt, const Ray_2 &ray) return Intersect()(pt, ray); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Intersections_2/include/CGAL/Point_2_Segment_2_intersection.h b/Intersections_2/include/CGAL/Point_2_Segment_2_intersection.h index df619872d5aa..75fb2ff79e32 100644 --- a/Intersections_2/include/CGAL/Point_2_Segment_2_intersection.h +++ b/Intersections_2/include/CGAL/Point_2_Segment_2_intersection.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -116,6 +116,6 @@ intersection(const Point_2 &pt, const Segment_2 &seg) return Intersect()(pt, seg); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Intersections_2/include/CGAL/Point_2_Triangle_2_intersection.h b/Intersections_2/include/CGAL/Point_2_Triangle_2_intersection.h index 92b7a64d2e09..e8818cecea95 100644 --- a/Intersections_2/include/CGAL/Point_2_Triangle_2_intersection.h +++ b/Intersections_2/include/CGAL/Point_2_Triangle_2_intersection.h @@ -33,7 +33,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -191,6 +191,6 @@ intersection(const Point_2 &pt, const Triangle_2 &tr) return Intersect()(pt, tr); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Intersections_2/include/CGAL/Ray_2_Bbox_2_intersection.h b/Intersections_2/include/CGAL/Ray_2_Bbox_2_intersection.h index 38579a4e3587..8363166177d8 100644 --- a/Intersections_2/include/CGAL/Ray_2_Bbox_2_intersection.h +++ b/Intersections_2/include/CGAL/Ray_2_Bbox_2_intersection.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Bbox_2_Ray_2_pair_impl; @@ -72,7 +72,7 @@ inline bool do_intersect_ray_2( { return do_intersect_ray_2(box, ray); } -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Intersections_2/include/CGAL/Ray_2_Iso_rectangle_2_intersection.h b/Intersections_2/include/CGAL/Ray_2_Iso_rectangle_2_intersection.h index b288ee2427d2..d3e0a6034da1 100644 --- a/Intersections_2/include/CGAL/Ray_2_Iso_rectangle_2_intersection.h +++ b/Intersections_2/include/CGAL/Ray_2_Iso_rectangle_2_intersection.h @@ -34,7 +34,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -236,6 +236,6 @@ intersection(const Ray_2&ray, const Iso_rectangle_2&iso) return Intersect()(ray, iso); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_RAY_2_iSO_RECTANGLE_2_INTERSECTION_H diff --git a/Intersections_2/include/CGAL/Ray_2_Line_2_intersection.h b/Intersections_2/include/CGAL/Ray_2_Line_2_intersection.h index cbcca6af29e4..860bb99c7531 100644 --- a/Intersections_2/include/CGAL/Ray_2_Line_2_intersection.h +++ b/Intersections_2/include/CGAL/Ray_2_Line_2_intersection.h @@ -33,7 +33,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -192,6 +192,6 @@ intersection(const Ray_2 &ray, const Line_2 &line) return Intersect()(ray, line); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Intersections_2/include/CGAL/Ray_2_Ray_2_intersection.h b/Intersections_2/include/CGAL/Ray_2_Ray_2_intersection.h index 6e3d7b7bfc7b..72adfeb504a2 100644 --- a/Intersections_2/include/CGAL/Ray_2_Ray_2_intersection.h +++ b/Intersections_2/include/CGAL/Ray_2_Ray_2_intersection.h @@ -35,7 +35,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -275,6 +275,6 @@ intersection(const Ray_2 &ray1, return Intersect()(ray1, ray2); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Intersections_2/include/CGAL/Ray_2_Segment_2_intersection.h b/Intersections_2/include/CGAL/Ray_2_Segment_2_intersection.h index 21da8e70a3ae..b079b3cc2d5c 100644 --- a/Intersections_2/include/CGAL/Ray_2_Segment_2_intersection.h +++ b/Intersections_2/include/CGAL/Ray_2_Segment_2_intersection.h @@ -34,7 +34,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -299,6 +299,6 @@ intersection(const Ray_2 &ray, const Segment_2 &seg) return Intersect()(ray, seg); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Intersections_2/include/CGAL/Ray_2_Triangle_2_intersection.h b/Intersections_2/include/CGAL/Ray_2_Triangle_2_intersection.h index b430665a0d43..4dc9c91fa271 100644 --- a/Intersections_2/include/CGAL/Ray_2_Triangle_2_intersection.h +++ b/Intersections_2/include/CGAL/Ray_2_Triangle_2_intersection.h @@ -38,7 +38,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -232,6 +232,6 @@ intersection(const Triangle_2 &tr, const Ray_2 &ray) return Intersect()(ray, tr); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Intersections_2/include/CGAL/Segment_2_Iso_rectangle_2_intersection.h b/Intersections_2/include/CGAL/Segment_2_Iso_rectangle_2_intersection.h index e38f66c4b998..8451f04b1aa6 100644 --- a/Intersections_2/include/CGAL/Segment_2_Iso_rectangle_2_intersection.h +++ b/Intersections_2/include/CGAL/Segment_2_Iso_rectangle_2_intersection.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { template @@ -263,6 +263,6 @@ intersection(const Segment_2 &seg, return Intersect()(seg, iso); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_2_ISO_RECTANGLE_2_INTERSECTION_H diff --git a/Intersections_2/include/CGAL/Segment_2_Line_2_intersection.h b/Intersections_2/include/CGAL/Segment_2_Line_2_intersection.h index b29408071d66..a92694bdf086 100644 --- a/Intersections_2/include/CGAL/Segment_2_Line_2_intersection.h +++ b/Intersections_2/include/CGAL/Segment_2_Line_2_intersection.h @@ -33,7 +33,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -187,6 +187,6 @@ intersection(const Segment_2 &seg, const Line_2 &line) return Intersect()(line, seg); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Intersections_2/include/CGAL/Segment_2_Segment_2_intersection.h b/Intersections_2/include/CGAL/Segment_2_Segment_2_intersection.h index ba9a500a2c51..985ece75ee41 100644 --- a/Intersections_2/include/CGAL/Segment_2_Segment_2_intersection.h +++ b/Intersections_2/include/CGAL/Segment_2_Segment_2_intersection.h @@ -35,7 +35,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -473,6 +473,6 @@ intersection(const Segment_2 &seg1, return Intersect()(seg1, seg2); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Intersections_2/include/CGAL/Segment_2_Triangle_2_intersection.h b/Intersections_2/include/CGAL/Segment_2_Triangle_2_intersection.h index f1148fcfbe73..af1b839aa50b 100644 --- a/Intersections_2/include/CGAL/Segment_2_Triangle_2_intersection.h +++ b/Intersections_2/include/CGAL/Segment_2_Triangle_2_intersection.h @@ -34,7 +34,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -227,6 +227,6 @@ do_intersect(const Triangle_2 &tr, const Segment_2 &seg) return Do_intersect()(seg, tr); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Intersections_2/include/CGAL/Straight_2.h b/Intersections_2/include/CGAL/Straight_2.h index 7d3d9b6b6022..ec2bd39d2660 100644 --- a/Intersections_2/include/CGAL/Straight_2.h +++ b/Intersections_2/include/CGAL/Straight_2.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -350,7 +350,7 @@ collinear_order(typename K::Point_2 const &pt1, typename K::Point_2 const & pt2) } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Intersections_2/include/CGAL/Triangle_2_Triangle_2_do_intersect.h b/Intersections_2/include/CGAL/Triangle_2_Triangle_2_do_intersect.h index f5ffe714e5f6..b0ede9e03901 100644 --- a/Intersections_2/include/CGAL/Triangle_2_Triangle_2_do_intersect.h +++ b/Intersections_2/include/CGAL/Triangle_2_Triangle_2_do_intersect.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { @@ -181,6 +181,6 @@ inline bool do_intersect(const Triangle_2 &t1, return Do_intersect()(t1,t2); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_TRIANGLE_2_TRIANGLE_2_DO_INTERSECT_H diff --git a/Intersections_2/include/CGAL/Triangle_2_Triangle_2_intersection.h b/Intersections_2/include/CGAL/Triangle_2_Triangle_2_intersection.h index 25b2f5c82c7d..965fdf0ad424 100644 --- a/Intersections_2/include/CGAL/Triangle_2_Triangle_2_intersection.h +++ b/Intersections_2/include/CGAL/Triangle_2_Triangle_2_intersection.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template inline @@ -40,7 +40,7 @@ intersection(const Triangle_2 &tr1, return Intersect()(tr1, tr2); } -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Intersections_2/src/CGAL/Bbox_2_intersections.cpp b/Intersections_2/src/CGAL/Bbox_2_intersections.cpp index 0e3a7d60f444..e53f131e5d41 100644 --- a/Intersections_2/src/CGAL/Bbox_2_intersections.cpp +++ b/Intersections_2/src/CGAL/Bbox_2_intersections.cpp @@ -28,7 +28,7 @@ typedef CGAL::Simple_cartesian Rcart; -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Bbox_2_Line_2_pair_impl { @@ -363,4 +363,4 @@ bool do_intersect_ray_2( return pair.intersection_type() != Bbox_2_Ray_2_pair::NO_INTERSECTION; } -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h b/Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h index 2522736f633d..6c32dac48bdc 100644 --- a/Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h +++ b/Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -1093,4 +1093,4 @@ do_intersect(const Plane_3 &p, return typename K::Do_intersect_3()(p, s); } -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Intersections_3/include/CGAL/Triangle_3_Line_3_do_intersect.h b/Intersections_3/include/CGAL/Triangle_3_Line_3_do_intersect.h index 300969f45b15..a63e2a40e31b 100644 --- a/Intersections_3/include/CGAL/Triangle_3_Line_3_do_intersect.h +++ b/Intersections_3/include/CGAL/Triangle_3_Line_3_do_intersect.h @@ -21,7 +21,7 @@ #ifndef CGAL_TRIANGLE_3_LINE_3_DO_INTERSECT_H #define CGAL_TRIANGLE_3_LINE_3_DO_INTERSECT_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -134,6 +134,6 @@ inline bool do_intersect(const Line_3 &l, } */ -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_TRIANGLE_3_LINE_3_DO_INTERSECT_H diff --git a/Intersections_3/include/CGAL/Triangle_3_Plane_3_do_intersect.h b/Intersections_3/include/CGAL/Triangle_3_Plane_3_do_intersect.h index 686594ac87c0..d86481ee042a 100644 --- a/Intersections_3/include/CGAL/Triangle_3_Plane_3_do_intersect.h +++ b/Intersections_3/include/CGAL/Triangle_3_Plane_3_do_intersect.h @@ -21,7 +21,7 @@ #ifndef CGAL_TRIANGLE_3_PLANE_3_DO_INTERSECT_H #define CGAL_TRIANGLE_3_PLANE_3_DO_INTERSECT_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -97,6 +97,6 @@ inline bool do_intersect(const Plane_3 &h, */ -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_TRIANGLE_3_PLANE_3_DO_INTERSECT_H diff --git a/Intersections_3/include/CGAL/Triangle_3_Point_3_do_intersect.h b/Intersections_3/include/CGAL/Triangle_3_Point_3_do_intersect.h index ca046e2b8a44..9b89ca21269a 100644 --- a/Intersections_3/include/CGAL/Triangle_3_Point_3_do_intersect.h +++ b/Intersections_3/include/CGAL/Triangle_3_Point_3_do_intersect.h @@ -21,7 +21,7 @@ #ifndef CGAL_TRIANGLE_3_POINT_3_DO_INTERSECT_H #define CGAL_TRIANGLE_3_POINT_3_DO_INTERSECT_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -117,6 +117,6 @@ inline bool do_intersect(const Point_3 &p, } */ -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGLE_3_POINT_3_DO_INTERSECT_H diff --git a/Intersections_3/include/CGAL/Triangle_3_Ray_3_do_intersect.h b/Intersections_3/include/CGAL/Triangle_3_Ray_3_do_intersect.h index 6677acc9a691..19b69d8ca355 100644 --- a/Intersections_3/include/CGAL/Triangle_3_Ray_3_do_intersect.h +++ b/Intersections_3/include/CGAL/Triangle_3_Ray_3_do_intersect.h @@ -21,7 +21,7 @@ #ifndef CGAL_TRIANGLE_3_RAY_3_DO_INTERSECT_H #define CGAL_TRIANGLE_3_RAY_3_DO_INTERSECT_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -324,6 +324,6 @@ inline bool do_intersect(const Ray_3 &r, } */ -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGLE_3_RAY_3_DO_INTERSECT_H diff --git a/Intersections_3/include/CGAL/Triangle_3_Segment_3_do_intersect.h b/Intersections_3/include/CGAL/Triangle_3_Segment_3_do_intersect.h index 81c9d2165ec7..10f2e9924e14 100644 --- a/Intersections_3/include/CGAL/Triangle_3_Segment_3_do_intersect.h +++ b/Intersections_3/include/CGAL/Triangle_3_Segment_3_do_intersect.h @@ -21,7 +21,7 @@ #ifndef CGAL_TRIANGLE_3_SEGMENT_3_DO_INTERSECT_H #define CGAL_TRIANGLE_3_SEGMENT_3_DO_INTERSECT_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -327,6 +327,6 @@ inline bool do_intersect(const Segment_3 &s, } */ -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_TRIANGLE_3_SEGMENT_3_DO_INTERSECT_H diff --git a/Intersections_3/include/CGAL/Triangle_3_Tetrahedron_3_do_intersect.h b/Intersections_3/include/CGAL/Triangle_3_Tetrahedron_3_do_intersect.h index 875af7a8a956..af51b2a4be29 100644 --- a/Intersections_3/include/CGAL/Triangle_3_Tetrahedron_3_do_intersect.h +++ b/Intersections_3/include/CGAL/Triangle_3_Tetrahedron_3_do_intersect.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -85,6 +85,6 @@ inline bool do_intersect(const Triangle_3 &tr, return typename K::Do_intersect_3()(tr,tet); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGLE_3_TETRAHEDRON_3_DO_INTERSECT_H diff --git a/Intersections_3/include/CGAL/Triangle_3_Triangle_3_do_intersect.h b/Intersections_3/include/CGAL/Triangle_3_Triangle_3_do_intersect.h index 50c48e9fbcec..36d86962daca 100644 --- a/Intersections_3/include/CGAL/Triangle_3_Triangle_3_do_intersect.h +++ b/Intersections_3/include/CGAL/Triangle_3_Triangle_3_do_intersect.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -453,6 +453,6 @@ do_intersect(const Triangle_3 &t1, return typename K::Do_intersect_3()(t1,t2); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGLE_3_TRIANGLE_3_DO_INTERSECT_H diff --git a/Intersections_3/include/CGAL/bbox_intersection_3.h b/Intersections_3/include/CGAL/bbox_intersection_3.h index 28f1de301270..0219e8a95422 100644 --- a/Intersections_3/include/CGAL/bbox_intersection_3.h +++ b/Intersections_3/include/CGAL/bbox_intersection_3.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // This function intersects a bbox with a ray, line or segment // Its essentially a copy of the function that was in Bbox_3_intersections.cpp @@ -159,6 +159,6 @@ intersection_bl(const Bbox_3 &box, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_BBOX_INTERSECTION_3_H diff --git a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Bbox_3_do_intersect.h b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Bbox_3_do_intersect.h index 838b31bf7899..2f60cce56aff 100644 --- a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Bbox_3_do_intersect.h +++ b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Bbox_3_do_intersect.h @@ -30,7 +30,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { bool inline @@ -40,6 +40,6 @@ do_intersect(const CGAL::Bbox_3& c, return CGAL::do_overlap(c, bbox); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_INTERNAL_INTERSECTIONS_3_BBOX_3_BBOX_3_DO_INTERSECT_H diff --git a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Line_3_do_intersect.h b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Line_3_do_intersect.h index 1bd77d881d59..580e53b68b47 100644 --- a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Line_3_do_intersect.h +++ b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Line_3_do_intersect.h @@ -28,7 +28,7 @@ // inspired from http://cag.csail.mit.edu/~amy/papers/box-jgt.pdf -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -149,6 +149,6 @@ bool do_intersect(const CGAL::Bbox_3& bbox, return typename K::Do_intersect_3()(line, bbox); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_INTERNAL_INTERSECTIONS_3_BBOX_3_LINE_3_DO_INTERSECT_H diff --git a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Ray_3_do_intersect.h b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Ray_3_do_intersect.h index 691a8b2d3750..32a32b97ad23 100644 --- a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Ray_3_do_intersect.h +++ b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Ray_3_do_intersect.h @@ -27,7 +27,7 @@ // inspired from http://cag.csail.mit.edu/~amy/papers/box-jgt.pdf -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -158,6 +158,6 @@ bool do_intersect(const CGAL::Bbox_3& bbox, return typename K::Do_intersect_3()(ray, bbox); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_INTERNAL_INTERSECTIONS_3_BBOX_3_RAY_3_DO_INTERSECT_H diff --git a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Segment_3_do_intersect.h b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Segment_3_do_intersect.h index 0a06200c305d..afbd63bc13ef 100644 --- a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Segment_3_do_intersect.h +++ b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Segment_3_do_intersect.h @@ -28,7 +28,7 @@ // inspired from http://cag.csail.mit.edu/~amy/papers/box-jgt.pdf -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -167,6 +167,6 @@ bool do_intersect(const CGAL::Bbox_3& bbox, return typename K::Do_intersect_3()(segment, bbox); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_INTERNAL_INTERSECTIONS_3_BBOX_3_SEGMENT_3_DO_INTERSECT_H diff --git a/Intersections_3/include/CGAL/intersection_3_1.h b/Intersections_3/include/CGAL/intersection_3_1.h index f7aee98158de..01ee65456301 100644 --- a/Intersections_3/include/CGAL/intersection_3_1.h +++ b/Intersections_3/include/CGAL/intersection_3_1.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template Object @@ -324,7 +324,7 @@ do_intersect(const Iso_cuboid_3 &j, const Segment_3 &s) return ! CGAL::intersection(s, j).empty(); } -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Interval_support/include/CGAL/Bigfloat_interval_traits.h b/Interval_support/include/CGAL/Bigfloat_interval_traits.h index 957f1e00c9c9..50a7c71075b1 100644 --- a/Interval_support/include/CGAL/Bigfloat_interval_traits.h +++ b/Interval_support/include/CGAL/Bigfloat_interval_traits.h @@ -33,7 +33,7 @@ #endif #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // TODO: rename this into MPFI_traits ? // add a better rounding control @@ -60,6 +60,6 @@ template inline long relative_precision(const BFI& bfi) { relative_precision; return relative_precision(bfi); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_BIGFLOAT_INTERVAL_TRAITS_H diff --git a/Interval_support/include/CGAL/Interval_traits.h b/Interval_support/include/CGAL/Interval_traits.h index d8129bb3c7f4..d36bfc1f1ab7 100644 --- a/Interval_support/include/CGAL/Interval_traits.h +++ b/Interval_support/include/CGAL/Interval_traits.h @@ -53,7 +53,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal{ @@ -207,6 +207,6 @@ hull(Interval interval1, Interval interval2) { -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_INTERVAL_TRAITS_H diff --git a/Interval_support/include/CGAL/Test/_test_bigfloat_interval_traits.h b/Interval_support/include/CGAL/Test/_test_bigfloat_interval_traits.h index ee98cec3d230..27a86277700e 100644 --- a/Interval_support/include/CGAL/Test/_test_bigfloat_interval_traits.h +++ b/Interval_support/include/CGAL/Test/_test_bigfloat_interval_traits.h @@ -34,7 +34,7 @@ #ifndef CGAL_TEST_BIGFLOAT_INTERVAL_TRAITS_H #define CGAL_TEST_BIGFLOAT_INTERVAL_TRAITS_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void test_bigfloat_interval_traits() { @@ -72,6 +72,6 @@ void test_bigfloat_interval_traits() { assert(CGAL::relative_precision(CGAL::hull(BFI(8),BFI(7)))==2); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TEST_REAL_COMPARABLE_H diff --git a/Interval_support/include/CGAL/Test/_test_convert_to_bfi.h b/Interval_support/include/CGAL/Test/_test_convert_to_bfi.h index 50abe2d3ab94..6b20168a48ae 100644 --- a/Interval_support/include/CGAL/Test/_test_convert_to_bfi.h +++ b/Interval_support/include/CGAL/Test/_test_convert_to_bfi.h @@ -36,7 +36,7 @@ #ifndef CGAL_TEST_CONVERT_TO_BFI_H #define CGAL_TEST_CONVERT_TO_BFI_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { // BFI = Bigfloat_interval @@ -69,6 +69,6 @@ void test_convert_to_bfi(){ test_convert_to_bfi_from( BFI() , EXT()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TEST_REAL_COMPARABLE_H diff --git a/Interval_support/include/CGAL/Test/_test_interval_traits.h b/Interval_support/include/CGAL/Test/_test_interval_traits.h index 5b19e5a3b2c6..b98bc26dbdb4 100644 --- a/Interval_support/include/CGAL/Test/_test_interval_traits.h +++ b/Interval_support/include/CGAL/Test/_test_interval_traits.h @@ -36,7 +36,7 @@ #ifndef CGAL_TEST_INTERVAL_TRAITS_H #define CGAL_TEST_INTERVAL_TRAITS_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void test_with_empty_interval(CGAL::Tag_false) { @@ -205,6 +205,6 @@ void test_interval_traits() { assert(width(hull(Interval(2),Interval(3))) == Bound(1)); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TEST_REAL_COMPARABLE_H diff --git a/Interval_support/include/CGAL/convert_to_bfi.h b/Interval_support/include/CGAL/convert_to_bfi.h index d9e7cb5b2cae..3bc89bc5f06a 100644 --- a/Interval_support/include/CGAL/convert_to_bfi.h +++ b/Interval_support/include/CGAL/convert_to_bfi.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template typename Get_arithmetic_kernel::Arithmetic_kernel::Bigfloat_interval @@ -38,6 +38,6 @@ convert_to_bfi(const NTX& x) { return typename CT::Cast()(x); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CONVERT_TO_BFI_H diff --git a/Inventor/include/CGAL/IO/Alpha_shape_3_VRML_2_ostream.h b/Inventor/include/CGAL/IO/Alpha_shape_3_VRML_2_ostream.h index 223d5593f75c..7f358806106c 100644 --- a/Inventor/include/CGAL/IO/Alpha_shape_3_VRML_2_ostream.h +++ b/Inventor/include/CGAL/IO/Alpha_shape_3_VRML_2_ostream.h @@ -27,7 +27,7 @@ #include #ifdef CGAL_ALPHA_SHAPE_3_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template VRML_2_ostream& @@ -96,7 +96,7 @@ operator<<(VRML_2_ostream& os, return os; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ALPHA_SHAPE_3_H #endif CGAL_ALPHA_SHAPE_3_VRML_2_OSTREAM_H diff --git a/Inventor/include/CGAL/IO/Inventor_ostream.h b/Inventor/include/CGAL/IO/Inventor_ostream.h index d1657c15d228..c8d05bb79171 100644 --- a/Inventor/include/CGAL/IO/Inventor_ostream.h +++ b/Inventor/include/CGAL/IO/Inventor_ostream.h @@ -33,7 +33,7 @@ // output operators could be shared if they use the following // base class, which is common for both output streams. -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Inventor_ostream_base { private: @@ -84,7 +84,7 @@ class Inventor_ostream : public Inventor_ostream_base } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_INVENTOR_OSTREAM_H @@ -92,7 +92,7 @@ CGAL_END_NAMESPACE #ifndef CGAL_INVENTOR_TETRAHEDRON_3 #define CGAL_INVENTOR_TETRAHEDRON_3 -CGAL_BEGIN_NAMESPACE +namespace CGAL { template Inventor_ostream& @@ -128,7 +128,7 @@ operator<<(Inventor_ostream& os, return os; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_INVENTOR_TETRAHEDRON_3 #endif // CGAL_TETRAHEDRON_3_H diff --git a/Inventor/include/CGAL/IO/VRML_1_ostream.h b/Inventor/include/CGAL/IO/VRML_1_ostream.h index 0ef4e0965af5..39ea6c0b4201 100644 --- a/Inventor/include/CGAL/IO/VRML_1_ostream.h +++ b/Inventor/include/CGAL/IO/VRML_1_ostream.h @@ -37,7 +37,7 @@ // base class Inventor_ostream_base, which is common for // both output streams. -CGAL_BEGIN_NAMESPACE +namespace CGAL { class VRML_1_ostream : public Inventor_ostream_base { public: @@ -57,7 +57,7 @@ class VRML_1_ostream : public Inventor_ostream_base { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_VRML_1_OSTREAM_H @@ -65,7 +65,7 @@ CGAL_END_NAMESPACE #ifndef CGAL_IO_VRML_1_TETRAHEDRON_3 #define CGAL_IO_VRML_1_TETRAHEDRON_3 -CGAL_BEGIN_NAMESPACE +namespace CGAL { template VRML_1_ostream& @@ -101,7 +101,7 @@ operator<<(VRML_1_ostream& os, return os; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_VRML_1_TETRAHEDRON_3 #endif // CGAL_TETRAHEDRON_3_H diff --git a/Inventor/include/CGAL/IO/VRML_2_ostream.h b/Inventor/include/CGAL/IO/VRML_2_ostream.h index a4609837e7c7..9a5ce79e3f53 100644 --- a/Inventor/include/CGAL/IO/VRML_2_ostream.h +++ b/Inventor/include/CGAL/IO/VRML_2_ostream.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class VRML_2_ostream { public: @@ -103,7 +103,7 @@ operator<<(VRML_2_ostream& os, return os; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_VRML_2_OSTREAM_H @@ -111,7 +111,7 @@ CGAL_END_NAMESPACE #ifndef CGAL_IO_VRML_2_TETRAHEDRON_3 #define CGAL_IO_VRML_2_TETRAHEDRON_3 -CGAL_BEGIN_NAMESPACE +namespace CGAL { template VRML_2_ostream& @@ -158,7 +158,7 @@ operator<<(VRML_2_ostream& os, return os; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_VRML_2_TETRAHEDRON_3 #endif // CGAL_TETRAHEDRON_3_H @@ -167,7 +167,7 @@ CGAL_END_NAMESPACE #ifndef CGAL_IO_VRML_2_POINT_3 #define CGAL_IO_VRML_2_POINT_3 -CGAL_BEGIN_NAMESPACE +namespace CGAL { template VRML_2_ostream& @@ -193,7 +193,7 @@ operator<<(VRML_2_ostream& os, return os; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_VRML_2_POINT_3 #endif // CGAL_POINT_3_H @@ -204,7 +204,7 @@ CGAL_END_NAMESPACE #ifndef CGAL_IO_VRML_2_TRIANGLE_3 #define CGAL_IO_VRML_2_TRIANGLE_3 -CGAL_BEGIN_NAMESPACE +namespace CGAL { template VRML_2_ostream& @@ -237,7 +237,7 @@ operator<<(VRML_2_ostream& os, return os; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_VRML_2_TRIANGLE_3 #endif // CGAL_TRIANGLE_3_H @@ -247,7 +247,7 @@ CGAL_END_NAMESPACE #ifndef CGAL_IO_VRML_2_SEGMENT_3 #define CGAL_IO_VRML_2_SEGMENT_3 -CGAL_BEGIN_NAMESPACE +namespace CGAL { template VRML_2_ostream& @@ -279,7 +279,7 @@ operator<<(VRML_2_ostream& os, return os; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_VRML_2_SEGMENT_3 #endif // CGAL_SEGMENT_3_H @@ -288,7 +288,7 @@ CGAL_END_NAMESPACE #ifndef CGAL_IO_VRML_2_SPHERE_3 #define CGAL_IO_VRML_2_SPHERE_3 -CGAL_BEGIN_NAMESPACE +namespace CGAL { template VRML_2_ostream& @@ -316,7 +316,7 @@ operator<<(VRML_2_ostream& os, return os; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_VRML_2_SEGMENT_3 #endif // CGAL_SPHERE_3_H diff --git a/Jet_fitting_3/include/CGAL/Monge_via_jet_fitting.h b/Jet_fitting_3/include/CGAL/Monge_via_jet_fitting.h index 8794632a3d34..e436c2cb4d36 100644 --- a/Jet_fitting_3/include/CGAL/Monge_via_jet_fitting.h +++ b/Jet_fitting_3/include/CGAL/Monge_via_jet_fitting.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { inline unsigned int fact(unsigned int n){ @@ -757,6 +757,6 @@ switch_to_direct_orientation(Vector_3& v1, const Vector_3& v2, // return out_stream; // } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_MONGE_VIA_JET_FITTING_H_ diff --git a/Kernel_23/include/CGAL/Aff_transformation_2.h b/Kernel_23/include/CGAL/Aff_transformation_2.h index d7c60e9a1db0..bf2e9fefe745 100644 --- a/Kernel_23/include/CGAL/Aff_transformation_2.h +++ b/Kernel_23/include/CGAL/Aff_transformation_2.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Aff_transformation_2 : public R_::Kernel_base::Aff_transformation_2 @@ -126,6 +126,6 @@ operator>>(std::istream &is, CGAL::Aff_transformation_2 &t) } #endif // CGAL_NO_ISTREAM_EXTRACT_AFF_TRANSFORMATION_2 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_AFF_TRANSFORMATION_2_H diff --git a/Kernel_23/include/CGAL/Aff_transformation_3.h b/Kernel_23/include/CGAL/Aff_transformation_3.h index bee06057427d..2374bc6b0cea 100644 --- a/Kernel_23/include/CGAL/Aff_transformation_3.h +++ b/Kernel_23/include/CGAL/Aff_transformation_3.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Aff_transformation_3 : public R_::Kernel_base::Aff_transformation_3 @@ -98,6 +98,6 @@ operator>>(std::istream& is, CGAL::Aff_transformation_3& t) } #endif // CGAL_NO_ISTREAM_EXTRACT_AFF_TRANSFORMATION_3 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_AFF_TRANSFORMATION_3_H diff --git a/Kernel_23/include/CGAL/Bbox_2.h b/Kernel_23/include/CGAL/Bbox_2.h index d155f833e23b..8076caaa0d65 100644 --- a/Kernel_23/include/CGAL/Bbox_2.h +++ b/Kernel_23/include/CGAL/Bbox_2.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename T > struct Simple_cartesian; @@ -194,6 +194,6 @@ operator>>(std::istream &is, Bbox_2 &b) return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_BBOX_2_H diff --git a/Kernel_23/include/CGAL/Bbox_3.h b/Kernel_23/include/CGAL/Bbox_3.h index f5d33ce80345..c20065e2da38 100644 --- a/Kernel_23/include/CGAL/Bbox_3.h +++ b/Kernel_23/include/CGAL/Bbox_3.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename T > struct Simple_cartesian; @@ -218,6 +218,6 @@ operator>>(std::istream &is, Bbox_3& b) return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_BBOX_3_H diff --git a/Kernel_23/include/CGAL/Circle_2.h b/Kernel_23/include/CGAL/Circle_2.h index 0f710ca239d1..208d387a5d68 100644 --- a/Kernel_23/include/CGAL/Circle_2.h +++ b/Kernel_23/include/CGAL/Circle_2.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Circle_2 : public R_::Kernel_base::Circle_2 @@ -296,6 +296,6 @@ operator>>(std::istream &is, Circle_2 &c) return extract(is,c); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CIRCLE_2_H diff --git a/Kernel_23/include/CGAL/Circle_3.h b/Kernel_23/include/CGAL/Circle_3.h index 2fb6cc18b1a7..16c347bbfd01 100644 --- a/Kernel_23/include/CGAL/Circle_3.h +++ b/Kernel_23/include/CGAL/Circle_3.h @@ -37,7 +37,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Circle_3 @@ -197,6 +197,6 @@ operator>>(std::istream & is, Circle_3 &c) return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CIRCLE_3_H diff --git a/Kernel_23/include/CGAL/Dimension.h b/Kernel_23/include/CGAL/Dimension.h index ae16dee021fb..debd7e4e4f7a 100644 --- a/Kernel_23/include/CGAL/Dimension.h +++ b/Kernel_23/include/CGAL/Dimension.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // These tag classes help dispatching functions based on a geometric dimension. @@ -69,6 +69,6 @@ struct Feature_dimension typedef typename K::template Feature_dimension::type type; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_DIMENSION_H diff --git a/Kernel_23/include/CGAL/Direction_2.h b/Kernel_23/include/CGAL/Direction_2.h index 3b6fbd9d8a98..8b978fea4469 100644 --- a/Kernel_23/include/CGAL/Direction_2.h +++ b/Kernel_23/include/CGAL/Direction_2.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Direction_2 : public R_::Kernel_base::Direction_2 @@ -276,6 +276,6 @@ operator>>(std::istream& is, Direction_2& d) return extract(is, d, typename R::Kernel_tag() ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_DIRECTION_2_H diff --git a/Kernel_23/include/CGAL/Direction_3.h b/Kernel_23/include/CGAL/Direction_3.h index f0c1b3a39588..76ffe708c1ff 100644 --- a/Kernel_23/include/CGAL/Direction_3.h +++ b/Kernel_23/include/CGAL/Direction_3.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Direction_3 : public R_::Kernel_base::Direction_3 @@ -236,6 +236,6 @@ operator>>(std::istream& is, Direction_3& d) return extract(is, d, typename R::Kernel_tag() ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_DIRECTION_3_H diff --git a/Kernel_23/include/CGAL/Enum_converter.h b/Kernel_23/include/CGAL/Enum_converter.h index facfae55ffa8..01215cda38a9 100644 --- a/Kernel_23/include/CGAL/Enum_converter.h +++ b/Kernel_23/include/CGAL/Enum_converter.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { struct Enum_converter { @@ -41,7 +41,7 @@ struct Enum_converter }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ENUM_CONVERTER_H diff --git a/Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel.h b/Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel.h index c23c9e242e9c..7afcad0c2fb1 100644 --- a/Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel.h +++ b/Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel.h @@ -39,7 +39,7 @@ # include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { #ifdef CGAL_DONT_USE_LAZY_KERNEL @@ -63,6 +63,6 @@ typedef Lazy_kernel > > #endif -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_EXACT_PREDICATES_EXACT_CONSTRUCTIONS_KERNEL_H diff --git a/Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h b/Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h index 2d9432e8f6b6..22b8ce5a37c4 100644 --- a/Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h +++ b/Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h @@ -34,7 +34,7 @@ # error "You need LEDA or CORE installed." #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { #ifdef CGAL_USE_LEDA typedef Simple_cartesian< leda_real > @@ -44,6 +44,6 @@ typedef Simple_cartesian< CORE::Expr > Exact_predicates_exact_constructions_kernel_with_sqrt; #endif -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_EXACT_PREDICATES_EXACT_CONSTRUCTIONS_KERNEL_WITH_SQRT_H diff --git a/Kernel_23/include/CGAL/Exact_predicates_inexact_constructions_kernel.h b/Kernel_23/include/CGAL/Exact_predicates_inexact_constructions_kernel.h index bb92b4c0cf61..2fc3c51c03cb 100644 --- a/Kernel_23/include/CGAL/Exact_predicates_inexact_constructions_kernel.h +++ b/Kernel_23/include/CGAL/Exact_predicates_inexact_constructions_kernel.h @@ -27,11 +27,11 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { typedef Filtered_kernel< Simple_cartesian > Exact_predicates_inexact_constructions_kernel; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_EXACT_PREDICATES_INEXACT_CONSTRUCTIONS_KERNEL_H diff --git a/Kernel_23/include/CGAL/Is_a_predicate.h b/Kernel_23/include/CGAL/Is_a_predicate.h index 057b80022968..5b0aae02c688 100644 --- a/Kernel_23/include/CGAL/Is_a_predicate.h +++ b/Kernel_23/include/CGAL/Is_a_predicate.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -68,6 +68,6 @@ struct Is_a_predicate { typename Functor::result_type>::type type; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IS_A_PREDICATE_H diff --git a/Kernel_23/include/CGAL/Iso_cuboid_3.h b/Kernel_23/include/CGAL/Iso_cuboid_3.h index 7d8397064b77..faddad5472e3 100644 --- a/Kernel_23/include/CGAL/Iso_cuboid_3.h +++ b/Kernel_23/include/CGAL/Iso_cuboid_3.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Iso_cuboid_3 : public R_::Kernel_base::Iso_cuboid_3 @@ -263,6 +263,6 @@ operator>>(std::istream& is, Iso_cuboid_3& r) return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ISO_CUBOID_3_H diff --git a/Kernel_23/include/CGAL/Iso_rectangle_2.h b/Kernel_23/include/CGAL/Iso_rectangle_2.h index 70a6e3b2297a..3875e377d867 100644 --- a/Kernel_23/include/CGAL/Iso_rectangle_2.h +++ b/Kernel_23/include/CGAL/Iso_rectangle_2.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Iso_rectangle_2 : public R_::Kernel_base::Iso_rectangle_2 @@ -250,6 +250,6 @@ operator>>(std::istream &is, Iso_rectangle_2 &r) return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ISO_RECTANGLE_2_H diff --git a/Kernel_23/include/CGAL/Kernel/Dimension_utils.h b/Kernel_23/include/CGAL/Kernel/Dimension_utils.h index 70de7113ec2e..173f2a351fc2 100644 --- a/Kernel_23/include/CGAL/Kernel/Dimension_utils.h +++ b/Kernel_23/include/CGAL/Kernel/Dimension_utils.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Access { @@ -177,6 +177,6 @@ struct Aff_transformation } // namespace Access -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_KERNEL_DIMENSION_UTILS_H diff --git a/Kernel_23/include/CGAL/Kernel/Return_base_tag.h b/Kernel_23/include/CGAL/Kernel/Return_base_tag.h index bd73c26e676d..515bf0415300 100644 --- a/Kernel_23/include/CGAL/Kernel/Return_base_tag.h +++ b/Kernel_23/include/CGAL/Kernel/Return_base_tag.h @@ -36,10 +36,10 @@ // will be available in C++. // In the mean time, this should be a mostly/hopefully internal hack. -CGAL_BEGIN_NAMESPACE +namespace CGAL { struct Return_base_tag {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Kernel_23/include/CGAL/Kernel/Same_uncertainty.h b/Kernel_23/include/CGAL/Kernel/Same_uncertainty.h index 26c90da67421..d3c5fae18801 100644 --- a/Kernel_23/include/CGAL/Kernel/Same_uncertainty.h +++ b/Kernel_23/include/CGAL/Kernel/Same_uncertainty.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename T1, typename T2 > struct Same_uncertainty @@ -48,6 +48,6 @@ template < typename T1, typename NT > struct Same_uncertainty_nt : Same_uncertainty ::result_type > {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SAME_UNCERTAINTY_H diff --git a/Kernel_23/include/CGAL/Kernel/Type_equality_wrapper.h b/Kernel_23/include/CGAL/Kernel/Type_equality_wrapper.h index 5a6cb70e0ee3..9d4d869aeda3 100644 --- a/Kernel_23/include/CGAL/Kernel/Type_equality_wrapper.h +++ b/Kernel_23/include/CGAL/Kernel/Type_equality_wrapper.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // This is a kernel wrapper which provides the type equality between // Kernel::Point_2 and CGAL::Point_2, by deriving from @@ -48,6 +48,6 @@ struct Type_equality_wrapper typedef CGAL::Aff_transformation_3 Aff_transformation_3; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_KERNEL_TYPE_EQUALITY_WRAPPER_H diff --git a/Kernel_23/include/CGAL/Kernel/Type_mapper.h b/Kernel_23/include/CGAL/Kernel/Type_mapper.h index 802602ad770a..5c0e29315489 100644 --- a/Kernel_23/include/CGAL/Kernel/Type_mapper.h +++ b/Kernel_23/include/CGAL/Kernel/Type_mapper.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // This is a tool to obtain the K2::Point_2 from K1 and K1::Point_2. // Similarly for other kernel types. @@ -48,6 +48,6 @@ struct Type_mapper #include -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_KERNEL_TYPE_MAPPER_H diff --git a/Kernel_23/include/CGAL/Kernel/Wutils.h b/Kernel_23/include/CGAL/Kernel/Wutils.h index af9bbd9f98ed..a44e5e143fa9 100644 --- a/Kernel_23/include/CGAL/Kernel/Wutils.h +++ b/Kernel_23/include/CGAL/Kernel/Wutils.h @@ -31,7 +31,7 @@ // Functions wmult() and wcross(). -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -324,6 +324,6 @@ wcross(const Point_3 &p, return internal::wcross_functor_3()(p, q, r); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_KERNEL_WUTILS_H diff --git a/Kernel_23/include/CGAL/Kernel/function_objects.h b/Kernel_23/include/CGAL/Kernel/function_objects.h index 6170cc2d2fd8..d7a649bb8323 100644 --- a/Kernel_23/include/CGAL/Kernel/function_objects.h +++ b/Kernel_23/include/CGAL/Kernel/function_objects.h @@ -34,7 +34,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace CommonKernelFunctors { @@ -2712,6 +2712,6 @@ namespace CommonKernelFunctors { } // namespace CommonKernelFunctors -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_KERNEL_FUNCTION_OBJECTS_H diff --git a/Kernel_23/include/CGAL/Kernel/global_functions.h b/Kernel_23/include/CGAL/Kernel/global_functions.h index 4eb3363c41da..b81ab8d5c1e1 100644 --- a/Kernel_23/include/CGAL/Kernel/global_functions.h +++ b/Kernel_23/include/CGAL/Kernel/global_functions.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template inline @@ -41,6 +41,6 @@ parallel(const O &o1, const O &o2) return internal::parallel(o1, o2, K()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_KERNEL_GLOBAL_FUNCTIONS_H diff --git a/Kernel_23/include/CGAL/Kernel/global_functions_2.h b/Kernel_23/include/CGAL/Kernel/global_functions_2.h index 9149a70e51d9..975d4ae76e2b 100644 --- a/Kernel_23/include/CGAL/Kernel/global_functions_2.h +++ b/Kernel_23/include/CGAL/Kernel/global_functions_2.h @@ -33,7 +33,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class K > typename K::Boolean @@ -992,6 +992,6 @@ y_equal(const Point_2 &p, const Point_2 &q) return internal::y_equal(p, q, K()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_KERNEL_GLOBAL_FUNCTIONS_2_H diff --git a/Kernel_23/include/CGAL/Kernel/global_functions_3.h b/Kernel_23/include/CGAL/Kernel/global_functions_3.h index 6b059e3904cb..06c81f13c1f1 100644 --- a/Kernel_23/include/CGAL/Kernel/global_functions_3.h +++ b/Kernel_23/include/CGAL/Kernel/global_functions_3.h @@ -31,7 +31,7 @@ // Generic functions calling the kernel functor. // See comments in CGAL/Kernel/global_functions_2.h. -CGAL_BEGIN_NAMESPACE +namespace CGAL { template inline @@ -1094,6 +1094,6 @@ z_equal(const Point_3 &p, const Point_3 &q) return internal::z_equal(p, q, K()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_KERNEL_GLOBAL_FUNCTIONS_3_H diff --git a/Kernel_23/include/CGAL/Kernel/global_functions_internal_2.h b/Kernel_23/include/CGAL/Kernel/global_functions_internal_2.h index 66948f849d11..95367065db6b 100644 --- a/Kernel_23/include/CGAL/Kernel/global_functions_internal_2.h +++ b/Kernel_23/include/CGAL/Kernel/global_functions_internal_2.h @@ -31,7 +31,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -873,6 +873,6 @@ y_equal(const typename K::Point_2 &p, } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_KERNEL_GLOBAL_FUNCTIONS_INTERNAL_2_H diff --git a/Kernel_23/include/CGAL/Kernel/global_functions_internal_3.h b/Kernel_23/include/CGAL/Kernel/global_functions_internal_3.h index 9d74d3acd027..7842408a309d 100644 --- a/Kernel_23/include/CGAL/Kernel/global_functions_internal_3.h +++ b/Kernel_23/include/CGAL/Kernel/global_functions_internal_3.h @@ -27,7 +27,7 @@ // Generic functions calling the kernel functor. // See comments in CGAL/Kernel/global_functions_internal_3.h. -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -928,6 +928,6 @@ lexicographically_xyz_smaller_or_equal(const typename K::Point_3 &p, } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_KERNEL_GLOBAL_FUNCTIONS_INTERNAL_3_H diff --git a/Kernel_23/include/CGAL/Kernel/mpl.h b/Kernel_23/include/CGAL/Kernel/mpl.h index 6a648ef249a3..7df5d50b61fd 100644 --- a/Kernel_23/include/CGAL/Kernel/mpl.h +++ b/Kernel_23/include/CGAL/Kernel/mpl.h @@ -29,7 +29,7 @@ // Some tools for basic template metaprogramming. // These bits should move to CGAL/mpl.h in STL_Extension, or taken from Boost. -CGAL_BEGIN_NAMESPACE +namespace CGAL { // The additionnal int parameter is to obtain different types. template < typename A, typename B, int = 0 > @@ -42,6 +42,6 @@ struct First_if_different { struct Type{}; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Kernel_23/include/CGAL/Kernel/solve.h b/Kernel_23/include/CGAL/Kernel/solve.h index 484c59e6a295..6a6122199577 100644 --- a/Kernel_23/include/CGAL/Kernel/solve.h +++ b/Kernel_23/include/CGAL/Kernel/solve.h @@ -25,7 +25,7 @@ #ifndef CGAL_SOLVE_H #define CGAL_SOLVE_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -62,6 +62,6 @@ void solve_quadratic (const FT &a1, const FT &a2, const FT &a3, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SOLVE_H diff --git a/Kernel_23/include/CGAL/Kernel_checker.h b/Kernel_23/include/CGAL/Kernel_checker.h index 29d127169410..2c3059930f12 100644 --- a/Kernel_23/include/CGAL/Kernel_checker.h +++ b/Kernel_23/include/CGAL/Kernel_checker.h @@ -36,7 +36,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Small utility to manipulate pairs for kernel objects, and // simple things for bool, Sign... Object is yet another case... @@ -317,6 +317,6 @@ class Kernel_checker #include }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_KERNEL_CHECKER_H diff --git a/Kernel_23/include/CGAL/Line_2.h b/Kernel_23/include/CGAL/Line_2.h index 2cce6a37365c..b9a892faa927 100644 --- a/Kernel_23/include/CGAL/Line_2.h +++ b/Kernel_23/include/CGAL/Line_2.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Line_2 : public R_::Kernel_base::Line_2 @@ -286,6 +286,6 @@ operator>>(std::istream &is, Line_2 &l) return extract(is, l); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LINE_2_H diff --git a/Kernel_23/include/CGAL/Line_3.h b/Kernel_23/include/CGAL/Line_3.h index 9f1bc6428939..7d1f35baa839 100644 --- a/Kernel_23/include/CGAL/Line_3.h +++ b/Kernel_23/include/CGAL/Line_3.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Line_3 : public R_::Kernel_base::Line_3 @@ -165,6 +165,6 @@ operator>>(std::istream &is, Line_3 &l) return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LINE_3_H diff --git a/Kernel_23/include/CGAL/Origin.h b/Kernel_23/include/CGAL/Origin.h index ba84734f01d2..237be0f0a25b 100644 --- a/Kernel_23/include/CGAL/Origin.h +++ b/Kernel_23/include/CGAL/Origin.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Origin {}; @@ -39,6 +39,6 @@ class Null_vector extern const Null_vector NULL_VECTOR; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ORIGIN_H diff --git a/Kernel_23/include/CGAL/Plane_3.h b/Kernel_23/include/CGAL/Plane_3.h index 32d6bdde0a95..e2ac2b35e23d 100644 --- a/Kernel_23/include/CGAL/Plane_3.h +++ b/Kernel_23/include/CGAL/Plane_3.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Plane_3 : public R_::Kernel_base::Plane_3 @@ -275,6 +275,6 @@ operator>>(std::istream &is, Plane_3 &p) return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PLANE_3_H diff --git a/Kernel_23/include/CGAL/Point_2.h b/Kernel_23/include/CGAL/Point_2.h index 3b8a702e2459..0718fb841733 100644 --- a/Kernel_23/include/CGAL/Point_2.h +++ b/Kernel_23/include/CGAL/Point_2.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Point_2 : public R_::Kernel_base::Point_2 @@ -265,6 +265,6 @@ operator>>(std::istream& is, Point_2& p) return extract(is, p, typename R::Kernel_tag() ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POINT_2_H diff --git a/Kernel_23/include/CGAL/Point_3.h b/Kernel_23/include/CGAL/Point_3.h index 40872574d6c6..3e8266a08c75 100644 --- a/Kernel_23/include/CGAL/Point_3.h +++ b/Kernel_23/include/CGAL/Point_3.h @@ -33,7 +33,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Point_3 : public R_::Kernel_base::Point_3 @@ -297,6 +297,6 @@ operator>>(std::istream& is, Point_3& p) return extract(is, p, typename R::Kernel_tag() ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POINT_3_H diff --git a/Kernel_23/include/CGAL/Qualified_result_of.h b/Kernel_23/include/CGAL/Qualified_result_of.h index f49fd54d140b..1609e41f5702 100644 --- a/Kernel_23/include/CGAL/Qualified_result_of.h +++ b/Kernel_23/include/CGAL/Qualified_result_of.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { struct Has_qrt {}; @@ -47,6 +47,6 @@ struct Qualified_result_of : qrt_or_not::value> {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_QUALIFIED_RESULT_OF_H diff --git a/Kernel_23/include/CGAL/Ray_2.h b/Kernel_23/include/CGAL/Ray_2.h index e31a09673f86..bf1af8bab424 100644 --- a/Kernel_23/include/CGAL/Ray_2.h +++ b/Kernel_23/include/CGAL/Ray_2.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Ray_2 : public R_::Kernel_base::Ray_2 @@ -269,6 +269,6 @@ operator>>(std::istream& is, Ray_2& r) return extract(is, r, typename R::Kernel_tag() ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_RAY_2_H diff --git a/Kernel_23/include/CGAL/Ray_3.h b/Kernel_23/include/CGAL/Ray_3.h index 46e9d347537f..a7636d28c5fe 100644 --- a/Kernel_23/include/CGAL/Ray_3.h +++ b/Kernel_23/include/CGAL/Ray_3.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Ray_3 : public R_::Kernel_base::Ray_3 @@ -238,6 +238,6 @@ operator>>(std::istream& is, Ray_3& r) return extract(is, r, typename R::Kernel_tag() ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_RAY_3_H diff --git a/Kernel_23/include/CGAL/Segment_2.h b/Kernel_23/include/CGAL/Segment_2.h index 1a093b98debf..d2c1f9b4d967 100644 --- a/Kernel_23/include/CGAL/Segment_2.h +++ b/Kernel_23/include/CGAL/Segment_2.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Segment_2 : public R_::Kernel_base::Segment_2 @@ -304,6 +304,6 @@ operator>>(std::istream &is, Segment_2 &s) return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_2_H diff --git a/Kernel_23/include/CGAL/Segment_3.h b/Kernel_23/include/CGAL/Segment_3.h index f4ae3b16490d..d6f378adc469 100644 --- a/Kernel_23/include/CGAL/Segment_3.h +++ b/Kernel_23/include/CGAL/Segment_3.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Segment_3 : public R_::Kernel_base::Segment_3 @@ -233,6 +233,6 @@ operator>>(std::istream &is, Segment_3 &s) return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_3_H diff --git a/Kernel_23/include/CGAL/Sphere_3.h b/Kernel_23/include/CGAL/Sphere_3.h index b75867f0d876..ebe9da97d2c2 100644 --- a/Kernel_23/include/CGAL/Sphere_3.h +++ b/Kernel_23/include/CGAL/Sphere_3.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Sphere_3 : public R_::Kernel_base::Sphere_3 @@ -344,6 +344,6 @@ operator>>(std::istream& is, Sphere_3& c) return extract(is, c, typename R::Kernel_tag() ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SPHERE_3_H diff --git a/Kernel_23/include/CGAL/Tetrahedron_3.h b/Kernel_23/include/CGAL/Tetrahedron_3.h index cc1be004f754..bfaf2a2b283f 100644 --- a/Kernel_23/include/CGAL/Tetrahedron_3.h +++ b/Kernel_23/include/CGAL/Tetrahedron_3.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Tetrahedron_3 : public R_::Kernel_base::Tetrahedron_3 @@ -182,6 +182,6 @@ operator>>(std::istream &is, Tetrahedron_3 &t) return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TETRAHEDRON_3_H diff --git a/Kernel_23/include/CGAL/Triangle_2.h b/Kernel_23/include/CGAL/Triangle_2.h index 30f14b956e04..c6cc26678b84 100644 --- a/Kernel_23/include/CGAL/Triangle_2.h +++ b/Kernel_23/include/CGAL/Triangle_2.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Triangle_2 : public R_::Kernel_base::Triangle_2 @@ -205,6 +205,6 @@ operator>>(std::istream &is, Triangle_2 &t) return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGLE_2_H diff --git a/Kernel_23/include/CGAL/Triangle_3.h b/Kernel_23/include/CGAL/Triangle_3.h index 8d39396f0542..5d994b53fbf8 100644 --- a/Kernel_23/include/CGAL/Triangle_3.h +++ b/Kernel_23/include/CGAL/Triangle_3.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Triangle_3 : public R_::Kernel_base::Triangle_3 @@ -145,6 +145,6 @@ operator>>(std::istream &is, Triangle_3 &t) return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGLE_3_H diff --git a/Kernel_23/include/CGAL/Vector_2.h b/Kernel_23/include/CGAL/Vector_2.h index 1419ce25ed03..e127fd462782 100644 --- a/Kernel_23/include/CGAL/Vector_2.h +++ b/Kernel_23/include/CGAL/Vector_2.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Vector_2 : public R_::Kernel_base::Vector_2 @@ -346,6 +346,6 @@ operator>>(std::istream& is, Vector_2& v) return extract(is, v, typename R::Kernel_tag() ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VECTOR_2_H diff --git a/Kernel_23/include/CGAL/Vector_3.h b/Kernel_23/include/CGAL/Vector_3.h index 2c12ba972ba1..e421c4a6a07a 100644 --- a/Kernel_23/include/CGAL/Vector_3.h +++ b/Kernel_23/include/CGAL/Vector_3.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Vector_3 : public R_::Kernel_base::Vector_3 @@ -327,6 +327,6 @@ operator>>(std::istream& is, Vector_3& v) return extract(is, v, typename R::Kernel_tag() ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VECTOR_3_H diff --git a/Kernel_23/include/CGAL/aff_transformation_tags.h b/Kernel_23/include/CGAL/aff_transformation_tags.h index 7bf0923175dc..0d1bcd81d964 100644 --- a/Kernel_23/include/CGAL/aff_transformation_tags.h +++ b/Kernel_23/include/CGAL/aff_transformation_tags.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Translation {}; class Rotation {}; @@ -41,6 +41,6 @@ extern Scaling SCALING; extern Reflection REFLECTION; extern Identity_transformation IDENTITY; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_AFF_TRANSFORMATION_TAGS_H diff --git a/Kernel_23/include/CGAL/cartesian_homogeneous_conversion.h b/Kernel_23/include/CGAL/cartesian_homogeneous_conversion.h index 1e901ba3308a..4a52ea806d04 100644 --- a/Kernel_23/include/CGAL/cartesian_homogeneous_conversion.h +++ b/Kernel_23/include/CGAL/cartesian_homogeneous_conversion.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template Point_2< Cartesian > @@ -126,6 +126,6 @@ quotient_cartesian_to_homogeneous( } } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_HOMOGENEOUS_CONVERSION_H diff --git a/Kernel_23/include/CGAL/determinant.h b/Kernel_23/include/CGAL/determinant.h index f378852346df..f87ea1a7d0fa 100644 --- a/Kernel_23/include/CGAL/determinant.h +++ b/Kernel_23/include/CGAL/determinant.h @@ -25,7 +25,7 @@ #ifndef CGAL_DETERMINANT_H #define CGAL_DETERMINANT_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template inline @@ -207,6 +207,6 @@ determinant( return m012345; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_DETERMINANT_H diff --git a/Kernel_23/include/CGAL/enum.h b/Kernel_23/include/CGAL/enum.h index b3f5d741f493..2777c81c266d 100644 --- a/Kernel_23/include/CGAL/enum.h +++ b/Kernel_23/include/CGAL/enum.h @@ -29,7 +29,7 @@ // If you add/change one type here, please update Is_a_predicate.h as well. -CGAL_BEGIN_NAMESPACE +namespace CGAL { enum Sign { @@ -115,6 +115,6 @@ T enum_cast(const U& u) #endif -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ENUM_H diff --git a/Kernel_23/include/CGAL/kernel_to_kernel.h b/Kernel_23/include/CGAL/kernel_to_kernel.h index 3f335a03a593..e3a6bcac3d17 100644 --- a/Kernel_23/include/CGAL/kernel_to_kernel.h +++ b/Kernel_23/include/CGAL/kernel_to_kernel.h @@ -34,7 +34,7 @@ #endif #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Cartesian_double_to_Homogeneous @@ -102,6 +102,6 @@ struct Cartesian_float_to_H_double_int }; #endif // CGAL_USE_LEDA -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_KERNEL_TO_KERNEL_H diff --git a/Kernel_23/include/CGAL/predicates/sign_of_determinant.h b/Kernel_23/include/CGAL/predicates/sign_of_determinant.h index 01609291fd24..1ade491253f0 100644 --- a/Kernel_23/include/CGAL/predicates/sign_of_determinant.h +++ b/Kernel_23/include/CGAL/predicates/sign_of_determinant.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template inline @@ -107,6 +107,6 @@ sign_of_determinant( a50, a51, a52, a53, a54, a55)); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PREDICATES_SIGN_OF_DETERMINANT_H diff --git a/Kernel_23/include/CGAL/rational_rotation.h b/Kernel_23/include/CGAL/rational_rotation.h index ef3f98ce3e72..f18c1f4e600b 100644 --- a/Kernel_23/include/CGAL/rational_rotation.h +++ b/Kernel_23/include/CGAL/rational_rotation.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class NT > void @@ -264,6 +264,6 @@ rational_rotation_approximation( const double& angle, denom = iden; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_RATIONAL_ROTATION_H diff --git a/Kernel_23/include/CGAL/representation_tags.h b/Kernel_23/include/CGAL/representation_tags.h index 597ea33d2833..961f65129406 100644 --- a/Kernel_23/include/CGAL/representation_tags.h +++ b/Kernel_23/include/CGAL/representation_tags.h @@ -24,11 +24,11 @@ #ifndef CGAL_REPRESENTATION_TAGS_H #define CGAL_REPRESENTATION_TAGS_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Cartesian_tag {}; class Homogeneous_tag {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_REPRESENTATION_TAGS_H diff --git a/Kernel_23/src/CGAL/kernel.cpp b/Kernel_23/src/CGAL/kernel.cpp index 17d5623c0b7d..9e856f118ca1 100644 --- a/Kernel_23/src/CGAL/kernel.cpp +++ b/Kernel_23/src/CGAL/kernel.cpp @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { Translation TRANSLATION; Rotation ROTATION; @@ -35,4 +35,4 @@ Identity_transformation IDENTITY; const Origin ORIGIN = Origin(); const Null_vector NULL_VECTOR = Null_vector(); -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Kernel_d/include/CGAL/Cartesian_d.h b/Kernel_d/include/CGAL/Cartesian_d.h index 89c4676090dc..defd98d85bf3 100644 --- a/Kernel_d/include/CGAL/Cartesian_d.h +++ b/Kernel_d/include/CGAL/Cartesian_d.h @@ -46,7 +46,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template > class Cartesian_d @@ -394,7 +394,7 @@ class Cartesian_d }; // Cartesian_d -CGAL_END_NAMESPACE +} //namespace CGAL #include #include diff --git a/Kernel_d/include/CGAL/Homogeneous_d.h b/Kernel_d/include/CGAL/Homogeneous_d.h index ea8d05794599..94f69a4f7020 100644 --- a/Kernel_d/include/CGAL/Homogeneous_d.h +++ b/Kernel_d/include/CGAL/Homogeneous_d.h @@ -47,7 +47,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template > class Homogeneous_d @@ -396,7 +396,7 @@ class Homogeneous_d }; // Homogeneous_d -CGAL_END_NAMESPACE +} //namespace CGAL #include #include diff --git a/Kernel_d/include/CGAL/Kernel_d/Aff_transformationCd.h b/Kernel_d/include/CGAL/Kernel_d/Aff_transformationCd.h index c2d89f7b55ed..ddd4d5e9b40d 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Aff_transformationCd.h +++ b/Kernel_d/include/CGAL/Kernel_d/Aff_transformationCd.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Aff_transformationCd; template class Aff_transformationCd_rep; @@ -209,5 +209,5 @@ std::istream& operator>>( } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_AFF_TRANSFORMATIONCD_H diff --git a/Kernel_d/include/CGAL/Kernel_d/Aff_transformationHd.h b/Kernel_d/include/CGAL/Kernel_d/Aff_transformationHd.h index f3e6fca4f883..1e828d54828b 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Aff_transformationHd.h +++ b/Kernel_d/include/CGAL/Kernel_d/Aff_transformationHd.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Aff_transformationHd; template class Aff_transformationHd_rep; @@ -249,5 +249,5 @@ requirement is $O(|t.dimension()|^2)$. }*/ // ----------------------------- end of file ---------------------------- -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_AFF_TRANSFORMATIONHD_H diff --git a/Kernel_d/include/CGAL/Kernel_d/Aff_transformation_d.h b/Kernel_d/include/CGAL/Kernel_d/Aff_transformation_d.h index d9d899b127af..82343251cd30 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Aff_transformation_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Aff_transformation_d.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Aff_transformation_d : public pR::Aff_transformation_d_base @@ -72,5 +72,5 @@ class Aff_transformation_d : public pR::Aff_transformation_d_base }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_AFF_TRANSFORMATION_D_H diff --git a/Kernel_d/include/CGAL/Kernel_d/Cartesian_const_iterator_d.h b/Kernel_d/include/CGAL/Kernel_d/Cartesian_const_iterator_d.h index 1aef1217f90e..13b7277fefdc 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Cartesian_const_iterator_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Cartesian_const_iterator_d.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Takes an iterator over RT, and make one over FT, by dividing // by the last element. @@ -89,6 +89,6 @@ make_cartesian_const_iterator_end(RT_iterator w) return Cartesian_const_iterator_d(w, w); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_CONST_ITERATOR_D_H diff --git a/Kernel_d/include/CGAL/Kernel_d/DirectionCd.h b/Kernel_d/include/CGAL/Kernel_d/DirectionCd.h index c3f7c78a7cfe..d72ae342e16f 100644 --- a/Kernel_d/include/CGAL/Kernel_d/DirectionCd.h +++ b/Kernel_d/include/CGAL/Kernel_d/DirectionCd.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class DirectionCd; template @@ -136,6 +136,6 @@ friend std::ostream& operator<< <> }; // end of class DirectionCd -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_DIRECTIONCD_H //----------------------- end of file ---------------------------------- diff --git a/Kernel_d/include/CGAL/Kernel_d/DirectionCd_impl.h b/Kernel_d/include/CGAL/Kernel_d/DirectionCd_impl.h index e663dd636108..5258abc85023 100644 --- a/Kernel_d/include/CGAL/Kernel_d/DirectionCd_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/DirectionCd_impl.h @@ -23,7 +23,7 @@ #ifndef CGAL_DIRECTIONCD_C #define CGAL_DIRECTIONCD_C -CGAL_BEGIN_NAMESPACE +namespace CGAL { template DirectionCd::DirectionCd(const VectorCd& v) : Base(v) {} @@ -73,6 +73,6 @@ template std::ostream& operator<<(std::ostream& O, const DirectionCd& dir) { dir.ptr()->print(O,"DirectionCd"); return O; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_DIRECTIONCD_C //----------------------- end of file ---------------------------------- diff --git a/Kernel_d/include/CGAL/Kernel_d/DirectionHd.h b/Kernel_d/include/CGAL/Kernel_d/DirectionHd.h index 42d114d8fb63..27759656eeec 100644 --- a/Kernel_d/include/CGAL/Kernel_d/DirectionHd.h +++ b/Kernel_d/include/CGAL/Kernel_d/DirectionHd.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class DirectionHd; template @@ -219,6 +219,6 @@ requirement is $O(|d.dimension()|)$. }*/ -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_DIRECTIONHD_H //----------------------- end of file ---------------------------------- diff --git a/Kernel_d/include/CGAL/Kernel_d/DirectionHd_impl.h b/Kernel_d/include/CGAL/Kernel_d/DirectionHd_impl.h index 63fc34e0de0d..07873fad6c69 100644 --- a/Kernel_d/include/CGAL/Kernel_d/DirectionHd_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/DirectionHd_impl.h @@ -23,7 +23,7 @@ #ifndef CGAL_DIRECTIONHD_C #define CGAL_DIRECTIONHD_C -CGAL_BEGIN_NAMESPACE +namespace CGAL { template DirectionHd::DirectionHd(const VectorHd& v) : Base(v) {} @@ -79,5 +79,5 @@ std::ostream& operator<<(std::ostream& O, const DirectionHd& dir) //----------------------- end of file ---------------------------------- -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_DIRECTIONHD_C diff --git a/Kernel_d/include/CGAL/Kernel_d/Direction_d.h b/Kernel_d/include/CGAL/Kernel_d/Direction_d.h index c29d0365e14a..efc975596f66 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Direction_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Direction_d.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Direction_d : public pR::Direction_d_base @@ -68,5 +68,5 @@ class Direction_d : public pR::Direction_d_base { return Base::operator!=(w); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_DIRECTION_D_H diff --git a/Kernel_d/include/CGAL/Kernel_d/HyperplaneCd.h b/Kernel_d/include/CGAL/Kernel_d/HyperplaneCd.h index bb5220933653..ada3930f2d16 100644 --- a/Kernel_d/include/CGAL/Kernel_d/HyperplaneCd.h +++ b/Kernel_d/include/CGAL/Kernel_d/HyperplaneCd.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define PointCd PointCd2 template @@ -232,6 +232,6 @@ bool weak_equality(const HyperplaneCd& h1, } #undef PointCd -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HYPERPLANECD_H //----------------------- end of file ---------------------------------- diff --git a/Kernel_d/include/CGAL/Kernel_d/HyperplaneCd_impl.h b/Kernel_d/include/CGAL/Kernel_d/HyperplaneCd_impl.h index f2a95574f42a..b5bec7c52f71 100644 --- a/Kernel_d/include/CGAL/Kernel_d/HyperplaneCd_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/HyperplaneCd_impl.h @@ -23,7 +23,7 @@ #ifndef CGAL_HYPERPLANECD_C #define CGAL_HYPERPLANECD_C -CGAL_BEGIN_NAMESPACE +namespace CGAL { template VectorCd HyperplaneCd:: @@ -100,5 +100,5 @@ template std::ostream& operator<<(std::ostream& O, const HyperplaneCd& h) { h.ptr()->print(O,"HyperplaneCd"); return O; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HYPERPLANECD_C diff --git a/Kernel_d/include/CGAL/Kernel_d/HyperplaneHd.h b/Kernel_d/include/CGAL/Kernel_d/HyperplaneHd.h index 0918299d7c49..126698178464 100644 --- a/Kernel_d/include/CGAL/Kernel_d/HyperplaneHd.h +++ b/Kernel_d/include/CGAL/Kernel_d/HyperplaneHd.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define PointHd PointHd2 template @@ -348,7 +348,7 @@ arithmetic, input and output on a hyperplane $h$ take time constant time. The space requirement is $O(|h.dimension()|)$. }*/ #undef PointHd -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HYPERPLANEHD_H //----------------------- end of file ---------------------------------- diff --git a/Kernel_d/include/CGAL/Kernel_d/HyperplaneHd_impl.h b/Kernel_d/include/CGAL/Kernel_d/HyperplaneHd_impl.h index c96a4e5ff898..f1f5d41d773b 100644 --- a/Kernel_d/include/CGAL/Kernel_d/HyperplaneHd_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/HyperplaneHd_impl.h @@ -23,7 +23,7 @@ #ifndef CGAL_HYPERPLANEHD_C #define CGAL_HYPERPLANEHD_C -CGAL_BEGIN_NAMESPACE +namespace CGAL { template VectorHd HyperplaneHd:: @@ -103,5 +103,5 @@ template std::ostream& operator<<(std::ostream& O, const HyperplaneHd& h) { h.ptr()->print(O,"HyperplaneHd"); return O; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HYPERPLANEHD_C diff --git a/Kernel_d/include/CGAL/Kernel_d/Hyperplane_d.h b/Kernel_d/include/CGAL/Kernel_d/Hyperplane_d.h index 3657c2b78418..18dc218fcaa0 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Hyperplane_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Hyperplane_d.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Hyperplane_d : public pR::Hyperplane_d_base @@ -82,6 +82,6 @@ class Hyperplane_d : public pR::Hyperplane_d_base { return Base::operator!=(w); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_HYPERPLANE_D_H diff --git a/Kernel_d/include/CGAL/Kernel_d/Interface_classes.h b/Kernel_d/include/CGAL/Kernel_d/Interface_classes.h index 6a039c36cbc0..5c0c0faff949 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Interface_classes.h +++ b/Kernel_d/include/CGAL/Kernel_d/Interface_classes.h @@ -24,7 +24,7 @@ #ifndef CGAL_INTERFACE_CLASSES_H #define CGAL_INTERFACE_CLASSES_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Point_d; template class Vector_d; @@ -37,6 +37,6 @@ template class Ray_d; template class Line_d; template class Aff_transformation_d; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_INTERFACE_CLASSES_H diff --git a/Kernel_d/include/CGAL/Kernel_d/Kernel_classesCd.h b/Kernel_d/include/CGAL/Kernel_d/Kernel_classesCd.h index 79eba293ee2e..ffbec0252370 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Kernel_classesCd.h +++ b/Kernel_d/include/CGAL/Kernel_d/Kernel_classesCd.h @@ -24,7 +24,7 @@ #ifndef CGAL_KERNEL_CLASSESCD_H #define CGAL_KERNEL_CLASSESCD_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class PointCd2; template class VectorCd; @@ -32,6 +32,6 @@ template class DirectionCd; template class HyperplaneCd; template class Aff_transformationCd; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_KERNEL_CLASSESCD_H diff --git a/Kernel_d/include/CGAL/Kernel_d/Kernel_classesHd.h b/Kernel_d/include/CGAL/Kernel_d/Kernel_classesHd.h index 75a6c82e03e2..67ec8e229e5c 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Kernel_classesHd.h +++ b/Kernel_d/include/CGAL/Kernel_d/Kernel_classesHd.h @@ -24,7 +24,7 @@ #ifndef CGAL_KERNEL_CLASSESHD_H #define CGAL_KERNEL_CLASSESHD_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class PointHd2; template class VectorHd; @@ -32,6 +32,6 @@ template class DirectionHd; template class HyperplaneHd; template class Aff_transformationHd; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_KERNEL_CLASSESHD_H diff --git a/Kernel_d/include/CGAL/Kernel_d/Line_d.h b/Kernel_d/include/CGAL/Kernel_d/Line_d.h index 1fb96e61d3e6..1b9fd46c44dd 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Line_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Line_d.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template std::istream& operator>>(std::istream&, Line_d&); @@ -217,6 +217,6 @@ calculation also take time $O(|l.dimension()|)$. The space requirement is $O(|l.dimension()|)$.}*/ -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LINE_D_H //----------------------- end of file ---------------------------------- diff --git a/Kernel_d/include/CGAL/Kernel_d/Line_d_impl.h b/Kernel_d/include/CGAL/Kernel_d/Line_d_impl.h index 522f16e619e1..6826e716f679 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Line_d_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/Line_d_impl.h @@ -23,7 +23,7 @@ #ifndef CGAL_LINE_D_C #define CGAL_LINE_D_C -CGAL_BEGIN_NAMESPACE +namespace CGAL { template Line_d Segment_d::supporting_line() const @@ -36,5 +36,5 @@ template Line_d Ray_d::supporting_line() const { return Line_d(Base(*this)); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_LINE_D_C diff --git a/Kernel_d/include/CGAL/Kernel_d/Linear_algebraCd_impl.h b/Kernel_d/include/CGAL/Kernel_d/Linear_algebraCd_impl.h index 286017867ccd..029f84478b80 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Linear_algebraCd_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/Linear_algebraCd_impl.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class FT, class AL > typename Linear_algebraCd::Matrix @@ -438,5 +438,5 @@ rank(const Matrix &M) return independent_columns(M,q); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LINEAR_ALGEBRACD_C diff --git a/Kernel_d/include/CGAL/Kernel_d/Linear_algebraHd_impl.h b/Kernel_d/include/CGAL/Kernel_d/Linear_algebraHd_impl.h index 49066935ff98..1b3619e69f7e 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Linear_algebraHd_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/Linear_algebraHd_impl.h @@ -29,7 +29,7 @@ //--------------------------------------------------------------------- #ifndef CGAL_LINEAR_ALGEBRAHD_C #define CGAL_LINEAR_ALGEBRAHD_C -CGAL_BEGIN_NAMESPACE +namespace CGAL { template bool Linear_algebraHd:: @@ -1017,5 +1017,5 @@ Linear_algebraHd::transpose(const Matrix& M) } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_LINEAR_ALGEBRAHD_C diff --git a/Kernel_d/include/CGAL/Kernel_d/Pair_d.h b/Kernel_d/include/CGAL/Kernel_d/Pair_d.h index e6bf5c63024f..ba9ed11551e6 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Pair_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Pair_d.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Segment_d; template class Ray_d; @@ -92,5 +92,5 @@ void print(std::ostream& os, const char* _name) const }; // Pair_d -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_PAIR_D_H diff --git a/Kernel_d/include/CGAL/Kernel_d/PointCd.h b/Kernel_d/include/CGAL/Kernel_d/PointCd.h index dc16f32f8c6b..52bfd682ac78 100644 --- a/Kernel_d/include/CGAL/Kernel_d/PointCd.h +++ b/Kernel_d/include/CGAL/Kernel_d/PointCd.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define PointCd PointCd2 template class PointCd; @@ -182,6 +182,6 @@ FT z() const { return cartesian(2); } }; // PointCd #undef PointCd -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POINTCDXXX_H //----------------------- end of file ---------------------------------- diff --git a/Kernel_d/include/CGAL/Kernel_d/PointCd_impl.h b/Kernel_d/include/CGAL/Kernel_d/PointCd_impl.h index 2e854079b784..b6849303ec52 100644 --- a/Kernel_d/include/CGAL/Kernel_d/PointCd_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/PointCd_impl.h @@ -23,7 +23,7 @@ #ifndef CGAL_POINTCDXXX_C #define CGAL_POINTCDXXX_C -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define PointCd PointCd2 template @@ -79,5 +79,5 @@ std::ostream& operator<<(std::ostream& O, const PointCd& p) { p.ptr()->print(O,"PointCd"); return O; } #undef PointCd -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POINTCDXXX_C diff --git a/Kernel_d/include/CGAL/Kernel_d/PointHd.h b/Kernel_d/include/CGAL/Kernel_d/PointHd.h index 2820b94d3f83..b3b656066c21 100644 --- a/Kernel_d/include/CGAL/Kernel_d/PointHd.h +++ b/Kernel_d/include/CGAL/Kernel_d/PointHd.h @@ -31,7 +31,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define PointHd PointHd2 template class PointHd; @@ -289,6 +289,6 @@ coordinate access and conversions take constant time. The space requirement for points is $O(|p.dimension()|)$.}*/ #undef PointHd -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POINTHD_H //----------------------- end of file ---------------------------------- diff --git a/Kernel_d/include/CGAL/Kernel_d/PointHd_impl.h b/Kernel_d/include/CGAL/Kernel_d/PointHd_impl.h index 24d25e217110..8232777d9543 100644 --- a/Kernel_d/include/CGAL/Kernel_d/PointHd_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/PointHd_impl.h @@ -23,7 +23,7 @@ #ifndef CGAL_POINTHD_C #define CGAL_POINTHD_C -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define PointHd PointHd2 template @@ -81,5 +81,5 @@ std::ostream& operator<<(std::ostream& O, const PointHd& p) { p.ptr()->print(O,"PointHd"); return O; } #undef PointHd -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POINTHD_C diff --git a/Kernel_d/include/CGAL/Kernel_d/Point_d.h b/Kernel_d/include/CGAL/Kernel_d/Point_d.h index 5ac10159c602..e96f50b90bf3 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Point_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Point_d.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Point_d : public pR::Point_d_base @@ -80,5 +80,5 @@ class Point_d : public pR::Point_d_base }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_POINT_D_H diff --git a/Kernel_d/include/CGAL/Kernel_d/Ray_d.h b/Kernel_d/include/CGAL/Kernel_d/Ray_d.h index fc679287604d..c0ba3c41caa2 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Ray_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Ray_d.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template std::istream& operator>>(std::istream&, Ray_d&); @@ -203,6 +203,6 @@ identity test take constant time. The space requirement is $O(|r.dimension()|)$.}*/ -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_RAYHD_H //----------------------- end of file ---------------------------------- diff --git a/Kernel_d/include/CGAL/Kernel_d/Segment_d.h b/Kernel_d/include/CGAL/Kernel_d/Segment_d.h index 6f2f7087d780..ae7ff4d535b2 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Segment_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Segment_d.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template std::istream& operator>> (std::istream&, Segment_d&); @@ -245,6 +245,6 @@ operations for intersection calculation also take time }*/ -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_D_H //----------------------- end of file ---------------------------------- diff --git a/Kernel_d/include/CGAL/Kernel_d/Sphere_d.h b/Kernel_d/include/CGAL/Kernel_d/Sphere_d.h index 2b5aaf288270..e0e41cefca0f 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Sphere_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Sphere_d.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Sphere_d; template bool equal_as_sets(const Sphere_d&, const Sphere_d&); @@ -331,7 +331,7 @@ center. We may tentatively assume that $c_d = 1$, solve the corresponding linear system, and then define the center. */ -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SPHERE_D_H //----------------------- end of file ---------------------------------- diff --git a/Kernel_d/include/CGAL/Kernel_d/Tuple_d.h b/Kernel_d/include/CGAL/Kernel_d/Tuple_d.h index 6ead626ece8f..d37a89191f43 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Tuple_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Tuple_d.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define PointCd PointCd2 #define PointHd PointHd2 @@ -279,5 +279,5 @@ int copy_and_count(InputIterator first, InputIterator last, #undef PointCd #undef PointHd -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_TUPLE_D_H diff --git a/Kernel_d/include/CGAL/Kernel_d/VectorCd.h b/Kernel_d/include/CGAL/Kernel_d/VectorCd.h index 287e440aa4dc..91d822ae5810 100644 --- a/Kernel_d/include/CGAL/Kernel_d/VectorCd.h +++ b/Kernel_d/include/CGAL/Kernel_d/VectorCd.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define PointCd PointCd2 template class VectorCd; @@ -236,6 +236,6 @@ friend std::ostream& operator<< <> }; // end of class VectorCd #undef PointCd -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VECTORCD_H //----------------------- end of file ---------------------------------- diff --git a/Kernel_d/include/CGAL/Kernel_d/VectorCd_impl.h b/Kernel_d/include/CGAL/Kernel_d/VectorCd_impl.h index 7b77df91bf7a..b29744ff14bb 100644 --- a/Kernel_d/include/CGAL/Kernel_d/VectorCd_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/VectorCd_impl.h @@ -23,7 +23,7 @@ #ifndef CGAL_VECTORCD_C #define CGAL_VECTORCD_C -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define PointCd PointCd2 template @@ -69,5 +69,5 @@ std::ostream& operator<<(std::ostream& O, const VectorCd& v) { v.ptr()->print(O,"VectorCd"); return O; } #undef PointCd -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VECTORCD_C diff --git a/Kernel_d/include/CGAL/Kernel_d/VectorHd.h b/Kernel_d/include/CGAL/Kernel_d/VectorHd.h index c8dfb4801309..2ece511936ac 100644 --- a/Kernel_d/include/CGAL/Kernel_d/VectorHd.h +++ b/Kernel_d/include/CGAL/Kernel_d/VectorHd.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define PointHd PointHd2 template class VectorHd; @@ -417,6 +417,6 @@ take constant time. The space requirement of a vector is #undef PointHd -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VECTORHD_H //----------------------- end of file ---------------------------------- diff --git a/Kernel_d/include/CGAL/Kernel_d/VectorHd_impl.h b/Kernel_d/include/CGAL/Kernel_d/VectorHd_impl.h index 223764bd1d14..b691f2fb3b68 100644 --- a/Kernel_d/include/CGAL/Kernel_d/VectorHd_impl.h +++ b/Kernel_d/include/CGAL/Kernel_d/VectorHd_impl.h @@ -23,7 +23,7 @@ #ifndef CGAL_VECTORHD_C #define CGAL_VECTORHD_C -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define PointHd PointHd2 template @@ -66,5 +66,5 @@ std::ostream& operator<<(std::ostream& O, const VectorHd& v) { v.ptr()->print(O,"VectorHd"); return O; } #undef PointHd -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VECTORHD_C diff --git a/Kernel_d/include/CGAL/Kernel_d/Vector_d.h b/Kernel_d/include/CGAL/Kernel_d/Vector_d.h index 5e6af76e89a1..e5babbce09be 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Vector_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Vector_d.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Vector_d : public pR::Vector_d_base @@ -103,5 +103,5 @@ template Vector_d operator*(const NT& n, const Vector_d& v) { return Vector_d( n * static_cast::Base>(v) ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_VECTOR_D_H diff --git a/Kernel_d/include/CGAL/Kernel_d/function_objects.h b/Kernel_d/include/CGAL/Kernel_d/function_objects.h index 85b5405a8d0f..32f6322088ba 100644 --- a/Kernel_d/include/CGAL/Kernel_d/function_objects.h +++ b/Kernel_d/include/CGAL/Kernel_d/function_objects.h @@ -27,7 +27,7 @@ // These functors come from the 2D-3D kernels. // Since they have changed there, they now need to be copied here. -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -148,6 +148,6 @@ class Intersect }; } // end namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_KERNEL_D_FUNCTION_OBJECTS_H diff --git a/Kernel_d/include/CGAL/Kernel_d/function_objectsCd.h b/Kernel_d/include/CGAL/Kernel_d/function_objectsCd.h index 7158560e1a0e..9c5c394a133a 100644 --- a/Kernel_d/include/CGAL/Kernel_d/function_objectsCd.h +++ b/Kernel_d/include/CGAL/Kernel_d/function_objectsCd.h @@ -34,7 +34,7 @@ #define CGAL_KD_TRACEN(t) std::cerr << t << std::endl #define CGAL_KD_TRACEV(t) std::cerr << #t << " = " << (t) << std::endl -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Lift_to_paraboloidCd { @@ -461,5 +461,5 @@ OutputIterator operator()(ForwardIterator first, ForwardIterator last, -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_FUNCTION_OBJECTSCD_H diff --git a/Kernel_d/include/CGAL/Kernel_d/function_objectsHd.h b/Kernel_d/include/CGAL/Kernel_d/function_objectsHd.h index 7bbaaff182c1..05296d55eb4a 100644 --- a/Kernel_d/include/CGAL/Kernel_d/function_objectsHd.h +++ b/Kernel_d/include/CGAL/Kernel_d/function_objectsHd.h @@ -33,7 +33,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Lift_to_paraboloidHd { @@ -467,6 +467,6 @@ OutputIterator operator()(ForwardIterator first, ForwardIterator last, } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_FUNCTION_OBJECTSHD_H diff --git a/Kernel_d/include/CGAL/Kernel_d/intersection_objectsCd.h b/Kernel_d/include/CGAL/Kernel_d/intersection_objectsCd.h index d32bb111c0b2..c58cfae83d85 100644 --- a/Kernel_d/include/CGAL/Kernel_d/intersection_objectsCd.h +++ b/Kernel_d/include/CGAL/Kernel_d/intersection_objectsCd.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*{\Manpage{Line_line_intersectionCd}{R}{intersecting two lines}}*/ @@ -136,7 +136,7 @@ not degenerate.}*/ }; -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Kernel_d/include/CGAL/Kernel_d/intersection_objectsHd.h b/Kernel_d/include/CGAL/Kernel_d/intersection_objectsHd.h index 0a95095672de..a2ed0b590faa 100644 --- a/Kernel_d/include/CGAL/Kernel_d/intersection_objectsHd.h +++ b/Kernel_d/include/CGAL/Kernel_d/intersection_objectsHd.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*{\Manpage{Line_line_intersectionHd}{R}{intersecting two lines}}*/ @@ -140,7 +140,7 @@ not degenerate.}*/ }; -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Kernel_d/include/CGAL/Kernel_d/intersection_objects_d.h b/Kernel_d/include/CGAL/Kernel_d/intersection_objects_d.h index 2b8c0cba8e74..317f6fccace7 100644 --- a/Kernel_d/include/CGAL/Kernel_d/intersection_objects_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/intersection_objects_d.h @@ -24,7 +24,7 @@ #ifndef CGAL_INTERSECTION_OBJECTS_D_H #define CGAL_INTERSECTION_OBJECTS_D_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Line_d_Line_d_pair { @@ -670,6 +670,6 @@ Segment_d_Hyperplane_d_pair::intersection(Segment_d& s) s = _s; return true; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_INTERSECTION_OBJECTS_D_H diff --git a/Kernel_d/include/CGAL/Kernel_d/simple_objects.h b/Kernel_d/include/CGAL/Kernel_d/simple_objects.h index 6d780b35e0f7..cdb1e658192f 100644 --- a/Kernel_d/include/CGAL/Kernel_d/simple_objects.h +++ b/Kernel_d/include/CGAL/Kernel_d/simple_objects.h @@ -24,7 +24,7 @@ #ifndef CGAL_SIMPLE_OBJECTS_H #define CGAL_SIMPLE_OBJECTS_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Lt_from_compare { @@ -49,6 +49,6 @@ struct Eq_from_method { { return p1 == p2; } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SIMPLE_OBJECTS_H diff --git a/Kernel_d/include/CGAL/Linear_algebraCd.h b/Kernel_d/include/CGAL/Linear_algebraCd.h index ea2b2881935b..d7a5362b1afe 100644 --- a/Kernel_d/include/CGAL/Linear_algebraCd.h +++ b/Kernel_d/include/CGAL/Linear_algebraCd.h @@ -33,7 +33,7 @@ //#define CGAL_LA_SELFTEST -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class _FT, class _AL = CGAL_ALLOCATOR(_FT) > class Linear_algebraCd @@ -115,7 +115,7 @@ class Linear_algebraCd }; -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Kernel_d/include/CGAL/Linear_algebraHd.h b/Kernel_d/include/CGAL/Linear_algebraHd.h index c61d3e8bb511..a5d4559adfba 100644 --- a/Kernel_d/include/CGAL/Linear_algebraHd.h +++ b/Kernel_d/include/CGAL/Linear_algebraHd.h @@ -36,7 +36,7 @@ #include // #define CGAL_LA_SELFTEST -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*{\Moptions outfile=Linear_algebra.man}*/ /*{\Manpage {Linear_algebraHd}{RT}{Linear Algebra on RT}{LA}}*/ @@ -203,7 +203,7 @@ system $A x = b$ unsolvable it also returns a vector $c$ such that }; // Linear_algebraHd -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Kernel_d/include/CGAL/constructions_d.h b/Kernel_d/include/CGAL/constructions_d.h index 422308aec366..e351695deada 100644 --- a/Kernel_d/include/CGAL/constructions_d.h +++ b/Kernel_d/include/CGAL/constructions_d.h @@ -24,7 +24,7 @@ #ifndef CGAL_CONSTRUCTIONS_D_H #define CGAL_CONSTRUCTIONS_D_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*{\Moptions outfile=constructions_d.man}*/ @@ -76,5 +76,5 @@ in |result|. The returned iterator marks the end of the output. } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CONSTRUCTIONS_D_H diff --git a/Kernel_d/include/CGAL/intersections_d.h b/Kernel_d/include/CGAL/intersections_d.h index d44f38ab63a9..68b26f2bcba8 100644 --- a/Kernel_d/include/CGAL/intersections_d.h +++ b/Kernel_d/include/CGAL/intersections_d.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Actually, we should better list the compilers which are inferior, i.e. // the others, which need the additional useless code. @@ -354,5 +354,5 @@ template inline bool do_intersect(const Hyperplane_d& h, const Segment_d& s) { return do_intersect(s,h); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_INTERSECTIONS_D_H diff --git a/Kernel_d/include/CGAL/predicates_d.h b/Kernel_d/include/CGAL/predicates_d.h index 7b43a563db71..823d2613023d 100644 --- a/Kernel_d/include/CGAL/predicates_d.h +++ b/Kernel_d/include/CGAL/predicates_d.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*{\Moptions outfile=predicates_d.man}*/ /*{\Mtext \setopdims{4cm}{2cm}\computewidths @@ -216,5 +216,5 @@ bool linearly_independent( } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PREDICATES_D_H diff --git a/Kernel_d/include/CGAL/simple_transformations_d.h b/Kernel_d/include/CGAL/simple_transformations_d.h index bee630818874..653113564ef4 100644 --- a/Kernel_d/include/CGAL/simple_transformations_d.h +++ b/Kernel_d/include/CGAL/simple_transformations_d.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*{\Moptions outfile=Simple_transformations.man}*/ /*{\Manpage{}{}{Simple Affine Transformations}{}}*/ @@ -91,5 +91,5 @@ Line_d reflect(const Line_d& s, const Line_d& l) /*{\Mfunc returns |s| reflected across line |l|.}*/ { return Line_d(reflect(s.point(0),l),reflect(s.point(1),l)); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SIMPLE_TRANSFORMATIONS_D_H diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_handle.h b/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_handle.h index 7f7a5eb41526..d08a2a6c0e86 100644 --- a/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_handle.h +++ b/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_handle.h @@ -37,7 +37,7 @@ void intrusive_ptr_release(SoNode *n) } -CGAL_BEGIN_NAMESPACE; +namespace CGAL {; //! A reference counting pointer for storing pointers to Inventor objects. /*! Inventor objects already have reference counts built in, so I @@ -55,5 +55,5 @@ class SoQt_handle: public boost::intrusive_ptr SoQt_handle(): P(){} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Interval_simulator_traits.h b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Interval_simulator_traits.h index 6a88cfab433c..cb48f7f04cbd 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Interval_simulator_traits.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Interval_simulator_traits.h @@ -211,7 +211,7 @@ std::pair to_interval(const Interval_root& a) { CGAL_KINETIC_END_NAMESPACE -CGAL_BEGIN_NAMESPACE +namespace CGAL { template Comparison_result compare(const typename Kinetic::Interval_root& a, @@ -229,7 +229,7 @@ std::pair to_interval(const typename Kinetic::Interval_root& a return a.interval_value(); } -CGAL_END_NAMESPACE +} //namespace CGAL namespace std { template diff --git a/Kinetic_data_structures/hidden/include/CGAL/Updatable_Delaunay_triangulation_2.h b/Kinetic_data_structures/hidden/include/CGAL/Updatable_Delaunay_triangulation_2.h index 0037a14c58c3..94f655f719cf 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Updatable_Delaunay_triangulation_2.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Updatable_Delaunay_triangulation_2.h @@ -29,7 +29,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define NEWTON @@ -1236,7 +1236,7 @@ struct Updatable_Delaunay_triangulation_2 { typename KDel::Handle kdel_; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif #undef CGAL_UD_DEBUG diff --git a/Kinetic_data_structures/hidden/include/CGAL/Updatable_Delaunay_triangulation_table_2.h b/Kinetic_data_structures/hidden/include/CGAL/Updatable_Delaunay_triangulation_table_2.h index 054f0b812956..91804f08ea3d 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Updatable_Delaunay_triangulation_table_2.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Updatable_Delaunay_triangulation_table_2.h @@ -36,7 +36,7 @@ #include #endif -CGAL_BEGIN_NAMESPACE; +namespace CGAL {; bool disable_filter_0_=false; @@ -2073,5 +2073,5 @@ class Updatable_delaunay_triangulation_table_2: }*/ //typename Updatable_Delaunay_triangulation_table_2::Protected_array_pointer -CGAL_END_NAMESPACE; +} //namespace CGAL; #endif diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/basic.h b/Kinetic_data_structures/include/CGAL/Kinetic/basic.h index 9339519e0f62..ec7f98906a75 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/basic.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/basic.h @@ -50,12 +50,12 @@ -#define CGAL_KINETIC_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE \ +#define CGAL_KINETIC_BEGIN_NAMESPACE namespace CGAL { \ namespace Kinetic \ { \ #define CGAL_KINETIC_END_NAMESPACE } \ -CGAL_END_NAMESPACE +} //namespace CGAL #define CGAL_KINETIC_BEGIN_INTERNAL_NAMESPACE CGAL_KINETIC_BEGIN_NAMESPACE \ namespace internal \ diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/CORE_Expr_root_stack.h b/Kinetic_data_structures/include/CGAL/Polynomial/CORE_Expr_root_stack.h index 06786a3a5022..0b8d2f56b4ed 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/CORE_Expr_root_stack.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/CORE_Expr_root_stack.h @@ -28,14 +28,14 @@ #include -/*CGAL_BEGIN_NAMESPACE +/*namespace CGAL { double to_double(const CORE::BigInt &bi) { return bi.doubleValue(); } - CGAL_END_NAMESPACE*/ + } //namespace CGAL*/ CGAL_POLYNOMIAL_BEGIN_NAMESPACE diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Double_with_infinity.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Double_with_infinity.h index 1a0f064eff43..ff605a6c5926 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Double_with_infinity.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Double_with_infinity.h @@ -81,12 +81,12 @@ namespace std { } -CGAL_BEGIN_NAMESPACE +namespace CGAL { inline double to_double(CGAL_POLYNOMIAL_NS::internal::Double_with_infinity d) { return to_double(static_cast(d)); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_number.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_number.h index 29053e736d40..8a16a8f8f95e 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_number.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Filtered_number.h @@ -308,7 +308,7 @@ std::ostream &operator<<(std::ostream &out, const Filtered_number &a) CGAL_POLYNOMIAL_END_NAMESPACE -CGAL_BEGIN_NAMESPACE +namespace CGAL { template double to_double(const CGAL_POLYNOMIAL_NS::Filtered_number &a) { @@ -323,7 +323,7 @@ std::pair to_interval(const CGAL_POLYNOMIAL_NS::Filtered_number< } -CGAL_END_NAMESPACE +} //namespace CGAL template std::ostream &operator<<(std::ostream &out, const CGAL_POLYNOMIAL_NS::Filtered_number &a) diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Isolating_interval.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Isolating_interval.h index 14a8510c2662..d048e5585540 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Isolating_interval.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Isolating_interval.h @@ -602,7 +602,7 @@ CGAL_POLYNOMIAL_END_INTERNAL_NAMESPACE #ifdef CGAL_POLYNOMIAL_USE_CGAL -CGAL_BEGIN_NAMESPACE +namespace CGAL { template std::pair to_interval(const typename CGAL_POLYNOMIAL_NS::internal::Isolating_interval &ii) { @@ -610,6 +610,6 @@ std::pair to_interval(const typename CGAL_POLYNOMIAL_NS::interna } -CGAL_END_NAMESPACE +} //namespace CGAL #endif #endif diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Simple_interval_root.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Simple_interval_root.h index 1c72d97d3ec0..a25976c7e901 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Simple_interval_root.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Simple_interval_root.h @@ -637,7 +637,7 @@ bool is_rational(const Simple_interval_root &f) CGAL_POLYNOMIAL_END_INTERNAL_NAMESPACE -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -698,7 +698,7 @@ class Real_embeddable_traits< CGAL::POLYNOMIAL::internal::Simple_interval_root to_interval(const Sturm_isolating_interval &ii) CGAL_POLYNOMIAL_END_INTERNAL_NAMESPACE -CGAL_BEGIN_NAMESPACE +namespace CGAL { template std::pair to_interval(const CGAL_POLYNOMIAL_NS::internal::Sturm_isolating_interval &ii) @@ -352,5 +352,5 @@ to_interval(const CGAL_POLYNOMIAL_NS::internal::Sturm_isolating_interval &ii } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYNOMIAL_STURM_ISOLATING_INTERVAL_H diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_root_rep.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_root_rep.h index e7cbbf4c1fdc..81f1b5e6313d 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_root_rep.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_root_rep.h @@ -928,7 +928,7 @@ operator<<(Stream& os, const Sturm_root_rep& r) CGAL_POLYNOMIAL_END_INTERNAL_NAMESPACE -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*template double @@ -1003,7 +1003,7 @@ class Real_embeddable_traits< CGAL::POLYNOMIAL::internal::Sturm_root_rep > }; -CGAL_END_NAMESPACE +} //namespace CGAL namespace std { diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/macros.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/macros.h index 83a2b58aee31..2e049a9a7790 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/macros.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/macros.h @@ -29,12 +29,12 @@ */ #include -#define CGAL_POLYNOMIAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE \ +#define CGAL_POLYNOMIAL_BEGIN_NAMESPACE namespace CGAL { \ namespace POLYNOMIAL \ { \ #define CGAL_POLYNOMIAL_END_NAMESPACE } \ -CGAL_END_NAMESPACE +} //namespace CGAL #define CGAL_POLYNOMIAL_NS CGAL::POLYNOMIAL #define CGAL_Polynomial_assertion(x) CGAL_assertion(x) diff --git a/Kinetic_data_structures/include/CGAL/Tools/Counter.h b/Kinetic_data_structures/include/CGAL/Tools/Counter.h index d1fc02f47a55..5b33ceb0ce94 100644 --- a/Kinetic_data_structures/include/CGAL/Tools/Counter.h +++ b/Kinetic_data_structures/include/CGAL/Tools/Counter.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //! An integer iterator /*! It looks like an iterator but just wraps an integer. All the @@ -171,6 +171,6 @@ Counter counter(T t) return Counter(t); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Kinetic_data_structures/include/CGAL/Tools/Label.h b/Kinetic_data_structures/include/CGAL/Tools/Label.h index 872d29bcd32f..d8300b2aecf4 100644 --- a/Kinetic_data_structures/include/CGAL/Tools/Label.h +++ b/Kinetic_data_structures/include/CGAL/Tools/Label.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //! A type which provides opaque, typed identifiers. /*! @@ -78,6 +78,6 @@ class Label CGAL_OUTPUT1(Label) -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Kinetic_data_structures/include/CGAL/Tools/Log.h b/Kinetic_data_structures/include/CGAL/Tools/Log.h index b9b293c27d24..c7f329fea030 100644 --- a/Kinetic_data_structures/include/CGAL/Tools/Log.h +++ b/Kinetic_data_structures/include/CGAL/Tools/Log.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Log { @@ -150,5 +150,5 @@ struct Set_log_state{ Log::Level old_level_; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Kinetic_data_structures/include/CGAL/Tools/utility_macros.h b/Kinetic_data_structures/include/CGAL/Tools/utility_macros.h index fd2d345675d2..f61901ced12f 100644 --- a/Kinetic_data_structures/include/CGAL/Tools/utility_macros.h +++ b/Kinetic_data_structures/include/CGAL/Tools/utility_macros.h @@ -341,7 +341,7 @@ template \ #define CGAL_REAL_EMBEDDABLE1(name) \ - CGAL_BEGIN_NAMESPACE \ + namespace CGAL { \ template \ class Real_embeddable_traits< name > \ : public INTERN_RET::Real_embeddable_traits_base, Tag_true>{ \ @@ -349,11 +349,11 @@ template \ typedef name Type; \ CGAL_REAL_EMBEDDABLE_BODY; \ }; \ - CGAL_END_NAMESPACE + } //namespace CGAL #define CGAL_REAL_EMBEDDABLE2(name) \ - CGAL_BEGIN_NAMESPACE \ + namespace CGAL { \ template \ class Real_embeddable_traits< name > \ : public INTERN_RET::Real_embeddable_traits_base< name, Tag_true>{ \ @@ -361,7 +361,7 @@ template \ typedef name Type; \ CGAL_REAL_EMBEDDABLE_BODY; \ }; \ - CGAL_END_NAMESPACE + } //namespace CGAL #define CGAL_HAS_INFINITY1(name) \ @@ -380,7 +380,7 @@ template \ #define CGAL_REAL_EMBEDABLE2(name) \ - CGAL_BEGIN_NAMESPACE \ + namespace CGAL { \ template \ class Real_embeddable_traits< name > \ : public INTERN_RET::Real_embeddable_traits_base< name , Tag_true>{ \ @@ -388,7 +388,7 @@ template \ typedef name Type; \ CGAL_REAL_EMBEDDABLE_BODY \ }; \ - CGAL_END_NAMESPACE + } //namespace CGAL #define CGAL_HAS_INFINITY2(name) \ namespace std \ diff --git a/Kinetic_data_structures/src/CGAL/KDS_Log.cpp b/Kinetic_data_structures/src/CGAL/KDS_Log.cpp index 2c74fddf3cb9..96f626b0e728 100644 --- a/Kinetic_data_structures/src/CGAL/KDS_Log.cpp +++ b/Kinetic_data_structures/src/CGAL/KDS_Log.cpp @@ -22,9 +22,9 @@ #include #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { Log::State Log::state_; -CGAL_END_NAMESPACE +} //namespace CGAL CGAL_KINETIC_BEGIN_INTERNAL_NAMESPACE unsigned int function_degeneracies__=0; diff --git a/LEDA/include/CGAL/leda_in_CGAL_2.h b/LEDA/include/CGAL/leda_in_CGAL_2.h index 6437b48a5d56..ca41c115db60 100644 --- a/LEDA/include/CGAL/leda_in_CGAL_2.h +++ b/LEDA/include/CGAL/leda_in_CGAL_2.h @@ -38,7 +38,7 @@ #include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { inline bool @@ -119,6 +119,6 @@ cmp_signed_dist_to_line( const leda_point & p, const leda_point & q, #endif // __LEDA__ >= 360 } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LEDA_IN_CGAL_2_H diff --git a/LEDA/include/CGAL/rat_leda_in_CGAL_2.h b/LEDA/include/CGAL/rat_leda_in_CGAL_2.h index 717b3509f050..81ef59a329ff 100644 --- a/LEDA/include/CGAL/rat_leda_in_CGAL_2.h +++ b/LEDA/include/CGAL/rat_leda_in_CGAL_2.h @@ -38,7 +38,7 @@ #include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { inline bool @@ -191,7 +191,7 @@ has_larger_signed_dist_to_line(const leda_rat_point& p, const leda_rat_point& s) { return ( cmp_signed_dist_to_line(p,q,r,s) == LARGER ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_RAT_LEDA_IN_CGAL_2_H diff --git a/LEDA/test/LEDA/include/CGAL/predicates_on_points_rat_leda_2.h b/LEDA/test/LEDA/include/CGAL/predicates_on_points_rat_leda_2.h index efa7865c6b60..9df34db1c3fb 100644 --- a/LEDA/test/LEDA/include/CGAL/predicates_on_points_rat_leda_2.h +++ b/LEDA/test/LEDA/include/CGAL/predicates_on_points_rat_leda_2.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -67,6 +67,6 @@ collinear(const Point_2& p, */ } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PREDICATES_ON_POINTS_RAT_LEDA_2_H diff --git a/LEDA/test/LEDA/include/CGAL/rat_leda.h b/LEDA/test/LEDA/include/CGAL/rat_leda.h index 147b890701f7..da6580c952d9 100644 --- a/LEDA/test/LEDA/include/CGAL/rat_leda.h +++ b/LEDA/test/LEDA/include/CGAL/rat_leda.h @@ -31,7 +31,7 @@ #endif #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class use_rat_leda_kernel; template <> @@ -186,6 +186,6 @@ compare_xy(const leda_rat_point& p, const leda_rat_point& q) if (p.ycoord() < q.ycoord()) return CGAL::SMALLER; return CGAL::EQUAL; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_RAT_LEDA_H diff --git a/Largest_empty_rect_2/include/CGAL/Largest_empty_iso_rectangle_2.h b/Largest_empty_rect_2/include/CGAL/Largest_empty_iso_rectangle_2.h index 7bf6243624c5..945b7bfd6bb3 100644 --- a/Largest_empty_rect_2/include/CGAL/Largest_empty_iso_rectangle_2.h +++ b/Largest_empty_rect_2/include/CGAL/Largest_empty_iso_rectangle_2.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! Largest_empty_iso_rectangle_2 is a class that implements the largest @@ -1415,6 +1415,6 @@ Largest_empty_iso_rectangle_2::clear() -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LARGEST_EMPTY_ISO_RECTANGLE_2_H diff --git a/Matrix_search/include/CGAL/Cartesian_matrix.h b/Matrix_search/include/CGAL/Cartesian_matrix.h index 36144c54f0fb..1e63deea6293 100644 --- a/Matrix_search/include/CGAL/Cartesian_matrix.h +++ b/Matrix_search/include/CGAL/Cartesian_matrix.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Operation, class RandomAccessIC_row, @@ -98,7 +98,7 @@ cartesian_matrix( RandomAccessIC_row r_f, ( r_f, r_l, c_f, c_l, o); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // ! (CGAL_CARTESIAN_MATRIX_H) // ---------------------------------------------------------------------------- diff --git a/Matrix_search/include/CGAL/Dynamic_matrix.h b/Matrix_search/include/CGAL/Dynamic_matrix.h index 235b4cc5a3b9..21b1a722b72b 100644 --- a/Matrix_search/include/CGAL/Dynamic_matrix.h +++ b/Matrix_search/include/CGAL/Dynamic_matrix.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Matrix > class Dynamic_matrix @@ -116,7 +116,7 @@ Dynamic_matrix< Matrix > dynamic_matrix( const Matrix& m) { return Dynamic_matrix< Matrix >( m); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // ! (CGAL_DYNAMIC_MATRIX_H) // ---------------------------------------------------------------------------- diff --git a/Matrix_search/include/CGAL/Extremal_polygon_traits_2.h b/Matrix_search/include/CGAL/Extremal_polygon_traits_2.h index 58e763860268..a94e403b772d 100644 --- a/Matrix_search/include/CGAL/Extremal_polygon_traits_2.h +++ b/Matrix_search/include/CGAL/Extremal_polygon_traits_2.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class K_ > struct Extremal_polygon_area_traits_2 { typedef K_ K; @@ -139,13 +139,13 @@ struct Extremal_polygon_area_traits_2 { K k; }; -CGAL_END_NAMESPACE +} //namespace CGAL #include #include #ifdef CGAL_USE_LEDA #include #endif // CGAL_USE_LEDA -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class K_ > struct Extremal_polygon_perimeter_traits_2 { @@ -353,7 +353,7 @@ maximum_perimeter_inscribed_k_gon( points_begin, points_end, k, o); } // maximum_perimeter_inscribed_k_gon( ... ) -CGAL_END_NAMESPACE +} //namespace CGAL #endif // ! (CGAL_EXTREMAL_POLYGON_TRAITS_2_H) // ---------------------------------------------------------------------------- diff --git a/Matrix_search/include/CGAL/Rectangular_p_center_traits_2.h b/Matrix_search/include/CGAL/Rectangular_p_center_traits_2.h index 29445d9595c1..b3d6dbb331b4 100644 --- a/Matrix_search/include/CGAL/Rectangular_p_center_traits_2.h +++ b/Matrix_search/include/CGAL/Rectangular_p_center_traits_2.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class A, class S > struct Select : public std::binary_function< A, A, A > { @@ -329,6 +329,6 @@ construct_bounding_box_union_2(const Rectangle& r1, const Rectangle& r2) return construct_bounding_box_union_2(r1, r2, t); } // construct_bounding_box_union_2(r1, r2) -CGAL_END_NAMESPACE +} //namespace CGAL #endif // ! (CGAL_RECTANGULAR_P_CENTER_TRAITS_2_H) diff --git a/Matrix_search/include/CGAL/Sorted_matrix_search_traits_adaptor.h b/Matrix_search/include/CGAL/Sorted_matrix_search_traits_adaptor.h index 0285ff114c1d..1c726bbbb8c2 100644 --- a/Matrix_search/include/CGAL/Sorted_matrix_search_traits_adaptor.h +++ b/Matrix_search/include/CGAL/Sorted_matrix_search_traits_adaptor.h @@ -20,7 +20,7 @@ #ifndef CGAL_SORTED_MATRIX_SEARCH_TRAITS_ADAPTOR_H #define CGAL_SORTED_MATRIX_SEARCH_TRAITS_ADAPTOR_H 1 -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class FeasibilityTest_, class Matrix_ > class Sorted_matrix_search_traits_adaptor { @@ -63,7 +63,7 @@ sorted_matrix_search_traits_adaptor(FeasibilityTest f, const Matrix&) return Traits(f); } // sorted_matrix_search_traits_adaptor( ... ) -CGAL_END_NAMESPACE +} //namespace CGAL #endif // ! (CGAL_SORTED_MATRIX_SEARCH_TRAITS_ADAPTOR_H) // ---------------------------------------------------------------------------- diff --git a/Matrix_search/include/CGAL/Transform_iterator.h b/Matrix_search/include/CGAL/Transform_iterator.h index 44f872c7fcf3..177a0eac2f96 100644 --- a/Matrix_search/include/CGAL/Transform_iterator.h +++ b/Matrix_search/include/CGAL/Transform_iterator.h @@ -29,7 +29,7 @@ namespace std { } -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class OutputIterator, class Operation > struct Transform_iterator { @@ -80,6 +80,6 @@ query_circulator_or_iterator( const Transform_iterator< OutputIterator, Operation >&) { return Iterator_tag(); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRANSFORM_ITERATOR_H diff --git a/Matrix_search/include/CGAL/all_furthest_neighbors_2.h b/Matrix_search/include/CGAL/all_furthest_neighbors_2.h index 03ddc1d1ccef..ee3f87f5452b 100644 --- a/Matrix_search/include/CGAL/all_furthest_neighbors_2.h +++ b/Matrix_search/include/CGAL/all_furthest_neighbors_2.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Operation, class RandomAccessIC > class All_furthest_neighbor_matrix : public Cartesian_matrix< Operation, RandomAccessIC, RandomAccessIC > @@ -72,9 +72,9 @@ class All_furthest_neighbor_matrix }; -CGAL_END_NAMESPACE +} //namespace CGAL #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class RandomAccessIC, class OutputIterator, @@ -190,7 +190,7 @@ all_furthest_neighbors( RandomAccessIC points_begin, OutputIterator o) { return all_furthest_neighbors_2( points_begin, points_end, o); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // ! (CGAL_ALL_FURTHEST_NEIGHBORS_2_H) // ---------------------------------------------------------------------------- diff --git a/Matrix_search/include/CGAL/extremal_polygon_2.h b/Matrix_search/include/CGAL/extremal_polygon_2.h index 860e29e17b33..5b7826d71292 100644 --- a/Matrix_search/include/CGAL/extremal_polygon_2.h +++ b/Matrix_search/include/CGAL/extremal_polygon_2.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //!!! This will eventually be integrated into function_objects.h template < class Array, class Index, class Element > @@ -742,6 +742,6 @@ CGAL_maximum_inscribed_k_gon_2( return o; } // CGAL_maximum_inscribed_k_gon_2( ... ) -CGAL_END_NAMESPACE +} //namespace CGAL #endif // ! (CGAL_EXTREMAL_POLYGON_2_H) diff --git a/Matrix_search/include/CGAL/monotone_matrix_search.h b/Matrix_search/include/CGAL/monotone_matrix_search.h index f17303402893..5d0cf1da388d 100644 --- a/Matrix_search/include/CGAL/monotone_matrix_search.h +++ b/Matrix_search/include/CGAL/monotone_matrix_search.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Matrix, class RandomAccessIterator > inline void @@ -202,7 +202,7 @@ _reduce_matrix( M.shrink_to_quadratic_size(); } // _reduce_matrix( M, t) -CGAL_END_NAMESPACE +} //namespace CGAL #endif // ! (CGAL_MONOTONE_MATRIX_SEARCH_H) // ---------------------------------------------------------------------------- diff --git a/Matrix_search/include/CGAL/pierce_rectangles_2.h b/Matrix_search/include/CGAL/pierce_rectangles_2.h index da1c0c25d40f..5a766de19b00 100644 --- a/Matrix_search/include/CGAL/pierce_rectangles_2.h +++ b/Matrix_search/include/CGAL/pierce_rectangles_2.h @@ -33,7 +33,7 @@ # pragma warning(disable:4355) // complaint about using 'this' to #endif // initialize a member -CGAL_BEGIN_NAMESPACE +namespace CGAL { //!!! STL-extensions template < class T > @@ -646,8 +646,8 @@ three_cover_points( return o; } // three_cover_points(d, o, ok) -CGAL_END_NAMESPACE -CGAL_BEGIN_NAMESPACE +} //namespace CGAL +namespace CGAL { template < class OutputIterator, class Traits > OutputIterator four_cover_points(Staircases< Traits >& d, OutputIterator o, bool& ok) @@ -1023,7 +1023,7 @@ struct Four_covering_algorithm { { return four_cover_points(d, o, ok); } }; // class Four_covering_algorithm -CGAL_END_NAMESPACE +} //namespace CGAL #if defined(BOOST_MSVC) # pragma warning(pop) diff --git a/Matrix_search/include/CGAL/rectangular_3_center_2.h b/Matrix_search/include/CGAL/rectangular_3_center_2.h index b47e5490640f..f894b8cf9da1 100644 --- a/Matrix_search/include/CGAL/rectangular_3_center_2.h +++ b/Matrix_search/include/CGAL/rectangular_3_center_2.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class ForwardIterator, class OutputIterator, class FT, class Traits > @@ -1507,6 +1507,6 @@ rectangular_3_center_2( } // rectangular_3_center_2( ... ) -CGAL_END_NAMESPACE +} //namespace CGAL #endif // ! (CGAL_RECTANGULAR_3_CENTER_2_H) diff --git a/Matrix_search/include/CGAL/rectangular_p_center_2.h b/Matrix_search/include/CGAL/rectangular_p_center_2.h index 880e4980d9e0..a90107713d55 100644 --- a/Matrix_search/include/CGAL/rectangular_p_center_2.h +++ b/Matrix_search/include/CGAL/rectangular_p_center_2.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Operation, class RandomAccessIC_row, @@ -393,6 +393,6 @@ rectangular_p_center_2(ForwardIterator f, return rectangular_p_center_2(f, l, o, r, p, t); } // rectangular_p_center_2( ... ) -CGAL_END_NAMESPACE +} //namespace CGAL #endif // ! (CGAL_RECTANGULAR_P_CENTER_2_H) diff --git a/Matrix_search/include/CGAL/sorted_matrix_search.h b/Matrix_search/include/CGAL/sorted_matrix_search.h index b368f1c7d2f7..3e4adb0c3d16 100644 --- a/Matrix_search/include/CGAL/sorted_matrix_search.h +++ b/Matrix_search/include/CGAL/sorted_matrix_search.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Matrix > class Padded_matrix { public: @@ -409,7 +409,7 @@ sorted_matrix_search(InputIterator f, InputIterator l, Traits t) return ((*active_cells.begin()).min)(); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // ! (CGAL_SORTED_MATRIX_SEARCH_H) // ---------------------------------------------------------------------------- diff --git a/Mesh_3/include/CGAL/Mesh_3/Lloyd_move.h b/Mesh_3/include/CGAL/Mesh_3/Lloyd_move.h index 70da168dc0c7..d01106eb53c8 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Lloyd_move.h +++ b/Mesh_3/include/CGAL/Mesh_3/Lloyd_move.h @@ -29,7 +29,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Mesh_3 { @@ -542,6 +542,6 @@ class Lloyd_move } // end namespace Mesh_3 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MESH_3_LLOYD_MOVE_H diff --git a/Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h b/Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h index e9ccb53aad32..9f2b316167c1 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h +++ b/Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h @@ -39,7 +39,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Mesh_3 { @@ -586,6 +586,6 @@ sq_circumradius_length(const Cell_handle& cell, const Vertex_handle& v) const } // end namespace Mesh_3 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MESH_3_MESH_GLOBAL_OPTIMIZER_H diff --git a/Mesh_3/include/CGAL/Mesh_3/Mesh_sizing_field.h b/Mesh_3/include/CGAL/Mesh_3/Mesh_sizing_field.h index 6273a0d4c977..c5fa1559774e 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Mesh_sizing_field.h +++ b/Mesh_3/include/CGAL/Mesh_3/Mesh_sizing_field.h @@ -25,7 +25,7 @@ #ifndef CGAL_MESH_3_MESH_SIZING_FIELD_H #define CGAL_MESH_3_MESH_SIZING_FIELD_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Mesh_3 { @@ -254,6 +254,6 @@ interpolate_on_facet_vertices(const Point_3& p, const Cell_handle& cell) const } // end namespace Mesh_3 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MESH_3_MESH_SIZING_FIELD_H diff --git a/Mesh_3/include/CGAL/Mesh_3/Odt_move.h b/Mesh_3/include/CGAL/Mesh_3/Odt_move.h index 1bdbe3a6e8e2..cbfcccd5d910 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Odt_move.h +++ b/Mesh_3/include/CGAL/Mesh_3/Odt_move.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Mesh_3 { @@ -292,6 +292,6 @@ class Odt_move } // end namespace Mesh_3 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MESH_3_ODT_MOVE_H diff --git a/Mesh_3/include/CGAL/Mesh_3/Robust_intersection_traits_3.h b/Mesh_3/include/CGAL/Mesh_3/Robust_intersection_traits_3.h index b8d0f5d2feee..c6cf97207518 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Robust_intersection_traits_3.h +++ b/Mesh_3/include/CGAL/Mesh_3/Robust_intersection_traits_3.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Mesh_3 { @@ -94,6 +94,6 @@ struct Robust_intersection_traits_3 } // end namespace Mesh_3 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MESH_3_ROBUST_INTERSECTION_TRAITS_3_H diff --git a/Mesh_3/include/CGAL/Mesh_3/Sizing_grid.h b/Mesh_3/include/CGAL/Mesh_3/Sizing_grid.h index d97dc5c86e1e..e97bc71aadca 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Sizing_grid.h +++ b/Mesh_3/include/CGAL/Mesh_3/Sizing_grid.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define INFINITE_SIZE 1e30 #define INFINITE_MEASURE 1e30 @@ -617,6 +617,6 @@ class Sizing_grid }// end namespace Mesh_3 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MESH_3_SIZING_GRID_H diff --git a/Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h b/Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h index 0c98a482f940..8466846a20c2 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h +++ b/Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h @@ -48,7 +48,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Mesh_3 { @@ -795,6 +795,6 @@ reset_perturbation_counters() } // end namespace Mesh_3 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MESH_3_SLIVERS_PERTURBER_H diff --git a/Mesh_3/include/CGAL/Mesh_3/Triangulation_helpers.h b/Mesh_3/include/CGAL/Mesh_3/Triangulation_helpers.h index 6894445f0a49..4fddfa4d67d7 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Triangulation_helpers.h +++ b/Mesh_3/include/CGAL/Mesh_3/Triangulation_helpers.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Mesh_3 { @@ -202,6 +202,6 @@ well_oriented(const Tr& tr, } // end namespace Mesh_3 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MESH_3_TRIANGULATION_HELPERS_H diff --git a/Mesh_3/include/CGAL/Mesh_3/Triangulation_sizing_field.h b/Mesh_3/include/CGAL/Mesh_3/Triangulation_sizing_field.h index bfba42370218..8d79c0dd3a5b 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Triangulation_sizing_field.h +++ b/Mesh_3/include/CGAL/Mesh_3/Triangulation_sizing_field.h @@ -32,7 +32,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Mesh_3 { @@ -251,6 +251,6 @@ interpolate_on_facet_vertices(const Point_3& p, const CCell_handle& cell) const } // end namespace Mesh_3 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MESH_3_TRIANGULATION_SIZING_FIELD_H diff --git a/Mesh_3/include/CGAL/Mesh_3/Uniform_sizing_field.h b/Mesh_3/include/CGAL/Mesh_3/Uniform_sizing_field.h index c6c030dd38e4..6835fa94f10b 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Uniform_sizing_field.h +++ b/Mesh_3/include/CGAL/Mesh_3/Uniform_sizing_field.h @@ -24,7 +24,7 @@ #ifndef CGAL_MESH_3_UNIFORM_SIZING_FIELD_H #define CGAL_MESH_3_UNIFORM_SIZING_FIELD_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Mesh_3 { @@ -52,6 +52,6 @@ class Uniform_sizing_field } // end namespace Mesh_3 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MESH_3_UNIFORM_SIZING_FIELD_H diff --git a/Mesh_3/include/CGAL/Mesh_3/global_parameters.h b/Mesh_3/include/CGAL/Mesh_3/global_parameters.h index 25ec517eccbc..2a0c67e616ac 100644 --- a/Mesh_3/include/CGAL/Mesh_3/global_parameters.h +++ b/Mesh_3/include/CGAL/Mesh_3/global_parameters.h @@ -30,7 +30,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace parameters { @@ -69,6 +69,6 @@ BOOST_PARAMETER_NAME( (convergence, tag) convergence_) -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MESH_3_GLOBAL_PARAMETERS_H diff --git a/Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h b/Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h index 5b7bcbd450fe..9aee2823139c 100644 --- a/Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h +++ b/Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h @@ -36,7 +36,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Mesh_3 { @@ -1246,6 +1246,6 @@ class Li_random_perturbation -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MESH_3_VERTEX_PERTURBATION_H diff --git a/Mesh_3/include/CGAL/Mesh_optimization_return_code.h b/Mesh_3/include/CGAL/Mesh_optimization_return_code.h index 0e57137323ec..5e2b6963a959 100644 --- a/Mesh_3/include/CGAL/Mesh_optimization_return_code.h +++ b/Mesh_3/include/CGAL/Mesh_optimization_return_code.h @@ -24,7 +24,7 @@ #ifndef CGAL_MESH_OPTIMIZATION_RETURN_CODE_H #define CGAL_MESH_OPTIMIZATION_RETURN_CODE_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { enum Mesh_optimization_return_code { @@ -36,6 +36,6 @@ enum Mesh_optimization_return_code }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MESH_OPTIMIZATION_RETURN_CODE_H diff --git a/Mesh_3/include/CGAL/exude_mesh_3.h b/Mesh_3/include/CGAL/exude_mesh_3.h index cb1d93650dcc..8a4c26139999 100644 --- a/Mesh_3/include/CGAL/exude_mesh_3.h +++ b/Mesh_3/include/CGAL/exude_mesh_3.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace parameters { namespace default_values { const double exude_sliver_bound = 0.; @@ -74,6 +74,6 @@ exude_mesh_3_impl(C3T3& c3t3, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_EXUDE_MESH_3_H diff --git a/Mesh_3/include/CGAL/perturb_mesh_3.h b/Mesh_3/include/CGAL/perturb_mesh_3.h index fd9f0f3322aa..a967fa3ef9e1 100644 --- a/Mesh_3/include/CGAL/perturb_mesh_3.h +++ b/Mesh_3/include/CGAL/perturb_mesh_3.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace parameters { namespace default_values { const double perturb_sliver_bound = 0.; @@ -91,7 +91,7 @@ perturb_mesh_3_impl(C3T3& c3t3, -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PERTURB_MESH_3_H diff --git a/Min_annulus_d/include/CGAL/Min_annulus_d.h b/Min_annulus_d/include/CGAL/Min_annulus_d.h index 0cc2a130cea3..8378b4cadc1e 100644 --- a/Min_annulus_d/include/CGAL/Min_annulus_d.h +++ b/Min_annulus_d/include/CGAL/Min_annulus_d.h @@ -78,7 +78,7 @@ // the objective function involves terms p^Tp that might not be exactly // computed -> document all this!!! -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace MA_detail { @@ -865,7 +865,7 @@ operator >> ( std::istream& is, CGAL::Min_annulus_d& min_annulus) return( is); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MIN_ANNULUS_D_H diff --git a/Min_annulus_d/test/Min_annulus_d/test_Min_annulus_d.h b/Min_annulus_d/test/Min_annulus_d/test_Min_annulus_d.h index 0388796d6dd7..509828667243 100644 --- a/Min_annulus_d/test/Min_annulus_d/test_Min_annulus_d.h +++ b/Min_annulus_d/test/Min_annulus_d/test_Min_annulus_d.h @@ -32,7 +32,7 @@ # include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define COVER(text,code) \ verr0.out().width( 32); verr0 << text << "..." << flush; \ @@ -200,7 +200,7 @@ test_Min_annulus_d( ForwardIterator first, ForwardIterator last, verr0 << endl; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TEST_MIN_ANNULUS_D_H diff --git a/Min_circle_2/include/CGAL/Min_circle_2.h b/Min_circle_2/include/CGAL/Min_circle_2.h index b86d977717cb..19ceb90e9dc1 100644 --- a/Min_circle_2/include/CGAL/Min_circle_2.h +++ b/Min_circle_2/include/CGAL/Min_circle_2.h @@ -28,7 +28,7 @@ # include # include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declaration // ================= @@ -581,7 +581,7 @@ template < class Traits_ > std::istream& operator >> ( std::istream& is, Min_circle_2& mc); -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Min_circle_2/include/CGAL/Min_circle_2/Min_circle_2_adapterC2.h b/Min_circle_2/include/CGAL/Min_circle_2/Min_circle_2_adapterC2.h index cbd65f266558..cebfed2cb199 100644 --- a/Min_circle_2/include/CGAL/Min_circle_2/Min_circle_2_adapterC2.h +++ b/Min_circle_2/include/CGAL/Min_circle_2/Min_circle_2_adapterC2.h @@ -23,7 +23,7 @@ // includes # include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declarations // ================== @@ -334,7 +334,7 @@ operator >> ( std::istream& is, return( is); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MIN_CIRCLE_2_ADAPTERC2_H diff --git a/Min_circle_2/include/CGAL/Min_circle_2/Min_circle_2_adapterH2.h b/Min_circle_2/include/CGAL/Min_circle_2/Min_circle_2_adapterH2.h index 4f2d59912bf1..e45b6a0b3304 100644 --- a/Min_circle_2/include/CGAL/Min_circle_2/Min_circle_2_adapterH2.h +++ b/Min_circle_2/include/CGAL/Min_circle_2/Min_circle_2_adapterH2.h @@ -23,7 +23,7 @@ // includes # include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declarations // ================== @@ -374,7 +374,7 @@ operator >> ( std::istream& is, return( is); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MIN_CIRCLE_2_ADAPTERH2_H diff --git a/Min_circle_2/include/CGAL/Min_circle_2/Min_circle_2_impl.h b/Min_circle_2/include/CGAL/Min_circle_2/Min_circle_2_impl.h index 9f13e4035465..c6f5e865b29a 100644 --- a/Min_circle_2/include/CGAL/Min_circle_2/Min_circle_2_impl.h +++ b/Min_circle_2/include/CGAL/Min_circle_2/Min_circle_2_impl.h @@ -19,7 +19,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class implementation (continued) // ================================ @@ -102,6 +102,6 @@ operator >> ( std::istream& is, CGAL::Min_circle_2& min_circle) return( is); } -CGAL_END_NAMESPACE +} //namespace CGAL // ===== EOF ================================================================== diff --git a/Min_circle_2/include/CGAL/Min_circle_2/Optimisation_circle_2.h b/Min_circle_2/include/CGAL/Min_circle_2/Optimisation_circle_2.h index 9487827f654b..64e505f666e2 100644 --- a/Min_circle_2/include/CGAL/Min_circle_2/Optimisation_circle_2.h +++ b/Min_circle_2/include/CGAL/Min_circle_2/Optimisation_circle_2.h @@ -25,7 +25,7 @@ # include # include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declaration // ================= @@ -222,7 +222,7 @@ template < class K_ > std::istream& operator >> ( std::istream&, CGAL::Optimisation_circle_2&); -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Min_circle_2/include/CGAL/Min_circle_2/Optimisation_circle_2_impl.h b/Min_circle_2/include/CGAL/Min_circle_2/Optimisation_circle_2_impl.h index a9c1d05d7b1e..b8bfc769a412 100644 --- a/Min_circle_2/include/CGAL/Min_circle_2/Optimisation_circle_2_impl.h +++ b/Min_circle_2/include/CGAL/Min_circle_2/Optimisation_circle_2_impl.h @@ -20,7 +20,7 @@ // includes # include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class implementation (continued) // ================================ @@ -93,6 +93,6 @@ operator >> ( std::istream& is, CGAL::Optimisation_circle_2& c) return( is); } -CGAL_END_NAMESPACE +} //namespace CGAL // ===== EOF ================================================================== diff --git a/Min_circle_2/include/CGAL/Min_circle_2_traits_2.h b/Min_circle_2/include/CGAL/Min_circle_2_traits_2.h index d1d4501db05d..670a923cefd3 100644 --- a/Min_circle_2/include/CGAL/Min_circle_2_traits_2.h +++ b/Min_circle_2/include/CGAL/Min_circle_2_traits_2.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declarations // ================== @@ -66,7 +66,7 @@ class Min_circle_2_traits_2 { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MIN_CIRCLE_2_TRAITS_2_H diff --git a/Min_ellipse_2/include/CGAL/Min_ellipse_2.h b/Min_ellipse_2/include/CGAL/Min_ellipse_2.h index 077ad383d90d..9ae7b1e1ae9d 100644 --- a/Min_ellipse_2/include/CGAL/Min_ellipse_2.h +++ b/Min_ellipse_2/include/CGAL/Min_ellipse_2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declaration // ================= @@ -575,7 +575,7 @@ template < class Traits_ > std::istream& operator >> ( std::istream& is, Min_ellipse_2& me); -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Min_ellipse_2/include/CGAL/Min_ellipse_2/Min_ellipse_2_adapterC2.h b/Min_ellipse_2/include/CGAL/Min_ellipse_2/Min_ellipse_2_adapterC2.h index 8c1d6a1131d3..0db9a1c02d15 100644 --- a/Min_ellipse_2/include/CGAL/Min_ellipse_2/Min_ellipse_2_adapterC2.h +++ b/Min_ellipse_2/include/CGAL/Min_ellipse_2/Min_ellipse_2_adapterC2.h @@ -24,7 +24,7 @@ # include # include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declarations // ================== @@ -416,7 +416,7 @@ operator >> ( std::istream& is, return( is); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MIN_ELLIPSE_2_ADAPTERC2_H diff --git a/Min_ellipse_2/include/CGAL/Min_ellipse_2/Min_ellipse_2_adapterH2.h b/Min_ellipse_2/include/CGAL/Min_ellipse_2/Min_ellipse_2_adapterH2.h index 030ae4fe9291..a5f8eaa1a423 100644 --- a/Min_ellipse_2/include/CGAL/Min_ellipse_2/Min_ellipse_2_adapterH2.h +++ b/Min_ellipse_2/include/CGAL/Min_ellipse_2/Min_ellipse_2_adapterH2.h @@ -24,7 +24,7 @@ # include # include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declarations // ================== @@ -424,7 +424,7 @@ operator >> ( std::istream& is, return( is); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MIN_ELLIPSE_2_ADAPTERH2_H diff --git a/Min_ellipse_2/include/CGAL/Min_ellipse_2/Min_ellipse_2_impl.h b/Min_ellipse_2/include/CGAL/Min_ellipse_2/Min_ellipse_2_impl.h index 76119a284d21..5548a8fbf1bf 100644 --- a/Min_ellipse_2/include/CGAL/Min_ellipse_2/Min_ellipse_2_impl.h +++ b/Min_ellipse_2/include/CGAL/Min_ellipse_2/Min_ellipse_2_impl.h @@ -19,7 +19,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class implementation (continued) // ================================ @@ -102,6 +102,6 @@ operator >> ( std::istream& is, CGAL::Min_ellipse_2& min_ellipse) return( is); } -CGAL_END_NAMESPACE +} //namespace CGAL // ===== EOF ================================================================== diff --git a/Min_ellipse_2/include/CGAL/Min_ellipse_2/Optimisation_ellipse_2.h b/Min_ellipse_2/include/CGAL/Min_ellipse_2/Optimisation_ellipse_2.h index 55ca68b8e28d..841bf6d93832 100644 --- a/Min_ellipse_2/include/CGAL/Min_ellipse_2/Optimisation_ellipse_2.h +++ b/Min_ellipse_2/include/CGAL/Min_ellipse_2/Optimisation_ellipse_2.h @@ -25,7 +25,7 @@ -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class interface // =============== @@ -438,7 +438,7 @@ template < class K_ > std::istream& operator >> ( std::istream&, CGAL::Optimisation_ellipse_2&); -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Min_ellipse_2/include/CGAL/Min_ellipse_2/Optimisation_ellipse_2_impl.h b/Min_ellipse_2/include/CGAL/Min_ellipse_2/Optimisation_ellipse_2_impl.h index c3f1aa48c0d5..ef0c94fc15de 100644 --- a/Min_ellipse_2/include/CGAL/Min_ellipse_2/Optimisation_ellipse_2_impl.h +++ b/Min_ellipse_2/include/CGAL/Min_ellipse_2/Optimisation_ellipse_2_impl.h @@ -17,7 +17,7 @@ // // Author(s) : Sven Schoenherr , Bernd Gaertner -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class implementation (continued) // ================================ @@ -120,6 +120,6 @@ operator >> ( std::istream& is, CGAL::Optimisation_ellipse_2& e) return( is); } -CGAL_END_NAMESPACE +} //namespace CGAL // ===== EOF ================================================================== diff --git a/Min_ellipse_2/include/CGAL/Min_ellipse_2_traits_2.h b/Min_ellipse_2/include/CGAL/Min_ellipse_2_traits_2.h index c193cb2a30fc..bd4f884bcd6e 100644 --- a/Min_ellipse_2/include/CGAL/Min_ellipse_2_traits_2.h +++ b/Min_ellipse_2/include/CGAL/Min_ellipse_2_traits_2.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declarations // ================== @@ -55,7 +55,7 @@ class Min_ellipse_2_traits_2 { // Min_ellipse_2_traits_2( Min_ellipse_2_traits_2 const&); }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MIN_ELLIPSE_2_TRAITS_2_H diff --git a/Min_quadrilateral_2/include/CGAL/Min_quadrilateral_traits_2.h b/Min_quadrilateral_2/include/CGAL/Min_quadrilateral_traits_2.h index fdc490871493..df2b26f49722 100644 --- a/Min_quadrilateral_2/include/CGAL/Min_quadrilateral_traits_2.h +++ b/Min_quadrilateral_2/include/CGAL/Min_quadrilateral_traits_2.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Optimisation { template < class Kernel_ > @@ -412,7 +412,7 @@ struct Min_quadrilateral_default_traits_2 { }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // ! (CGAL_MIN_QUADRILATERAL_TRAITS_2_H) diff --git a/Min_quadrilateral_2/include/CGAL/min_quadrilateral_2.h b/Min_quadrilateral_2/include/CGAL/min_quadrilateral_2.h index 1b3d8ac0f5d6..87b1d1d89472 100644 --- a/Min_quadrilateral_2/include/CGAL/min_quadrilateral_2.h +++ b/Min_quadrilateral_2/include/CGAL/min_quadrilateral_2.h @@ -31,7 +31,7 @@ #include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class ForwardIterator, class OutputIterator, class Traits > OutputIterator @@ -718,9 +718,9 @@ min_strip_2(ForwardIterator f, } // min_strip_2(f, l, o, t) -CGAL_END_NAMESPACE +} //namespace CGAL #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class ForwardIterator, class OutputIterator > inline @@ -792,6 +792,6 @@ minimum_enclosing_strip_2(ForwardIterator f, { return min_strip_2(f, l, o); } #endif // CGAL_NO_DEPRECATED_CODE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // ! (CGAL_MIN_QUADRILATERAL_2_H) diff --git a/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_2.h b/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_2.h index 3a42c4c41655..a4e96431435c 100644 --- a/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_2.h +++ b/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_2.h @@ -29,7 +29,7 @@ # include # include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declaration // ================= @@ -83,7 +83,7 @@ class Min_sphere_annulus_d_traits_2 { { return Construct_point_d(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MIN_SPHERE_ANNULUS_D_TRAITS_2_H diff --git a/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_3.h b/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_3.h index d326ef8620fa..68b8fbc4b6c5 100644 --- a/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_3.h +++ b/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_3.h @@ -29,7 +29,7 @@ # include # include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declaration // ================= @@ -83,7 +83,7 @@ class Min_sphere_annulus_d_traits_3 { { return Construct_point_d(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MIN_SPHERE_ANNULUS_D_TRAITS_3_H diff --git a/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_d.h b/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_d.h index 2294f2bd00c8..6b3ac72a826d 100644 --- a/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_d.h +++ b/Min_sphere_d/include/CGAL/Min_sphere_annulus_d_traits_d.h @@ -29,7 +29,7 @@ # include # include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declaration // ================= @@ -81,7 +81,7 @@ class Min_sphere_annulus_d_traits_d { { return Construct_point_d(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MIN_SPHERE_ANULUS_D_TRAITS_D_H diff --git a/Min_sphere_d/include/CGAL/Min_sphere_d.h b/Min_sphere_d/include/CGAL/Min_sphere_d.h index 6105ca53b0f8..1b05b69c3618 100644 --- a/Min_sphere_d/include/CGAL/Min_sphere_d.h +++ b/Min_sphere_d/include/CGAL/Min_sphere_d.h @@ -41,7 +41,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -452,7 +452,7 @@ template < class Traits > std::istream& operator >> ( std::istream& is, Min_sphere_d & ms); -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Min_sphere_d/include/CGAL/Min_sphere_d/Min_sphere_d_impl.h b/Min_sphere_d/include/CGAL/Min_sphere_d/Min_sphere_d_impl.h index 26044ce825d3..4cb399e151e4 100644 --- a/Min_sphere_d/include/CGAL/Min_sphere_d/Min_sphere_d_impl.h +++ b/Min_sphere_d/include/CGAL/Min_sphere_d/Min_sphere_d_impl.h @@ -20,7 +20,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class implementation (continued) // ================================ @@ -109,6 +109,6 @@ operator >> ( std::istream& is, Min_sphere_d& min_sphere) -CGAL_END_NAMESPACE +} //namespace CGAL // ===== EOF ================================================================== diff --git a/Min_sphere_d/include/CGAL/Min_sphere_d/Optimisation_sphere_d.h b/Min_sphere_d/include/CGAL/Min_sphere_d/Optimisation_sphere_d.h index 599e8bae5d56..494d3d129daa 100644 --- a/Min_sphere_d/include/CGAL/Min_sphere_d/Optimisation_sphere_d.h +++ b/Min_sphere_d/include/CGAL/Min_sphere_d/Optimisation_sphere_d.h @@ -21,7 +21,7 @@ #ifndef CGAL_OPTIMISATION_SPHERE_D_H #define CGAL_OPTIMISATION_SPHERE_D_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declarations // ================== @@ -35,7 +35,7 @@ class Optimisation_sphere_d; template class Optimisation_sphere_d; -CGAL_END_NAMESPACE +} //namespace CGAL // Class interfaces and implementation // ================================== @@ -47,7 +47,7 @@ CGAL_END_NAMESPACE #include - CGAL_BEGIN_NAMESPACE + namespace CGAL { // Cartesian version // ----------------- @@ -595,7 +595,7 @@ CGAL_END_NAMESPACE }; - CGAL_END_NAMESPACE + } //namespace CGAL #endif // CGAL_OPTIMISATION_SPHERE_D_H diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Approx_offset_base_2.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Approx_offset_base_2.h index d1882b9847bf..f777aeed311c 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Approx_offset_base_2.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Approx_offset_base_2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A base class for approximating the offset of a given polygon by a given @@ -597,6 +597,6 @@ class Approx_offset_base_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Arr_labeled_traits_2.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Arr_labeled_traits_2.h index 184c7b19d03c..41a580d64990 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Arr_labeled_traits_2.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Arr_labeled_traits_2.h @@ -22,7 +22,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A meta-traits class that adds lables to points and to x-monotone curves, @@ -415,6 +415,6 @@ class Arr_labeled_traits_2 : public Traits_ //@} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Decomposition_strategy_adapter.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Decomposition_strategy_adapter.h index 0be0c5c54fdf..fc72df720eaa 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Decomposition_strategy_adapter.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Decomposition_strategy_adapter.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { struct Tag_optimal_convex_parition { @@ -159,6 +159,6 @@ class Polygon_decomposition_strategy_adapter } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Exact_offset_base_2.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Exact_offset_base_2.h index d6d5b1b00d6c..0a4d7a0e287f 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Exact_offset_base_2.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Exact_offset_base_2.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A base class for computing the offset of a given polygon by a given @@ -288,6 +288,6 @@ class Exact_offset_base_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Labels.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Labels.h index e99649b8feba..939c52fd6bd0 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Labels.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Labels.h @@ -19,7 +19,7 @@ #ifndef CGAL_MINKOWSKI_SUM_LABELS_H #define CGAL_MINKOWSKI_SUM_LABELS_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A label for endpoints of Minkowski-sum curves. @@ -282,6 +282,6 @@ class X_curve_label } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Minkowski_sum_conv_2.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Minkowski_sum_conv_2.h index f671a12492f8..33e1cd80aea8 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Minkowski_sum_conv_2.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Minkowski_sum_conv_2.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A class for computing the Minkowski sum of two simple polygons based on the @@ -680,6 +680,6 @@ class Minkowski_sum_by_convolution_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Minkowski_sum_decomp_2.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Minkowski_sum_decomp_2.h index fdcae3538b0b..72b5c4ba8365 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Minkowski_sum_decomp_2.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Minkowski_sum_decomp_2.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A class for computing the Minkowski sum of two simple polygons based on @@ -304,6 +304,6 @@ class Minkowski_sum_by_decomposition_2 } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Offset_conv_2.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Offset_conv_2.h index 23c1d0bb962b..d8dacf746e3f 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Offset_conv_2.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Offset_conv_2.h @@ -22,7 +22,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A class for computing the offset of a given polygon by a given radius @@ -195,6 +195,6 @@ class Offset_by_convolution_2 : private Base_ } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Offset_decomp_2.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Offset_decomp_2.h index 55eda1874463..b6aa9fe3a741 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Offset_decomp_2.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Offset_decomp_2.h @@ -22,7 +22,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * A class for computing the offset of a given polygon by a given radius, @@ -121,6 +121,6 @@ class Offset_by_decomposition_2 : private Base_ }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Polygon_convex_decomposition.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Polygon_convex_decomposition.h index beca4b912214..b3960447b995 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Polygon_convex_decomposition.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Polygon_convex_decomposition.h @@ -21,7 +21,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { struct Tag_optimal_convex_parition { @@ -125,6 +125,6 @@ class Decomposition_strategy_adapter } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Union_of_curve_cycles_2.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Union_of_curve_cycles_2.h index cc7335f8d886..6ef6a39f8ee4 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Union_of_curve_cycles_2.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Union_of_curve_cycles_2.h @@ -21,7 +21,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * An auxiliary class for computing the union of the interiors of curve @@ -248,6 +248,6 @@ class Union_of_curve_cycles_2 : private Union_of_cycles_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Union_of_cycles_2.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Union_of_cycles_2.h index e0a2f797eebc..55c324538822 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Union_of_cycles_2.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Union_of_cycles_2.h @@ -22,7 +22,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * An auxiliary base class for computing the union of the interiors of cycles @@ -220,6 +220,6 @@ class Union_of_cycles_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Union_of_segment_cycles_2.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Union_of_segment_cycles_2.h index 4ecc4d41a610..a009471cb1a5 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Union_of_segment_cycles_2.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Union_of_segment_cycles_2.h @@ -21,7 +21,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \class * An auxiliary class for computing the union of the interiors of segment @@ -129,6 +129,6 @@ class Union_of_segment_cycles_2 : private Union_of_cycles_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Minkowski_sum_2/include/CGAL/Polygon_convex_decomposition_2.h b/Minkowski_sum_2/include/CGAL/Polygon_convex_decomposition_2.h index 75cb7009dee8..8a9d9f828545 100644 --- a/Minkowski_sum_2/include/CGAL/Polygon_convex_decomposition_2.h +++ b/Minkowski_sum_2/include/CGAL/Polygon_convex_decomposition_2.h @@ -22,7 +22,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * \class @@ -81,6 +81,6 @@ class Greene_convex_decomposition_2 : }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Minkowski_sum_2/include/CGAL/Small_side_angle_bisector_decomposition_2.h b/Minkowski_sum_2/include/CGAL/Small_side_angle_bisector_decomposition_2.h index 35a5a1a6c4fa..346630bfa5c4 100644 --- a/Minkowski_sum_2/include/CGAL/Small_side_angle_bisector_decomposition_2.h +++ b/Minkowski_sum_2/include/CGAL/Small_side_angle_bisector_decomposition_2.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * \class @@ -935,6 +935,6 @@ class Small_side_angle_bisector_decomposition_2 } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Minkowski_sum_2/include/CGAL/approximated_offset_2.h b/Minkowski_sum_2/include/CGAL/approximated_offset_2.h index 31b784d42c9a..469da5ad4dd1 100644 --- a/Minkowski_sum_2/include/CGAL/approximated_offset_2.h +++ b/Minkowski_sum_2/include/CGAL/approximated_offset_2.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * Approximate the offset of a given simple polygon by a given radius, @@ -163,6 +163,6 @@ approximated_inset_2 (const Polygon_2& pgn, return (oi); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Minkowski_sum_2/include/CGAL/minkowski_sum_2.h b/Minkowski_sum_2/include/CGAL/minkowski_sum_2.h index 0a2dd6c90602..c510c4f5b811 100644 --- a/Minkowski_sum_2/include/CGAL/minkowski_sum_2.h +++ b/Minkowski_sum_2/include/CGAL/minkowski_sum_2.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * Compute the Minkowski sum of two simple polygons using the convolution @@ -85,6 +85,6 @@ minkowski_sum_2 (const Polygon_2& pgn1, sum_holes.end())); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Minkowski_sum_2/include/CGAL/offset_polygon_2.h b/Minkowski_sum_2/include/CGAL/offset_polygon_2.h index 77d203acec40..00ab35547dc2 100644 --- a/Minkowski_sum_2/include/CGAL/offset_polygon_2.h +++ b/Minkowski_sum_2/include/CGAL/offset_polygon_2.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * Compute the offset of a given simple polygon by a given radius, @@ -160,6 +160,6 @@ inset_polygon_2 (const Polygon_2 -CGAL_BEGIN_NAMESPACE +namespace CGAL { template > @@ -1223,5 +1223,5 @@ std::ostream& operator<<(std::ostream& out, const CGAL::Gaussian_map #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Gaussian_map_to_nef_3 : public Modifier_base { @@ -250,5 +250,5 @@ template }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MS3_GAUSSIAN_MAP_TO_NEF_3_H diff --git a/Minkowski_sum_3/include/CGAL/Minkowski_sum_3/PointMark.h b/Minkowski_sum_3/include/CGAL/Minkowski_sum_3/PointMark.h index 5a0ed783a147..1846508d984d 100644 --- a/Minkowski_sum_3/include/CGAL/Minkowski_sum_3/PointMark.h +++ b/Minkowski_sum_3/include/CGAL/Minkowski_sum_3/PointMark.h @@ -19,7 +19,7 @@ #ifndef CGAL_MS3_POINTMARK_H #define CGAL_MS3_POINTMARK_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class PointMark { @@ -83,5 +83,5 @@ const PointMark operator+(const PointMark& pm1, return ret; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Minkowski_sum_3/include/CGAL/Minkowski_sum_3/bipartite_nary_union_sorted_combined.h b/Minkowski_sum_3/include/CGAL/Minkowski_sum_3/bipartite_nary_union_sorted_combined.h index d3a5a59c0094..35b6abbafa7c 100644 --- a/Minkowski_sum_3/include/CGAL/Minkowski_sum_3/bipartite_nary_union_sorted_combined.h +++ b/Minkowski_sum_3/include/CGAL/Minkowski_sum_3/bipartite_nary_union_sorted_combined.h @@ -35,7 +35,7 @@ #include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { #ifdef CGAL_NEF_NARY_UNION_L1_SORT template @@ -226,5 +226,5 @@ bipartite_nary_union_sorted_combined(Nef_polyhedron& N0, return nary_union.get_union(); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MS3_BIPARTITE_NARY_UNION_SORTED_COMBINED_H diff --git a/Minkowski_sum_3/include/CGAL/minkowski_sum_3.h b/Minkowski_sum_3/include/CGAL/minkowski_sum_3.h index 32041431dd52..14e734364d20 100644 --- a/Minkowski_sum_3/include/CGAL/minkowski_sum_3.h +++ b/Minkowski_sum_3/include/CGAL/minkowski_sum_3.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template Nef_polyhedron_3 @@ -58,5 +58,5 @@ minkowski_sum_3(Nef_polyhedron_3& N0, Nef_polyhedron_3& N1) return result; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MINKOWSKI_SUM_3_H diff --git a/Modifier/include/CGAL/Modifier_base.h b/Modifier/include/CGAL/Modifier_base.h index bf2c5ca7aa0f..2508892377bc 100644 --- a/Modifier/include/CGAL/Modifier_base.h +++ b/Modifier/include/CGAL/Modifier_base.h @@ -24,7 +24,7 @@ #ifndef CGAL_MODIFIER_BASE_H #define CGAL_MODIFIER_BASE_H 1 -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Modifier_base { @@ -37,7 +37,7 @@ class Modifier_base { virtual ~Modifier_base() {} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MODIFIER_BASE_H // // EOF // diff --git a/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h b/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h index a51fe5df3db5..aa420e8f5595 100644 --- a/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h +++ b/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h @@ -30,7 +30,7 @@ # include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Residue; @@ -317,6 +317,6 @@ inline std::istream& operator >> (std::istream& is, Residue& p) { return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_RESIDUE_TYPE_H diff --git a/Modular_arithmetic/include/CGAL/Residue.h b/Modular_arithmetic/include/CGAL/Residue.h index cc6babef3346..8a06a77ee9a2 100644 --- a/Modular_arithmetic/include/CGAL/Residue.h +++ b/Modular_arithmetic/include/CGAL/Residue.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \brief Specialization of CGAL::NT_traits for \c Residue, which is a model @@ -49,7 +49,7 @@ CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,CGAL::Residue) CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int ,CGAL::Residue) CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long ,CGAL::Residue) -CGAL_END_NAMESPACE +} //namespace CGAL #endif //#ifnedef CGAL_RESIDUE_H 1 diff --git a/Nef_2/include/CGAL/Bounded_kernel.h b/Nef_2/include/CGAL/Bounded_kernel.h index 6fbd093a2e23..290c2a97fdae 100644 --- a/Nef_2/include/CGAL/Bounded_kernel.h +++ b/Nef_2/include/CGAL/Bounded_kernel.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Bounded_kernel; @@ -443,5 +443,5 @@ class Bounded_kernel -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_BOUNDED_KERNEL_H diff --git a/Nef_2/include/CGAL/Extended_cartesian.h b/Nef_2/include/CGAL/Extended_cartesian.h index c2273eb44574..67f1c6b97f93 100644 --- a/Nef_2/include/CGAL/Extended_cartesian.h +++ b/Nef_2/include/CGAL/Extended_cartesian.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Extended_cartesian; @@ -438,5 +438,5 @@ const char* output_identifier() const { return "Extended_cartesian"; } #undef Polynomial -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_EXTENDED_CARTESIAN_H diff --git a/Nef_2/include/CGAL/Extended_homogeneous.h b/Nef_2/include/CGAL/Extended_homogeneous.h index 0a3458554654..63a00a4de13f 100644 --- a/Nef_2/include/CGAL/Extended_homogeneous.h +++ b/Nef_2/include/CGAL/Extended_homogeneous.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Extended_homogeneous; @@ -514,5 +514,5 @@ on the extended geometric objects.}*/ }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_EXTENDED_HOMOGENEOUS_H diff --git a/Nef_2/include/CGAL/Filtered_extended_homogeneous.h b/Nef_2/include/CGAL/Filtered_extended_homogeneous.h index bb17cfcdaa81..80d77f7c6b25 100644 --- a/Nef_2/include/CGAL/Filtered_extended_homogeneous.h +++ b/Nef_2/include/CGAL/Filtered_extended_homogeneous.h @@ -55,7 +55,7 @@ std::cout << #c##" " << c##_exception << "/" << c##_total << std::endl #define PRINT_STATISTICS(c) #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SPolynomial { @@ -1271,7 +1271,7 @@ const char* output_identifier() const -CGAL_END_NAMESPACE +} //namespace CGAL #undef CHECK #undef KERNEL_CHECK diff --git a/Nef_2/include/CGAL/IO/Nef_polyhedron_2_PS_stream.h b/Nef_2/include/CGAL/IO/Nef_polyhedron_2_PS_stream.h index ead2b8b1ed80..23cb99a33bdb 100644 --- a/Nef_2/include/CGAL/IO/Nef_polyhedron_2_PS_stream.h +++ b/Nef_2/include/CGAL/IO/Nef_polyhedron_2_PS_stream.h @@ -31,7 +31,7 @@ #include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { static int frame_default = 100; template @@ -116,6 +116,6 @@ ps_file& operator<<(ps_file& PS, const Nef_polyhedron_2& P) return PS; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_POLYHEDRON_2_PS_STREAM_H diff --git a/Nef_2/include/CGAL/Is_extended_kernel.h b/Nef_2/include/CGAL/Is_extended_kernel.h index 4536d7a20aa5..a9bff42dbfee 100644 --- a/Nef_2/include/CGAL/Is_extended_kernel.h +++ b/Nef_2/include/CGAL/Is_extended_kernel.h @@ -21,13 +21,13 @@ #define CGAL_IS_EXTENDED_KERNEL_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Is_extended_kernel { typedef Tag_false value_type; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Nef_2/include/CGAL/Nef_2/Bounding_box_2.h b/Nef_2/include/CGAL/Nef_2/Bounding_box_2.h index 693fe55bcc8f..effdc0955c50 100644 --- a/Nef_2/include/CGAL/Nef_2/Bounding_box_2.h +++ b/Nef_2/include/CGAL/Nef_2/Bounding_box_2.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // template class Bounding_box_2; @@ -112,5 +112,5 @@ class Bounding_box_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_BOUNDING_BOX_D_H diff --git a/Nef_2/include/CGAL/Nef_2/Constrained_triang_traits.h b/Nef_2/include/CGAL/Nef_2/Constrained_triang_traits.h index ed0a41ded3ea..deae3e610cb6 100644 --- a/Nef_2/include/CGAL/Nef_2/Constrained_triang_traits.h +++ b/Nef_2/include/CGAL/Nef_2/Constrained_triang_traits.h @@ -36,7 +36,7 @@ # pragma warning(disable:4355) // complaint about using 'this' to #endif // initialize a member -CGAL_BEGIN_NAMESPACE +namespace CGAL { struct Do_nothing { Do_nothing() {} @@ -423,7 +423,7 @@ class Constrained_triang_traits : public PMDEC { }; // Constrained_triang_traits -CGAL_END_NAMESPACE +} //namespace CGAL #if defined(BOOST_MSVC) # pragma warning(pop) diff --git a/Nef_2/include/CGAL/Nef_2/Line_to_epoint.h b/Nef_2/include/CGAL/Nef_2/Line_to_epoint.h index 984fa2852131..4067b60c4f87 100644 --- a/Nef_2/include/CGAL/Nef_2/Line_to_epoint.h +++ b/Nef_2/include/CGAL/Nef_2/Line_to_epoint.h @@ -20,7 +20,7 @@ #ifndef CGAL_LINE_TO_EPOINT_H #define CGAL_LINE_TO_EPOINT_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Line_to_epoint { @@ -67,5 +67,5 @@ struct Line_to_epoint { }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_LINE_TO_EPOINT_H diff --git a/Nef_2/include/CGAL/Nef_2/Object_handle.h b/Nef_2/include/CGAL/Nef_2/Object_handle.h index cb8774f704c0..028145a53e4d 100644 --- a/Nef_2/include/CGAL/Nef_2/Object_handle.h +++ b/Nef_2/include/CGAL/Nef_2/Object_handle.h @@ -27,10 +27,10 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { typedef Object Object_handle; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_OBJECT_HANDLE_H diff --git a/Nef_2/include/CGAL/Nef_2/Object_index.h b/Nef_2/include/CGAL/Nef_2/Object_index.h index de7eae07b3c6..4111f64bd99e 100644 --- a/Nef_2/include/CGAL/Nef_2/Object_index.h +++ b/Nef_2/include/CGAL/Nef_2/Object_index.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Object_index { @@ -52,6 +52,6 @@ class Object_index { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEF_2_OBJECT_INDEX_H diff --git a/Nef_2/include/CGAL/Nef_2/PM_checker.h b/Nef_2/include/CGAL/Nef_2/PM_checker.h index be3a98da86b2..aa2d3ba6dc14 100644 --- a/Nef_2/include/CGAL/Nef_2/PM_checker.h +++ b/Nef_2/include/CGAL/Nef_2/PM_checker.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*{\Moptions outfile=PM_checker.man }*/ /*{\Manpage {PM_checker}{PMCDEC,GEOM}{Plane map checking}{}}*/ @@ -280,7 +280,7 @@ check_is_triangulation() const -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PM_CHECKER_H diff --git a/Nef_2/include/CGAL/Nef_2/PM_const_decorator.h b/Nef_2/include/CGAL/Nef_2/PM_const_decorator.h index ea95eeecedb4..823b3a95cf37 100644 --- a/Nef_2/include/CGAL/Nef_2/PM_const_decorator.h +++ b/Nef_2/include/CGAL/Nef_2/PM_const_decorator.h @@ -31,7 +31,7 @@ #define CGAL_NEF_DEBUG 7 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template inline CGAL::Circulator_tag @@ -584,5 +584,5 @@ void print_as_leda_graph(std::ostream& os, const PMCDEC& D, -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PM_CONST_DECORATOR_H diff --git a/Nef_2/include/CGAL/Nef_2/PM_decorator.h b/Nef_2/include/CGAL/Nef_2/PM_decorator.h index 9b6e1ffe7344..6cb605a5b26a 100644 --- a/Nef_2/include/CGAL/Nef_2/PM_decorator.h +++ b/Nef_2/include/CGAL/Nef_2/PM_decorator.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*{\Moptions outfile=PMDecorator.man }*/ /*{\Msubst @@ -902,6 +902,6 @@ clone_skeleton(const HDS& H, const LINKDA& L) const } } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_PM_DECORATOR_H diff --git a/Nef_2/include/CGAL/Nef_2/PM_explorer.h b/Nef_2/include/CGAL/Nef_2/PM_explorer.h index 8252214fd7a8..992cb615e77a 100644 --- a/Nef_2/include/CGAL/Nef_2/PM_explorer.h +++ b/Nef_2/include/CGAL/Nef_2/PM_explorer.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*{\Moptions print_title=yes }*/ /*{\Moptions outfile=Explorer.man }*/ @@ -138,6 +138,6 @@ bool is_frame_edge(Halfedge_const_handle e) const -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PM_EXPLORER_H diff --git a/Nef_2/include/CGAL/Nef_2/PM_io_parser.h b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h index 774177480427..81316c6ad9e9 100644 --- a/Nef_2/include/CGAL/Nef_2/PM_io_parser.h +++ b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*{\Moptions outfile=PM_io_parser.man }*/ /*{\Manpage {PM_io_parser}{PMDEC}{IO of plane maps}{IO}}*/ @@ -398,5 +398,5 @@ void PM_io_parser::dump(const PMDEC& D, std::ostream& os) -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_PM_IO_PARSER_H diff --git a/Nef_2/include/CGAL/Nef_2/PM_overlayer.h b/Nef_2/include/CGAL/Nef_2/PM_overlayer.h index aac712680270..92511895d0b0 100644 --- a/Nef_2/include/CGAL/Nef_2/PM_overlayer.h +++ b/Nef_2/include/CGAL/Nef_2/PM_overlayer.h @@ -33,7 +33,7 @@ #define LEDA_MEMORY(t) #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct PMO_from_segs { @@ -881,5 +881,5 @@ void assert_type_precondition() const -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PM_OVERLAYER_H diff --git a/Nef_2/include/CGAL/Nef_2/PM_point_locator.h b/Nef_2/include/CGAL/Nef_2/PM_point_locator.h index cfa06e103eb1..50c2d26105b8 100644 --- a/Nef_2/include/CGAL/Nef_2/PM_point_locator.h +++ b/Nef_2/include/CGAL/Nef_2/PM_point_locator.h @@ -38,7 +38,7 @@ # endif #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { enum object_kind { VERTEX, EDGE_CROSSING, EDGE_COLLINEAR }; @@ -997,6 +997,6 @@ PM_point_locator::walk_in_triangulation(const Point& q) const return Object_handle(); // never reached warning acceptable } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PM_POINT_LOCATOR_H diff --git a/Nef_2/include/CGAL/Nef_2/Polynomial.h b/Nef_2/include/CGAL/Nef_2/Polynomial.h index c8887e4e3086..5b974e9ec28c 100644 --- a/Nef_2/include/CGAL/Nef_2/Polynomial.h +++ b/Nef_2/include/CGAL/Nef_2/Polynomial.h @@ -36,7 +36,7 @@ -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Nef { @@ -1969,7 +1969,7 @@ using Nef::is_finite; using Nef::is_valid; using Nef::gcd; -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Nef_2/include/CGAL/Nef_2/iterator_tools.h b/Nef_2/include/CGAL/Nef_2/iterator_tools.h index 75c1e1394869..24d57a8bf582 100644 --- a/Nef_2/include/CGAL/Nef_2/iterator_tools.h +++ b/Nef_2/include/CGAL/Nef_2/iterator_tools.h @@ -22,7 +22,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class CircFromIt : public Iter { @@ -106,5 +106,5 @@ template std::string PH(H h) { if (h == H()) return "nil"; return h->debug(); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ITERATORTOOLS_H diff --git a/Nef_2/include/CGAL/Nef_polyhedron_2.h b/Nef_2/include/CGAL/Nef_polyhedron_2.h index ad936c44d25c..ddac18af1143 100644 --- a/Nef_2/include/CGAL/Nef_polyhedron_2.h +++ b/Nef_2/include/CGAL/Nef_polyhedron_2.h @@ -47,7 +47,7 @@ #define CGAL_NEF_DEBUG 11 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Nef_polyhedron_2; template class Nef_polyhedron_2_rep; @@ -1109,7 +1109,7 @@ std::istream& operator>> -CGAL_END_NAMESPACE +} //namespace CGAL #if defined(BOOST_MSVC) # pragma warning(pop) diff --git a/Nef_2/include/CGAL/Nef_polynomial.h b/Nef_2/include/CGAL/Nef_polynomial.h index cac5fe6e2ce1..fd43535294e5 100644 --- a/Nef_2/include/CGAL/Nef_polynomial.h +++ b/Nef_2/include/CGAL/Nef_polynomial.h @@ -38,7 +38,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define CGAL_int(T) typename First_if_different::Type #define CGAL_double(T) typename First_if_different::Type @@ -286,6 +286,6 @@ class Fraction_traits > { }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_POLYNOMIAL_H diff --git a/Nef_2/include/CGAL/Nef_polynomial_fwd.h b/Nef_2/include/CGAL/Nef_polynomial_fwd.h index 54308f154602..8c600fdcbc25 100644 --- a/Nef_2/include/CGAL/Nef_polynomial_fwd.h +++ b/Nef_2/include/CGAL/Nef_polynomial_fwd.h @@ -23,7 +23,7 @@ // Forward declarations of functions over Polynomial and Nef_polynomial -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Nef { template class Polynomial; @@ -48,6 +48,6 @@ Polynomial gcd(const Polynomial &, const Polynomial &); template class Nef_polynomial; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_POLYNOMIAL_FWD_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/Decomposition_mark.h b/Nef_3/Minkowski/include/CGAL/Nef_3/Decomposition_mark.h index 6a8222cd8a80..f6a1382e4028 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/Decomposition_mark.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/Decomposition_mark.h @@ -19,7 +19,7 @@ #ifndef CGAL_DECOMPOSITION_MARK_H #define CGAL_DECOMPOSITION_MARK_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Decomposition_mark { @@ -63,5 +63,5 @@ std::istream& operator>>(std::istream& in, Decomposition_mark& m) { return in; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_DECOMPOSITION_MARK_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/Edge_sorter.h b/Nef_3/Minkowski/include/CGAL/Nef_3/Edge_sorter.h index 74cf08dd6f84..16a9be5b04b0 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/Edge_sorter.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/Edge_sorter.h @@ -9,7 +9,7 @@ #define CGAL_NEF_DEBUG 547 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -214,5 +214,5 @@ class Edge_sorter : public Modifier_base { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEF3_EDGE_SORTER_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/Edge_sorter2.h b/Nef_3/Minkowski/include/CGAL/Nef_3/Edge_sorter2.h index 207afbe1aea4..52ba8abf2c67 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/Edge_sorter2.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/Edge_sorter2.h @@ -6,7 +6,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Edge_sorter2 : public Modifier_base { @@ -132,5 +132,5 @@ class Edge_sorter2 : public Modifier_base { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEF3_EDGE_SORTER2_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/External_structure_builder.h b/Nef_3/Minkowski/include/CGAL/Nef_3/External_structure_builder.h index 7c06091dc686..9fa92b15841d 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/External_structure_builder.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/External_structure_builder.h @@ -10,7 +10,7 @@ #define CGAL_NEF_DEBUG 43 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class External_structure_builder : public Modifier_base { @@ -122,5 +122,5 @@ class External_structure_builder : public Modifier_base #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Nary_union_by_pq { @@ -48,5 +48,5 @@ class Nary_union_by_pq { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_NARY_UNION_BY_PQ_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/Nary_union_by_queue.h b/Nef_3/Minkowski/include/CGAL/Nef_3/Nary_union_by_queue.h index 6d9710ca3c03..78cd7a69a889 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/Nary_union_by_queue.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/Nary_union_by_queue.h @@ -4,7 +4,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Nary_union_by_queue { @@ -37,5 +37,5 @@ class Nary_union_by_queue { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_NARY_UNION_BY_QUEUE_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/Nary_union_by_small_queue.h b/Nef_3/Minkowski/include/CGAL/Nef_3/Nary_union_by_small_queue.h index 9e1f340b3ee8..b414803397e8 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/Nary_union_by_small_queue.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/Nary_union_by_small_queue.h @@ -6,7 +6,7 @@ #endif #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Nary_union_by_small_queue { @@ -54,5 +54,5 @@ class Nary_union_by_small_queue { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_NARY_UNION_BY_SMALL_QUEUE_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/Nary_union_by_summup.h b/Nef_3/Minkowski/include/CGAL/Nef_3/Nary_union_by_summup.h index ceb6b113b969..d8c9deb880bc 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/Nary_union_by_summup.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/Nary_union_by_summup.h @@ -4,7 +4,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Nary_union_by_summup { @@ -21,5 +21,5 @@ class Nary_union_by_summup { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_NARY_UNION_BY_SUMMUP_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/Nary_union_strategy.h b/Nef_3/Minkowski/include/CGAL/Nef_3/Nary_union_strategy.h index 148e69915b54..f3db54f86ac0 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/Nary_union_strategy.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/Nary_union_strategy.h @@ -1,7 +1,7 @@ #ifndef CGAL_NEF_NARY_UNION_STRATEGY_H #define CGAL_NEF_NARY_UNION_STRATEGY_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Nary_union_strategy { @@ -10,5 +10,5 @@ class Nary_union_strategy { Polyhedron get_union() = 0; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_NARY_UNION_STRATEGY_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/Nary_union_using_distinct_uniter.h b/Nef_3/Minkowski/include/CGAL/Nef_3/Nary_union_using_distinct_uniter.h index f684970c1a3c..c0f93c2f6e4d 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/Nary_union_using_distinct_uniter.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/Nary_union_using_distinct_uniter.h @@ -6,7 +6,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Nary_union_using_distinct_uniter { @@ -123,5 +123,5 @@ class Nary_union_using_distinct_uniter { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_NARY_UNION_USING_DISTINCT_UNITER_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/Ray_hit_generator.h b/Nef_3/Minkowski/include/CGAL/Nef_3/Ray_hit_generator.h index b45169b39b62..2c54ee83c987 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/Ray_hit_generator.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/Ray_hit_generator.h @@ -9,7 +9,7 @@ #define CGAL_NEF_DEBUG 233 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Ray_hit_generator : public Modifier_base { @@ -158,5 +158,5 @@ class Ray_hit_generator : public Modifier_base { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEF3_RAY_HIT_GENERATOR_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/Ray_hit_generator2.h b/Nef_3/Minkowski/include/CGAL/Nef_3/Ray_hit_generator2.h index ea2b03935ebd..8ae256292a9f 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/Ray_hit_generator2.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/Ray_hit_generator2.h @@ -9,7 +9,7 @@ #define CGAL_NEF_DEBUG 233 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Ray_hit_generator2 : public Modifier_base { @@ -191,5 +191,5 @@ class Ray_hit_generator2 : public Modifier_base { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEF3_RAY_HIT_GENERATOR2_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/Ray_shooter.h b/Nef_3/Minkowski/include/CGAL/Nef_3/Ray_shooter.h index 2723fd6957a7..4b88c13d98a6 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/Ray_shooter.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/Ray_shooter.h @@ -5,7 +5,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Ray_shooter : @@ -26,5 +26,5 @@ public Modifier_base > { }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF3_DELEGATED_RAY_SHOOTER_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/Reflex_edge_searcher.h b/Nef_3/Minkowski/include/CGAL/Nef_3/Reflex_edge_searcher.h index 4e9e9ed92dad..d2b26eae4c17 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/Reflex_edge_searcher.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/Reflex_edge_searcher.h @@ -4,7 +4,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Reflex_edge_searcher : public Modifier_base { @@ -137,5 +137,5 @@ class Reflex_edge_searcher : public Modifier_base Reflex_sedge_iterator negative_redges_end() { return neg.end(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF3_REFLEX_EDGE_SEARCHER_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/Relabel_volume.h b/Nef_3/Minkowski/include/CGAL/Nef_3/Relabel_volume.h index e46a217e51f1..90a66596ded0 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/Relabel_volume.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/Relabel_volume.h @@ -19,7 +19,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /* template @@ -78,5 +78,5 @@ class Relabel_volume : public Modifier_base { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF3_RELABEL_VOLUME_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/SFace_separator.h b/Nef_3/Minkowski/include/CGAL/Nef_3/SFace_separator.h index dfa0685a15ae..8f54057d2ed8 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/SFace_separator.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/SFace_separator.h @@ -5,7 +5,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SFace_separator : public Modifier_base { @@ -66,5 +66,5 @@ class SFace_separator : public Modifier_base { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEF3_SFACE_SEPARATOR_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/SNC_walls.h b/Nef_3/Minkowski/include/CGAL/Nef_3/SNC_walls.h index b54a041cd526..3965605a08db 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/SNC_walls.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/SNC_walls.h @@ -5,7 +5,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SNC_walls : public SNC_decorator { @@ -191,5 +191,5 @@ class SNC_walls : public SNC_decorator { }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SNC_WALLS_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/Single_wall_creator.h b/Nef_3/Minkowski/include/CGAL/Nef_3/Single_wall_creator.h index 68b3a7576fe6..00470afc144d 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/Single_wall_creator.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/Single_wall_creator.h @@ -9,7 +9,7 @@ #define CGAL_NEF_DEBUG 229 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Single_wall_creator : public Modifier_base { @@ -351,5 +351,5 @@ class Single_wall_creator : public Modifier_base { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEF3_SINGLE_WALL_CREATOR_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/Single_wall_creator2.h b/Nef_3/Minkowski/include/CGAL/Nef_3/Single_wall_creator2.h index d01b73f2c16b..7f6c317150f7 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/Single_wall_creator2.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/Single_wall_creator2.h @@ -10,7 +10,7 @@ #define CGAL_NEF_DEBUG 229 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Single_wall_creator2 : public Modifier_base { @@ -176,5 +176,5 @@ class Single_wall_creator2 : public Modifier_base { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEF3_SINGLE_WALL_CREATOR2_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/Single_wall_creator3.h b/Nef_3/Minkowski/include/CGAL/Nef_3/Single_wall_creator3.h index 2c605bec4ff1..b4c16bf007ea 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/Single_wall_creator3.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/Single_wall_creator3.h @@ -10,7 +10,7 @@ #define CGAL_NEF_DEBUG 229 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Single_wall_creator3 : public Modifier_base { @@ -186,5 +186,5 @@ class Single_wall_creator3 : public Modifier_base { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEF3_SINGLE_WALL_CREATOR3_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/YVertical_wall_builder.h b/Nef_3/Minkowski/include/CGAL/Nef_3/YVertical_wall_builder.h index 6b829b28dc72..fc49a1285258 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/YVertical_wall_builder.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/YVertical_wall_builder.h @@ -4,7 +4,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class YVertical_wall_builder : public Modifier_base { @@ -137,5 +137,5 @@ class YVertical_wall_builder : public Modifier_base #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class YVertical_wall_builder2 : public Modifier_base { @@ -95,5 +95,5 @@ class YVertical_wall_builder2 : public Modifier_base Vertical_redge_iterator redges_end() { return redges.end(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF3_YVERTICAL_WALL_BUILDER2_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/bipartite_nary_union_sequential.h b/Nef_3/Minkowski/include/CGAL/Nef_3/bipartite_nary_union_sequential.h index aed6de59353d..76ea99109f07 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/bipartite_nary_union_sequential.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/bipartite_nary_union_sequential.h @@ -18,7 +18,7 @@ #include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { template Nef_polyhedron @@ -98,5 +98,5 @@ bipartite_nary_union_sequential(Nef_polyhedron& N0, return result; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_BIPARTITE_NARY_UNION_SEQUENTIAL_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/bipartite_nary_union_sorted_combined.h b/Nef_3/Minkowski/include/CGAL/Nef_3/bipartite_nary_union_sorted_combined.h index d53a9c09b4c2..86f6574dbf40 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/bipartite_nary_union_sorted_combined.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/bipartite_nary_union_sorted_combined.h @@ -15,7 +15,7 @@ #include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { #ifdef CGAL_NEF_NARY_UNION_L1_SORT template @@ -161,5 +161,5 @@ bipartite_nary_union_sorted_combined(Nef_polyhedron& N0, return result; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_BIPARTITE_NARY_UNION_SORTED_COMBINED_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/bipartite_nary_union_sorted_separately.h b/Nef_3/Minkowski/include/CGAL/Nef_3/bipartite_nary_union_sorted_separately.h index d2d53a9a4b52..d63f28ca1796 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/bipartite_nary_union_sorted_separately.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/bipartite_nary_union_sorted_separately.h @@ -18,7 +18,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Sort_volumes_by_smallest_vertex { @@ -131,5 +131,5 @@ bipartite_nary_union_sorted_separately(Nef_polyhedron& N0, return result; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_BIPARTITE_NARY_UNION_SORTED_SEPARATELY_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/is_reflex_sedge.h b/Nef_3/Minkowski/include/CGAL/Nef_3/is_reflex_sedge.h index 29b013cb426e..62dc5918348e 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/is_reflex_sedge.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/is_reflex_sedge.h @@ -5,7 +5,7 @@ #define CGAL_NEF_DEBUG 239 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /* int is_reflex_edge(Halfedge_handle e) { @@ -152,5 +152,5 @@ int is_reflex_sedge(typename SNC_structure::SHalfedge_handle se, return result; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF3_IS_REFLEX_SEDGE_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/trunk_offset.h b/Nef_3/Minkowski/include/CGAL/Nef_3/trunk_offset.h index a8ec0f7e95ec..3868bd3d6075 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/trunk_offset.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/trunk_offset.h @@ -13,7 +13,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template OutIt fold_indices_polyhedron( const pIt points, InpIt first1, InpIt beyond1, @@ -251,4 +251,4 @@ class Trunk_offset { } }; -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Nef_3/Minkowski/include/CGAL/Nef_3/trunk_offset_brute_force.h b/Nef_3/Minkowski/include/CGAL/Nef_3/trunk_offset_brute_force.h index 745a7aa75e20..efa1f906e774 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_3/trunk_offset_brute_force.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_3/trunk_offset_brute_force.h @@ -14,7 +14,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template OutIt fold_indices_polyhedron( const pIt points, InpIt first1, InpIt beyond1, @@ -115,4 +115,4 @@ class Trunk_offset { } }; -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Nef_3/Minkowski/include/CGAL/Nef_S2/Gaussian_map.h b/Nef_3/Minkowski/include/CGAL/Nef_S2/Gaussian_map.h index 2289802f609b..b21e8bf3d3a3 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_S2/Gaussian_map.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_S2/Gaussian_map.h @@ -16,7 +16,7 @@ #define CGAL_NEF_DEBUG 223 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template > @@ -1246,5 +1246,5 @@ std::ostream& operator<<(std::ostream& out, const CGAL::Gaussian_map& G) return out; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_GAUSSIAN_MAP diff --git a/Nef_3/Minkowski/include/CGAL/Nef_S2/PointMark.h b/Nef_3/Minkowski/include/CGAL/Nef_S2/PointMark.h index 1392681dae63..6979b8a6b7d4 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_S2/PointMark.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_S2/PointMark.h @@ -1,7 +1,7 @@ #ifndef CGAL_POINTMARK_H #define CGAL_POINTMARK_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class PointMark { @@ -65,5 +65,5 @@ const PointMark operator+(const PointMark& pm1, return ret; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Nef_3/Minkowski/include/CGAL/Nef_S2/PointMarkBoundary.h b/Nef_3/Minkowski/include/CGAL/Nef_S2/PointMarkBoundary.h index f86e448016fa..db965456fe6b 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_S2/PointMarkBoundary.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_S2/PointMarkBoundary.h @@ -1,7 +1,7 @@ #ifndef CGAL_POINT_MARK_BOUNDARY_H #define CGAL_POINT_MARK_BOUNDARY_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class PointMarkBoundary { @@ -78,5 +78,5 @@ const PointMark operator+(const PointMark& pm1, return ret; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Nef_3/Minkowski/include/CGAL/Nef_S2/SM_walls.h b/Nef_3/Minkowski/include/CGAL/Nef_S2/SM_walls.h index aa3d8e872ce0..706043633868 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_S2/SM_walls.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_S2/SM_walls.h @@ -5,7 +5,7 @@ #define CGAL_NEF_DEBUG 227 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SM_walls : SM_decorator { @@ -561,5 +561,5 @@ class SM_walls : SM_decorator { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SM_WALLS_H diff --git a/Nef_3/Minkowski/include/CGAL/Nef_S2/gaussian_map_to_nef_3.h b/Nef_3/Minkowski/include/CGAL/Nef_S2/gaussian_map_to_nef_3.h index d244d6ce0161..0ed8e4886536 100644 --- a/Nef_3/Minkowski/include/CGAL/Nef_S2/gaussian_map_to_nef_3.h +++ b/Nef_3/Minkowski/include/CGAL/Nef_S2/gaussian_map_to_nef_3.h @@ -5,7 +5,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class gaussian_map_to_nef_3 : public Modifier_base { @@ -152,5 +152,5 @@ template }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MINKOWSKI_GAUSSIAN_MAP_TO_NEF3_H diff --git a/Nef_3/Visual_hull/Nef_3/visual_hull_creator.h b/Nef_3/Visual_hull/Nef_3/visual_hull_creator.h index fb56b2fecc6c..f83b7a5af3d2 100644 --- a/Nef_3/Visual_hull/Nef_3/visual_hull_creator.h +++ b/Nef_3/Visual_hull/Nef_3/visual_hull_creator.h @@ -10,7 +10,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class visual_hull_creator : public CGAL::Modifier_base { @@ -252,5 +252,5 @@ class visual_hull_creator : public CGAL::Modifier_base { */ }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_VISUAL_HULL_CREATOR_H diff --git a/Nef_3/demo/Nef_3/include/CGAL/Nef_3/demo_stack.h b/Nef_3/demo/Nef_3/include/CGAL/Nef_3/demo_stack.h index 412062817012..00372d4f0589 100644 --- a/Nef_3/demo/Nef_3/include/CGAL/Nef_3/demo_stack.h +++ b/Nef_3/demo/Nef_3/include/CGAL/Nef_3/demo_stack.h @@ -52,7 +52,7 @@ using std::endl; using std::strcmp; using std::exit; -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class demo_stack { @@ -595,6 +595,6 @@ class demo_stack { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_DEMO_STACK_H diff --git a/Nef_3/demo/Nef_3/include/CGAL/Nef_3/visual_hull_creator.h b/Nef_3/demo/Nef_3/include/CGAL/Nef_3/visual_hull_creator.h index d5dd708a08cc..8e870b6f6fc0 100644 --- a/Nef_3/demo/Nef_3/include/CGAL/Nef_3/visual_hull_creator.h +++ b/Nef_3/demo/Nef_3/include/CGAL/Nef_3/visual_hull_creator.h @@ -8,7 +8,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class visual_hull_creator : public CGAL::Modifier_base { @@ -291,5 +291,5 @@ class visual_hull_creator : public CGAL::Modifier_base { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_VISUAL_HULL_CREATOR_H diff --git a/Nef_3/include/CGAL/IO/Nef_polyhedron_iostream_3.h b/Nef_3/include/CGAL/IO/Nef_polyhedron_iostream_3.h index ca96ec047e56..dd0f1fdf9dbb 100644 --- a/Nef_3/include/CGAL/IO/Nef_polyhedron_iostream_3.h +++ b/Nef_3/include/CGAL/IO/Nef_polyhedron_iostream_3.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template std::ostream& operator<< @@ -50,6 +50,6 @@ std::istream& operator>> return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEF_POLYHEDRON_IOSTREAM_3_H diff --git a/Nef_3/include/CGAL/IO/Qt_widget_Nef_3.h b/Nef_3/include/CGAL/IO/Qt_widget_Nef_3.h index 8cccd398da90..a77d69777697 100644 --- a/Nef_3/include/CGAL/IO/Qt_widget_Nef_3.h +++ b/Nef_3/include/CGAL/IO/Qt_widget_Nef_3.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Qt_widget_Nef_3 : public Qt_widget_OpenGL { @@ -69,5 +69,5 @@ class Qt_widget_Nef_3 : public Qt_widget_OpenGL { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_QT_WIDGET_NEF_3_H diff --git a/Nef_3/include/CGAL/Nef_3/Binary_operation.h b/Nef_3/include/CGAL/Nef_3/Binary_operation.h index 1a4fb22ba1a3..fc3ff70f76bb 100644 --- a/Nef_3/include/CGAL/Nef_3/Binary_operation.h +++ b/Nef_3/include/CGAL/Nef_3/Binary_operation.h @@ -41,7 +41,7 @@ #define CGAL_NEF_DEBUG 19 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #if defined (CGAL_NEF3_TIMER_OVERLAY) || defined(CGAL_NEF3_TIMER_INTERSECTION) CGAL::Timer timer_overlay; @@ -656,5 +656,5 @@ class Binary_operation : public CGAL::SNC_decorator { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEF_BINARY_OPERATION_H diff --git a/Nef_3/include/CGAL/Nef_3/Bounding_box_3.h b/Nef_3/include/CGAL/Nef_3/Bounding_box_3.h index b3e3e24e5d6f..7e2d64a9e221 100644 --- a/Nef_3/include/CGAL/Nef_3/Bounding_box_3.h +++ b/Nef_3/include/CGAL/Nef_3/Bounding_box_3.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Bounding_box_3; @@ -92,5 +92,5 @@ public Box_intersection_d::Box_d { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_BOUNDING_BOX_3_H diff --git a/Nef_3/include/CGAL/Nef_3/Combine_with_halfspace.h b/Nef_3/include/CGAL/Nef_3/Combine_with_halfspace.h index 8aff2612bcf9..d46cfa6c1ea5 100644 --- a/Nef_3/include/CGAL/Nef_3/Combine_with_halfspace.h +++ b/Nef_3/include/CGAL/Nef_3/Combine_with_halfspace.h @@ -36,7 +36,7 @@ #define CGAL_NEF_DEBUG 19 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Combine_with_halfspace : public SNC_decorator { @@ -168,5 +168,5 @@ class Combine_with_halfspace : public SNC_decorator { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_COMBINE_WITH_HALFSPACE_H diff --git a/Nef_3/include/CGAL/Nef_3/Default_items.h b/Nef_3/include/CGAL/Nef_3/Default_items.h index b823e8bfac0f..33bd1d423086 100644 --- a/Nef_3/include/CGAL/Nef_3/Default_items.h +++ b/Nef_3/include/CGAL/Nef_3/Default_items.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Default_items { @@ -40,5 +40,5 @@ struct Default_items > { typedef CGAL::SNC_items Items; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Nef_3/include/CGAL/Nef_3/Edge_edge_overlay.h b/Nef_3/include/CGAL/Nef_3/Edge_edge_overlay.h index 4f9f209f8d65..99182f004379 100644 --- a/Nef_3/include/CGAL/Nef_3/Edge_edge_overlay.h +++ b/Nef_3/include/CGAL/Nef_3/Edge_edge_overlay.h @@ -29,7 +29,7 @@ #define CGAL_NEF_DEBUG 71 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Edge_edge_overlay @@ -1027,5 +1027,5 @@ class Edge_edge_overlay }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_EDGE_EDGE_OVERLAY_H diff --git a/Nef_3/include/CGAL/Nef_3/Exact_triangulation_euclidean_traits_xy_3.h b/Nef_3/include/CGAL/Nef_3/Exact_triangulation_euclidean_traits_xy_3.h index c6f77330d1ff..61733df7442a 100644 --- a/Nef_3/include/CGAL/Nef_3/Exact_triangulation_euclidean_traits_xy_3.h +++ b/Nef_3/include/CGAL/Nef_3/Exact_triangulation_euclidean_traits_xy_3.h @@ -19,7 +19,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Homogeneous_tag; class Cartesian_tag; @@ -141,5 +141,5 @@ struct Exact_triangulation_euclidean_traits_xy_3 { return Intersect_2(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF3_EXACT_TRIANGULATION_EUCLIDEAN_TRAITS_XY_3_H diff --git a/Nef_3/include/CGAL/Nef_3/Exact_triangulation_euclidean_traits_xz_3.h b/Nef_3/include/CGAL/Nef_3/Exact_triangulation_euclidean_traits_xz_3.h index 959ecc1edf80..55a999165907 100644 --- a/Nef_3/include/CGAL/Nef_3/Exact_triangulation_euclidean_traits_xz_3.h +++ b/Nef_3/include/CGAL/Nef_3/Exact_triangulation_euclidean_traits_xz_3.h @@ -19,7 +19,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Homogeneous_tag; class Cartesian_tag; @@ -141,5 +141,5 @@ struct Exact_triangulation_euclidean_traits_xz_3 { return Intersect_2(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF3_EXACT_TRIANGULATION_EUCLIDEAN_TRAITS_XZ_3_H diff --git a/Nef_3/include/CGAL/Nef_3/Exact_triangulation_euclidean_traits_yz_3.h b/Nef_3/include/CGAL/Nef_3/Exact_triangulation_euclidean_traits_yz_3.h index 03334e1cb9cc..f7707b53025a 100644 --- a/Nef_3/include/CGAL/Nef_3/Exact_triangulation_euclidean_traits_yz_3.h +++ b/Nef_3/include/CGAL/Nef_3/Exact_triangulation_euclidean_traits_yz_3.h @@ -19,7 +19,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Homogeneous_tag; class Cartesian_tag; @@ -141,5 +141,5 @@ struct Exact_triangulation_euclidean_traits_yz_3 { return Intersect_2(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF3_EXACT_TRIANGULATION_EUCLIDEAN_TRAITS_YZ_3_H diff --git a/Nef_3/include/CGAL/Nef_3/Halfedge.h b/Nef_3/include/CGAL/Nef_3/Halfedge.h index 69e63d6e72bb..cd6e15d15630 100644 --- a/Nef_3/include/CGAL/Nef_3/Halfedge.h +++ b/Nef_3/include/CGAL/Nef_3/Halfedge.h @@ -32,7 +32,7 @@ #define CGAL_NEF_DEBUG 83 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Halfedge_base @@ -160,5 +160,5 @@ class Halfedge_base }; // Halfedge_base -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEF_HALFEDGE_H diff --git a/Nef_3/include/CGAL/Nef_3/Halffacet.h b/Nef_3/include/CGAL/Nef_3/Halffacet.h index 0716fd8d45f2..fde706f2d764 100644 --- a/Nef_3/include/CGAL/Nef_3/Halffacet.h +++ b/Nef_3/include/CGAL/Nef_3/Halffacet.h @@ -32,7 +32,7 @@ #define CGAL_NEF_DEBUG 83 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Halffacet_base { @@ -135,5 +135,5 @@ class Halffacet_base { }; // Halffacet_base -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEF_HALFFACET_H diff --git a/Nef_3/include/CGAL/Nef_3/ID_support_handler.h b/Nef_3/include/CGAL/Nef_3/ID_support_handler.h index 0b1862455a02..426218d9dcb1 100644 --- a/Nef_3/include/CGAL/Nef_3/ID_support_handler.h +++ b/Nef_3/include/CGAL/Nef_3/ID_support_handler.h @@ -28,7 +28,7 @@ #define CGAL_NEF_DEBUG 131 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class ID_support_handler { @@ -424,5 +424,5 @@ class ID_support_handler { }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ID_SUPPORT_HANDLER diff --git a/Nef_3/include/CGAL/Nef_3/Infimaximal_box.h b/Nef_3/include/CGAL/Nef_3/Infimaximal_box.h index ff10e1053282..286894de0bbc 100644 --- a/Nef_3/include/CGAL/Nef_3/Infimaximal_box.h +++ b/Nef_3/include/CGAL/Nef_3/Infimaximal_box.h @@ -29,7 +29,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Infimaximal_box { @@ -1185,5 +1185,5 @@ class Infimaximal_box > { }; */ -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_INFIMAXIMAL_BOX_H diff --git a/Nef_3/include/CGAL/Nef_3/K3_tree.h b/Nef_3/include/CGAL/Nef_3/K3_tree.h index 25f4a5c280a9..80438cdbf1f4 100644 --- a/Nef_3/include/CGAL/Nef_3/K3_tree.h +++ b/Nef_3/include/CGAL/Nef_3/K3_tree.h @@ -45,7 +45,7 @@ #define CGAL_NEF_DEBUG 503 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void sort_triangle_by_lexicographically_smaller_vertex @@ -1294,6 +1294,6 @@ bool is_point_on_cell( const Point_3& p, const Node* target, const Node* current }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_K3_TREE_H diff --git a/Nef_3/include/CGAL/Nef_3/Mark_bounded_volumes.h b/Nef_3/include/CGAL/Nef_3/Mark_bounded_volumes.h index 43951b9cd536..aac24f5c3810 100644 --- a/Nef_3/include/CGAL/Nef_3/Mark_bounded_volumes.h +++ b/Nef_3/include/CGAL/Nef_3/Mark_bounded_volumes.h @@ -18,7 +18,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Volume_setter { @@ -83,5 +83,5 @@ class Mark_bounded_volumes : public Modifier_base } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF3_MARK_BOUNDED_VOLUMES_H diff --git a/Nef_3/include/CGAL/Nef_3/Nef_box.h b/Nef_3/include/CGAL/Nef_3/Nef_box.h index b4e024034ebc..b02da1c56a12 100644 --- a/Nef_3/include/CGAL/Nef_3/Nef_box.h +++ b/Nef_3/include/CGAL/Nef_3/Nef_box.h @@ -21,7 +21,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Nef_box : public Box_intersection_d::Box_d< double, 3 > { @@ -155,6 +155,6 @@ class Nef_box : public Box_intersection_d::Box_d< double, 3 > { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_BOX_H diff --git a/Nef_3/include/CGAL/Nef_3/OGL_helper.h b/Nef_3/include/CGAL/Nef_3/OGL_helper.h index ea3225cb11cf..3b59a105b35e 100644 --- a/Nef_3/include/CGAL/Nef_3/OGL_helper.h +++ b/Nef_3/include/CGAL/Nef_3/OGL_helper.h @@ -51,7 +51,7 @@ #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace OGL { @@ -665,5 +665,5 @@ namespace OGL { } // namespace OGL -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_OPENGL_HELPER_H diff --git a/Nef_3/include/CGAL/Nef_3/Pluecker_line_3.h b/Nef_3/include/CGAL/Nef_3/Pluecker_line_3.h index 1d77d7b9df09..b04f5b1d5f8c 100644 --- a/Nef_3/include/CGAL/Nef_3/Pluecker_line_3.h +++ b/Nef_3/include/CGAL/Nef_3/Pluecker_line_3.h @@ -29,7 +29,7 @@ #define CGAL_NEF_DEBUG 61 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*{\Manpage{Pluecker_line_3}{R}{Straight lines in 3-space}{pl}}*/ @@ -351,5 +351,5 @@ struct Pluecker_line_lt { { return CGAL::Pluecker_line_3::cmp(l1,l2)<0; } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_PLUECKER_LINE_3_H diff --git a/Nef_3/include/CGAL/Nef_3/Polygon_constructor.h b/Nef_3/include/CGAL/Nef_3/Polygon_constructor.h index e1361f805676..866a0ef624ba 100644 --- a/Nef_3/include/CGAL/Nef_3/Polygon_constructor.h +++ b/Nef_3/include/CGAL/Nef_3/Polygon_constructor.h @@ -16,7 +16,7 @@ #ifndef CGAL_NEF_POLYGON_CONSTRUCTOR_H #define CGAL_NEF_POLYGON_CONSTRUCTOR_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Polygon_constructor : public Modifier_base { @@ -101,5 +101,5 @@ class Polygon_constructor : public Modifier_base { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_POLYGON_CONSTRUCTOR_H diff --git a/Nef_3/include/CGAL/Nef_3/Polyline_constructor.h b/Nef_3/include/CGAL/Nef_3/Polyline_constructor.h index 7c91bdaff632..c841ae83dcf1 100644 --- a/Nef_3/include/CGAL/Nef_3/Polyline_constructor.h +++ b/Nef_3/include/CGAL/Nef_3/Polyline_constructor.h @@ -18,7 +18,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Sphere_map_creator { @@ -151,5 +151,5 @@ class Polyline_constructor : public Modifier_base } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_POLYLINE_CONSTRUCTOR_H diff --git a/Nef_3/include/CGAL/Nef_3/SFace.h b/Nef_3/include/CGAL/Nef_3/SFace.h index 08052c39068c..1b042a6169e9 100644 --- a/Nef_3/include/CGAL/Nef_3/SFace.h +++ b/Nef_3/include/CGAL/Nef_3/SFace.h @@ -32,7 +32,7 @@ #define CGAL_NEF_DEBUG 83 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SFace_base { @@ -129,5 +129,5 @@ class SFace_base { }; // SFace_base -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEF_SFACE_H diff --git a/Nef_3/include/CGAL/Nef_3/SHalfedge.h b/Nef_3/include/CGAL/Nef_3/SHalfedge.h index 96f1a29255bd..dc6fe4d62391 100644 --- a/Nef_3/include/CGAL/Nef_3/SHalfedge.h +++ b/Nef_3/include/CGAL/Nef_3/SHalfedge.h @@ -32,7 +32,7 @@ #define CGAL_NEF_DEBUG 83 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SHalfedge_base { @@ -234,5 +234,5 @@ class SHalfedge_base { }; // SHalfedge_base -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEF_SHALFEDGE_H diff --git a/Nef_3/include/CGAL/Nef_3/SHalfloop.h b/Nef_3/include/CGAL/Nef_3/SHalfloop.h index fb94c6ba9a72..02866f2cec3c 100644 --- a/Nef_3/include/CGAL/Nef_3/SHalfloop.h +++ b/Nef_3/include/CGAL/Nef_3/SHalfloop.h @@ -32,7 +32,7 @@ #define CGAL_NEF_DEBUG 83 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SHalfloop_base { @@ -126,5 +126,5 @@ class SHalfloop_base { }; // SHalfloop_base -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEF_SHALFLOOP_H diff --git a/Nef_3/include/CGAL/Nef_3/SM_visualizor.h b/Nef_3/include/CGAL/Nef_3/SM_visualizor.h index 183ad421fde3..a57ddbefbb98 100644 --- a/Nef_3/include/CGAL/Nef_3/SM_visualizor.h +++ b/Nef_3/include/CGAL/Nef_3/SM_visualizor.h @@ -31,7 +31,7 @@ #define CGAL_NEF3_LGREY CGAL::Color(170,170,200) #define CGAL_NEF3_DGREY CGAL::Color(30,30,50) -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SNC_SM_BooleColor @@ -238,5 +238,5 @@ void show_sphere_map_of(typename Sphere_map::Vertex_const_handle v) } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SM_VISUALIZOR_H diff --git a/Nef_3/include/CGAL/Nef_3/SNC_FM_decorator.h b/Nef_3/include/CGAL/Nef_3/SNC_FM_decorator.h index 045554116028..be011a218231 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_FM_decorator.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_FM_decorator.h @@ -29,7 +29,7 @@ #define CGAL_NEF_DEBUG 31 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //-------------------------------------------------------------------------- /* We introduce a template that is a point that refers to a vertex. @@ -645,5 +645,5 @@ create_facet_objects(const Plane_3& plane_supporting_facet, CGAL_NEF_TRACEN("exit FM"); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SNC_FM_DECORATOR_H diff --git a/Nef_3/include/CGAL/Nef_3/SNC_SM_explorer.h b/Nef_3/include/CGAL/Nef_3/SNC_SM_explorer.h index 001c5d27d505..5c532c22bb49 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_SM_explorer.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_SM_explorer.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SNC_SM_explorer : public SMCDEC { @@ -40,6 +40,6 @@ class SNC_SM_explorer : public SMCDEC { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SNC_SM_EXPLORER_H diff --git a/Nef_3/include/CGAL/Nef_3/SNC_SM_overlayer.h b/Nef_3/include/CGAL/Nef_3/SNC_SM_overlayer.h index baa692b74795..92d42c0504d4 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_SM_overlayer.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_SM_overlayer.h @@ -40,7 +40,7 @@ #define LEDA_MEMORY(t) #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*{\Manpage {SNC_SM_overlayer}{Refs_}{Overlay in the sphere}{O}}*/ @@ -473,5 +473,5 @@ class SNC_SM_overlayer }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SNC_SM_OVERLAYER_H diff --git a/Nef_3/include/CGAL/Nef_3/SNC_SM_visualizor.h b/Nef_3/include/CGAL/Nef_3/SNC_SM_visualizor.h index a1a3649271bd..d420e833c6e1 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_SM_visualizor.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_SM_visualizor.h @@ -31,7 +31,7 @@ #define CGAL_NEF_LGREY CGAL::Color(170,170,200) #define CGAL_NEF_DGREY CGAL::Color(30,30,50) -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SNC_SM_BooleColor @@ -216,7 +216,7 @@ void show_sphere_map_of(typename Map_::Vertex_handle v) } -CGAL_END_NAMESPACE +} //namespace CGAL //#undef CGAL_NEF_LGREY //#undef CGAL_NEF_DGREY #endif // CGAL_SNC_SM_VISUALIZOR_H diff --git a/Nef_3/include/CGAL/Nef_3/SNC_const_decorator.h b/Nef_3/include/CGAL/Nef_3/SNC_const_decorator.h index 33d06f4aa593..9a1732a3d710 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_const_decorator.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_const_decorator.h @@ -35,7 +35,7 @@ #define CGAL_NEF_DEBUG 191 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SM_const_decorator; @@ -652,5 +652,5 @@ visit_shell_objects(SFace_const_handle f, Visitor& V) const } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SNC_CONST_DECORATOR_H diff --git a/Nef_3/include/CGAL/Nef_3/SNC_constructor.h b/Nef_3/include/CGAL/Nef_3/SNC_constructor.h index 583ab7262650..630214abe5dc 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_constructor.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_constructor.h @@ -43,7 +43,7 @@ #define CGAL_NEF_DEBUG 43 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Frame_point_lt { @@ -2158,5 +2158,5 @@ class SNC_constructor }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SNC_CONSTRUCTOR_H diff --git a/Nef_3/include/CGAL/Nef_3/SNC_decorator.h b/Nef_3/include/CGAL/Nef_3/SNC_decorator.h index 53d3a44db203..b0f14e5e618a 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_decorator.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_decorator.h @@ -39,7 +39,7 @@ #define CGAL_NEF_DEBUG 19 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SNC_decorator : public SNC_const_decorator { @@ -988,5 +988,5 @@ visit_shell_objects(SFace_handle f, Visitor& V) const -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SNC_DECORATOR_H diff --git a/Nef_3/include/CGAL/Nef_3/SNC_decorator_traits.h b/Nef_3/include/CGAL/Nef_3/SNC_decorator_traits.h index 7be50f010b35..4efa7cb56cd4 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_decorator_traits.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_decorator_traits.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SNC_decorator_traits : public CGAL::SM_decorator_traits { @@ -103,5 +103,5 @@ class SNC_decorator_const_traits { typedef typename Refs::Shell_entry_const_iterator Shell_entry_iterator; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF3_SNC_DECORATOR_TRAITS_H diff --git a/Nef_3/include/CGAL/Nef_3/SNC_external_structure.h b/Nef_3/include/CGAL/Nef_3/SNC_external_structure.h index b3017e34b6eb..b63b6f0546d5 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_external_structure.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_external_structure.h @@ -39,7 +39,7 @@ #define CGAL_NEF_DEBUG 43 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { struct int_lt { bool operator()(const int& i1, const int& i2) const { return i1 } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SNC_EXTERNAL_STRUCTURE_H diff --git a/Nef_3/include/CGAL/Nef_3/SNC_indexed_items.h b/Nef_3/include/CGAL/Nef_3/SNC_indexed_items.h index 6e661517dbab..a6b1ca908c47 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_indexed_items.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_indexed_items.h @@ -31,7 +31,7 @@ #define CGAL_NEF_DEBUG 83 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Index_generator { @@ -188,5 +188,5 @@ class SNC_indexed_items { }; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_SNC_INDEXED_ITEMS_H diff --git a/Nef_3/include/CGAL/Nef_3/SNC_intersection.h b/Nef_3/include/CGAL/Nef_3/SNC_intersection.h index ccb1d5f10feb..a82eced47472 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_intersection.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_intersection.h @@ -26,7 +26,7 @@ #define CGAL_NEF_DEBUG 37 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Node, class Object> struct Project_shalfedge_point { @@ -499,6 +499,6 @@ class SNC_intersection : public SNC_const_decorator { #endif }; // SNC_intersection -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SNC_INTERSECTION_H diff --git a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h index c97d9ca564b0..1955c24e63d1 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h @@ -38,7 +38,7 @@ #define CGAL_NEF_DEBUG 293 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class moreLeft : public T { @@ -2040,5 +2040,5 @@ void SNC_io_parser::add_infi_box() { } } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SNC_IO_PARSER_H diff --git a/Nef_3/include/CGAL/Nef_3/SNC_items.h b/Nef_3/include/CGAL/Nef_3/SNC_items.h index 91677f034478..dcf06886b3fb 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_items.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_items.h @@ -34,7 +34,7 @@ #define CGAL_NEF_DEBUG 83 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SNC_sphere_map; template class SM_decorator; @@ -52,5 +52,5 @@ class SNC_items { -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SNC_ITEMS_H diff --git a/Nef_3/include/CGAL/Nef_3/SNC_k3_tree_traits.h b/Nef_3/include/CGAL/Nef_3/SNC_k3_tree_traits.h index 7d682ee57358..7c811c3b625d 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_k3_tree_traits.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_k3_tree_traits.h @@ -28,7 +28,7 @@ #define CGAL_NEF_DEBUG 503 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -628,6 +628,6 @@ Side_of_plane::operator() //#endif } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_SNC_K3_TREE_TRAITS_H diff --git a/Nef_3/include/CGAL/Nef_3/SNC_list.h b/Nef_3/include/CGAL/Nef_3/SNC_list.h index 87c8ae6f1e25..9e45342747db 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_list.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_list.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Sphere_map> class SNC_in_place_list_sm @@ -767,6 +767,6 @@ pointer_update(const SNC_list& D) } } */ -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SNC_LIST_H diff --git a/Nef_3/include/CGAL/Nef_3/SNC_point_locator.h b/Nef_3/include/CGAL/Nef_3/SNC_point_locator.h index 38690a6b1e93..25119c2178d6 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_point_locator.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_point_locator.h @@ -59,7 +59,7 @@ // #define CGAL_NEF_CLOG(t) std::clog <<" "< class SNC_point_locator @@ -1384,5 +1384,5 @@ class SNC_point_locator_naive : }; #endif -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_SNC_POINT_LOCATOR_H diff --git a/Nef_3/include/CGAL/Nef_3/SNC_ray_shooter.h b/Nef_3/include/CGAL/Nef_3/SNC_ray_shooter.h index 88bccfab673a..44755a1c4110 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_ray_shooter.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_ray_shooter.h @@ -41,7 +41,7 @@ #define CGAL_NEF_DEBUG 37 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ---------------------------------------------------------------------------- // SNC_ray_shooting @@ -219,6 +219,6 @@ class SNC_ray_shooter : public SNC_decorator }; // SNC_ray_shooter -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SNC_RAY_SHOOTER_H diff --git a/Nef_3/include/CGAL/Nef_3/SNC_simplify.h b/Nef_3/include/CGAL/Nef_3/SNC_simplify.h index 8960720bfbd8..9cfbf8ae5f25 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_simplify.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_simplify.h @@ -29,7 +29,7 @@ #define CGAL_NEF_DEBUG 41 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SNC_simplify_base : public SNC_decorator { @@ -749,5 +749,5 @@ class SNC_simplify } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SNC_STRUCTURE_H diff --git a/Nef_3/include/CGAL/Nef_3/SNC_sphere_map.h b/Nef_3/include/CGAL/Nef_3/SNC_sphere_map.h index b5435df2993e..9faf4403a841 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_sphere_map.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_sphere_map.h @@ -35,7 +35,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SNC_structure; @@ -438,6 +438,6 @@ class SNC_sphere_map : public Items_::template Vertex #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct move_shalfedge_around_facet { @@ -1493,5 +1493,5 @@ pointer_update(const SNC_structure& D) } } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SNC_STRUCTURE_H diff --git a/Nef_3/include/CGAL/Nef_3/Shell_constructor.h b/Nef_3/include/CGAL/Nef_3/Shell_constructor.h index 14641c737a8f..56cc982a8fd8 100644 --- a/Nef_3/include/CGAL/Nef_3/Shell_constructor.h +++ b/Nef_3/include/CGAL/Nef_3/Shell_constructor.h @@ -16,7 +16,7 @@ #ifndef CGAL_NEF_SHELL_CONSTRUCTOR_H #define CGAL_NEF_SHELL_CONSTRUCTOR_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Shell_constructor : public Modifier_base { @@ -120,5 +120,5 @@ class Shell_constructor : public Modifier_base { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_SHELL_CONSTRUCTOR_H diff --git a/Nef_3/include/CGAL/Nef_3/Vertex.h b/Nef_3/include/CGAL/Nef_3/Vertex.h index 9ff864929fca..8d99033e5c83 100644 --- a/Nef_3/include/CGAL/Nef_3/Vertex.h +++ b/Nef_3/include/CGAL/Nef_3/Vertex.h @@ -32,7 +32,7 @@ #define CGAL_NEF_DEBUG 83 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Vertex_base { @@ -361,5 +361,5 @@ class Vertex_base { }; // Vertex_base -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_VERTEX_H diff --git a/Nef_3/include/CGAL/Nef_3/Visualizor.h b/Nef_3/include/CGAL/Nef_3/Visualizor.h index c2a4536efcaf..59d3c654b48b 100644 --- a/Nef_3/include/CGAL/Nef_3/Visualizor.h +++ b/Nef_3/include/CGAL/Nef_3/Visualizor.h @@ -47,7 +47,7 @@ #define CGAL_NEF3_UNMARKED_EDGE_COLOR 255,236,94 #define CGAL_NEF3_UNMARKED_FACET_COLOR 249,215,44 -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace OGL { // ---------------------------------------------------------------------------- @@ -935,5 +935,5 @@ class Visualizor_OpenGL_3 { -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_VISUALIZOR_OPENGL_3_H diff --git a/Nef_3/include/CGAL/Nef_3/Volume.h b/Nef_3/include/CGAL/Nef_3/Volume.h index 2dcb77036f5d..81f773287f12 100644 --- a/Nef_3/include/CGAL/Nef_3/Volume.h +++ b/Nef_3/include/CGAL/Nef_3/Volume.h @@ -32,7 +32,7 @@ #define CGAL_NEF_DEBUG 83 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Volume_base { @@ -104,5 +104,5 @@ class Volume_base { }; // Volume_base -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEF_VOLUME_H diff --git a/Nef_3/include/CGAL/Nef_3/binop_intersection_tests.h b/Nef_3/include/CGAL/Nef_3/binop_intersection_tests.h index 206f058dc9a3..8116c7bfe3e3 100644 --- a/Nef_3/include/CGAL/Nef_3/binop_intersection_tests.h +++ b/Nef_3/include/CGAL/Nef_3/binop_intersection_tests.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct binop_intersection_test_segment_tree { @@ -186,6 +186,6 @@ struct binop_intersection_test_segment_tree { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Nef_3/include/CGAL/Nef_3/bounded_side_3.h b/Nef_3/include/CGAL/Nef_3/bounded_side_3.h index fce1f7db5b31..75a2627c0bf3 100644 --- a/Nef_3/include/CGAL/Nef_3/bounded_side_3.h +++ b/Nef_3/include/CGAL/Nef_3/bounded_side_3.h @@ -31,7 +31,7 @@ #define CGAL_NEF_DEBUG 17 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template Point_2 point_3_get_x_y_point_2(Point_3 p) { @@ -103,7 +103,7 @@ Bounded_side bounded_side_3(IteratorForward first, return side; } -CGAL_END_NAMESPACE +} //namespace CGAL #ifdef WRONG_IMPLEMENTATION /* The following code is wrong since Proyector_.. structures must not return diff --git a/Nef_3/include/CGAL/Nef_3/polyhedron_3_to_nef_3.h b/Nef_3/include/CGAL/Nef_3/polyhedron_3_to_nef_3.h index a20f4e5f1693..94df5f51729a 100644 --- a/Nef_3/include/CGAL/Nef_3/polyhedron_3_to_nef_3.h +++ b/Nef_3/include/CGAL/Nef_3/polyhedron_3_to_nef_3.h @@ -31,7 +31,7 @@ #define CGAL_NEF_DEBUG 29 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Node, class Object> struct Project_vertex_point { @@ -306,6 +306,6 @@ void polyhedron_3_to_nef_3(Polyhedron_& P, SNC_structure& S) -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEF_POLYHEDRON_3_TO_NEF_3_H diff --git a/Nef_3/include/CGAL/Nef_3/quotient_coordinates_to_homogeneous_point.h b/Nef_3/include/CGAL/Nef_3/quotient_coordinates_to_homogeneous_point.h index e151447242db..63f63a4a8f99 100644 --- a/Nef_3/include/CGAL/Nef_3/quotient_coordinates_to_homogeneous_point.h +++ b/Nef_3/include/CGAL/Nef_3/quotient_coordinates_to_homogeneous_point.h @@ -20,7 +20,7 @@ #ifndef CGAL_NEF_QUOTIENT_COORDINATES_TO_HOMOGENEOUS_POINT_H #define CGAL_NEF_QUOTIENT_COORDINATES_TO_HOMOGENEOUS_POINT_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template typename Homogeneous::Point_3 @@ -46,6 +46,6 @@ quotient_coordinates_to_homogeneous_point( } } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_QUOTIENT_COORDINATES_TO_HOMOGENEOUS_POINT_H diff --git a/Nef_3/include/CGAL/Nef_3/shell_to_nef_3.h b/Nef_3/include/CGAL/Nef_3/shell_to_nef_3.h index b9179ee6017e..c6b080f9b4e9 100644 --- a/Nef_3/include/CGAL/Nef_3/shell_to_nef_3.h +++ b/Nef_3/include/CGAL/Nef_3/shell_to_nef_3.h @@ -31,7 +31,7 @@ #define CGAL_NEF_DEBUG 29 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Shell_to_nef_3 @@ -154,6 +154,6 @@ void shell_to_nef_3(const Nef_polyhedron& N, N.visit_shell_objects(sf, s2n); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEF_SHELL_TO_NEF_3_H diff --git a/Nef_3/include/CGAL/Nef_3/vertex_cycle_to_nef_3.h b/Nef_3/include/CGAL/Nef_3/vertex_cycle_to_nef_3.h index 8274626a70de..0271d7b6ce22 100644 --- a/Nef_3/include/CGAL/Nef_3/vertex_cycle_to_nef_3.h +++ b/Nef_3/include/CGAL/Nef_3/vertex_cycle_to_nef_3.h @@ -33,7 +33,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /* template @@ -443,5 +443,5 @@ typedef CGAL::Constrained_triangulation_plus_2 YZ_tri_plus; return is_nef; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_VERTEX_CYCLE_TO_NEF_3_H diff --git a/Nef_3/include/CGAL/Nef_nary_intersection_3.h b/Nef_3/include/CGAL/Nef_nary_intersection_3.h index dd6186d02774..05f021faaeb6 100644 --- a/Nef_3/include/CGAL/Nef_nary_intersection_3.h +++ b/Nef_3/include/CGAL/Nef_nary_intersection_3.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Nef_nary_intersection_3 { @@ -63,5 +63,5 @@ class Nef_nary_intersection_3 { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_NARY_INTERSECTION_3_H diff --git a/Nef_3/include/CGAL/Nef_nary_union_3.h b/Nef_3/include/CGAL/Nef_nary_union_3.h index 44acd0575e3e..707d79d6f1a0 100644 --- a/Nef_3/include/CGAL/Nef_nary_union_3.h +++ b/Nef_3/include/CGAL/Nef_nary_union_3.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Nef_nary_union_3 { @@ -63,5 +63,5 @@ class Nef_nary_union_3 { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_NARY_UNION_H diff --git a/Nef_3/include/CGAL/Nef_polyhedron_3.h b/Nef_3/include/CGAL/Nef_polyhedron_3.h index 24d14399e384..fbad6f1abc53 100644 --- a/Nef_3/include/CGAL/Nef_polyhedron_3.h +++ b/Nef_3/include/CGAL/Nef_polyhedron_3.h @@ -88,7 +88,7 @@ #define CGAL_NEF_DEBUG 11 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Nef_polyhedron_3; template class Nef_polyhedron_3_rep; @@ -2060,6 +2060,6 @@ extract_boundary() { simplify(); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEF_POLYHEDRON_3_H diff --git a/Nef_3/include/CGAL/OFF_to_nef_3.h b/Nef_3/include/CGAL/OFF_to_nef_3.h index 52bdb3b2592f..e622a4669261 100644 --- a/Nef_3/include/CGAL/OFF_to_nef_3.h +++ b/Nef_3/include/CGAL/OFF_to_nef_3.h @@ -36,7 +36,7 @@ #include #endif // CGAL_USE_LEDA -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Homogeneous_tag; class Cartesian_tag; @@ -83,7 +83,7 @@ class number_type_converter_nef_3 { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // NUMBER_TYPE_CONVERTER_NEF_3_H // --- end preliminary number type converter ------------------- @@ -101,7 +101,7 @@ CGAL_END_NAMESPACE #include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { template std::size_t @@ -229,5 +229,5 @@ OFF_to_nef_3 (std::istream &i_st, Nef_3 &nef_union, bool verb=false) return discarded_facets; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_OFF_TO_NEF_3_H diff --git a/Nef_3/include/CGAL/normal_vector_newell_3.h b/Nef_3/include/CGAL/normal_vector_newell_3.h index c96e209b17d8..257790568f20 100644 --- a/Nef_3/include/CGAL/normal_vector_newell_3.h +++ b/Nef_3/include/CGAL/normal_vector_newell_3.h @@ -28,7 +28,7 @@ #define CGAL_NEF_DEBUG 79 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template CGAL_MEDIUM_INLINE @@ -89,6 +89,6 @@ void normal_vector_newell_3( IC first, IC last, Vector& n ) CGAL_NEF_TRACEN("newell normal vector "< #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class grid_generator : public CGAL::SNC_decorator { @@ -775,4 +775,4 @@ class grid_generator : public CGAL::SNC_decorator } }; -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Nef_3/performance/Nef_3/include/CGAL/Nef_3/Filtered_gcd.h b/Nef_3/performance/Nef_3/include/CGAL/Nef_3/Filtered_gcd.h index bb2b8e7be583..ca3b6b4d1fac 100644 --- a/Nef_3/performance/Nef_3/include/CGAL/Nef_3/Filtered_gcd.h +++ b/Nef_3/performance/Nef_3/include/CGAL/Nef_3/Filtered_gcd.h @@ -6,7 +6,7 @@ #undef _DEBUG #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /* template @@ -25,5 +25,5 @@ Lazy_exact_nt gcd(const Lazy_exact_nt& a, const Lazy_exact_nt& b) { return Lazy_exact_nt(CGAL_NTS gcd(nta,ntb)); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_FILTERED_GCD_H diff --git a/Nef_3/performance/Nef_3/sat_writer.h b/Nef_3/performance/Nef_3/sat_writer.h index 7b672e759b15..8ca1512c1883 100644 --- a/Nef_3/performance/Nef_3/sat_writer.h +++ b/Nef_3/performance/Nef_3/sat_writer.h @@ -3,7 +3,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class sat_writer : public CGAL::SNC_decorator { @@ -283,5 +283,5 @@ class sat_writer : public CGAL::SNC_decorator { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF3_SAT_WRITER diff --git a/Nef_3/performance/Nef_3/sat_writer2.h b/Nef_3/performance/Nef_3/sat_writer2.h index 0ef2e9f84c17..0842e5c2d280 100644 --- a/Nef_3/performance/Nef_3/sat_writer2.h +++ b/Nef_3/performance/Nef_3/sat_writer2.h @@ -3,7 +3,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class sat_writer : public CGAL::SNC_decorator { @@ -293,5 +293,5 @@ class sat_writer : public CGAL::SNC_decorator { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF3_SAT_WRITER diff --git a/Nef_3/test/Nef_3/include/CGAL/test_Nef_3.h b/Nef_3/test/Nef_3/include/CGAL/test_Nef_3.h index de4be124e78e..6875ac6ba60b 100644 --- a/Nef_3/test/Nef_3/include/CGAL/test_Nef_3.h +++ b/Nef_3/test/Nef_3/include/CGAL/test_Nef_3.h @@ -35,7 +35,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class test_Nef_3 { @@ -1219,5 +1219,5 @@ class test_Nef_3 { template const char* test_Nef_3::datadir="data/"; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TEST_NEF_3 diff --git a/Nef_3/triangulation/include/CGAL/Nef_3/pm_from_nef3_facet.h b/Nef_3/triangulation/include/CGAL/Nef_3/pm_from_nef3_facet.h index 0e4bce0ac32e..c9e93866b620 100644 --- a/Nef_3/triangulation/include/CGAL/Nef_3/pm_from_nef3_facet.h +++ b/Nef_3/triangulation/include/CGAL/Nef_3/pm_from_nef3_facet.h @@ -5,7 +5,7 @@ #define _DEBUG 5 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template typename Planar_map::Face_handle @@ -162,6 +162,6 @@ pm_from_nef3_facet( typename SNC_structure::Halffacet_const_handle f, return pm_face; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // PM_FROM_NEF3_FACET_2_H diff --git a/Nef_3/triangulation/include/CGAL/Nef_3/triangulate_nef3_facet.h b/Nef_3/triangulation/include/CGAL/Nef_3/triangulate_nef3_facet.h index 1b058fe4235e..81600064c057 100644 --- a/Nef_3/triangulation/include/CGAL/Nef_3/triangulate_nef3_facet.h +++ b/Nef_3/triangulation/include/CGAL/Nef_3/triangulate_nef3_facet.h @@ -14,7 +14,7 @@ extern CGAL::Window_stream W; #define _DEBUG 11 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { typedef enum { XY, NXY, ZX, NZX, YZ, NYZ, UNINIT } Plane_label; @@ -258,6 +258,6 @@ void triangulate_nef3_facet( Halffacet_handle facet, return; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // TRIAGULATE_NEF3_FACET_H diff --git a/Nef_S2/demo/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.h b/Nef_S2/demo/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.h index 5aad7c074a04..2cbad43d279c 100644 --- a/Nef_S2/demo/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.h +++ b/Nef_S2/demo/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void @@ -59,5 +59,5 @@ create_random_Nef_S2(Nef_polyhedron_S2& P, int n=5, int seed=0) { } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // NEF_POLYHEDRON_S2_CREATE_RANDOM_H diff --git a/Nef_S2/examples/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.h b/Nef_S2/examples/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.h index bbc53397248d..c1b8d2611e3b 100644 --- a/Nef_S2/examples/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.h +++ b/Nef_S2/examples/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.h @@ -5,7 +5,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void @@ -40,5 +40,5 @@ create_random_Nef_S2(Nef_polyhedron_S2& P, int n=5, int seed=0) { } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // NEF_POLYHEDRON_S2_CREATE_RANDOM_H diff --git a/Nef_S2/include/CGAL/IO/Nef_polyhedron_S2_OGLUT_stream.h b/Nef_S2/include/CGAL/IO/Nef_polyhedron_S2_OGLUT_stream.h index b26ca7d7088f..fb4ed65521bd 100644 --- a/Nef_S2/include/CGAL/IO/Nef_polyhedron_S2_OGLUT_stream.h +++ b/Nef_S2/include/CGAL/IO/Nef_polyhedron_S2_OGLUT_stream.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { struct OGLUT_stream { // dummy class @@ -55,6 +55,6 @@ static CGAL::OGLUT_stream& operator<<(CGAL::OGLUT_stream& ogls, return ogls; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_POLYHEDRON_S2_OGLUT_STREAM_H diff --git a/Nef_S2/include/CGAL/IO/Nef_polyhedron_iostream_S2.h b/Nef_S2/include/CGAL/IO/Nef_polyhedron_iostream_S2.h index db3f8de46f61..de0849855b02 100644 --- a/Nef_S2/include/CGAL/IO/Nef_polyhedron_iostream_S2.h +++ b/Nef_S2/include/CGAL/IO/Nef_polyhedron_iostream_S2.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /* template @@ -51,6 +51,6 @@ std::istream& operator>> return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEF_POLYHEDRON_IOSTREAM_3_H diff --git a/Nef_S2/include/CGAL/IO/Qt_widget_Nef_S2.h b/Nef_S2/include/CGAL/IO/Qt_widget_Nef_S2.h index a301b9502376..c6f305ed86a9 100644 --- a/Nef_S2/include/CGAL/IO/Qt_widget_Nef_S2.h +++ b/Nef_S2/include/CGAL/IO/Qt_widget_Nef_S2.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Qt_widget_Nef_S2 : public Qt_widget_OpenGL { @@ -69,5 +69,5 @@ class Qt_widget_Nef_S2 : public Qt_widget_OpenGL { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_QT_WIDGET_NEF_S2_H diff --git a/Nef_S2/include/CGAL/Nef_S2/Generic_handle_map.h b/Nef_S2/include/CGAL/Nef_S2/Generic_handle_map.h index 7ce5d003167d..313643d128d7 100644 --- a/Nef_S2/include/CGAL/Nef_S2/Generic_handle_map.h +++ b/Nef_S2/include/CGAL/Nef_S2/Generic_handle_map.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { struct Void_handle_hash_function { std::size_t operator() (void* h) const { @@ -49,5 +49,5 @@ class Generic_handle_map : public }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_GENERIC_HANDLE_MAP_H diff --git a/Nef_S2/include/CGAL/Nef_S2/Normalizing.h b/Nef_S2/include/CGAL/Nef_S2/Normalizing.h index 47e167cca3b2..c142073fa28a 100644 --- a/Nef_S2/include/CGAL/Nef_S2/Normalizing.h +++ b/Nef_S2/include/CGAL/Nef_S2/Normalizing.h @@ -33,7 +33,7 @@ #include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Homogeneous_tag; class Cartesian_tag; @@ -370,5 +370,5 @@ CGAL::Sphere_circle normalized(const CGAL::Sphere_circle& c) { return Normalizing::normalized(c); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NORMALIZING_H diff --git a/Nef_S2/include/CGAL/Nef_S2/OGL_base_object.h b/Nef_S2/include/CGAL/Nef_S2/OGL_base_object.h index 1661d6a71af2..8f8d76854c95 100644 --- a/Nef_S2/include/CGAL/Nef_S2/OGL_base_object.h +++ b/Nef_S2/include/CGAL/Nef_S2/OGL_base_object.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace OGL { @@ -44,5 +44,5 @@ namespace OGL { }; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_OGL_BASE_OBJECT_H diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_checker.h b/Nef_S2/include/CGAL/Nef_S2/SM_checker.h index 2e6e35697a5a..ec0a5aff7bd5 100644 --- a/Nef_S2/include/CGAL/Nef_S2/SM_checker.h +++ b/Nef_S2/include/CGAL/Nef_S2/SM_checker.h @@ -24,7 +24,7 @@ #include #define CGAL_USING(t) typedef typename Base::t t -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*{\Moptions outfile=SM_checker.man }*/ /*{\Manpage {SM_checker}{PMCDEC,GEOM}{Plane map checking}{}}*/ @@ -250,7 +250,7 @@ The input and output is mainly triggered by an IO Decorator which has the control over the IO format and does some basic parsing when reading input. -CGAL_END_NAMESPACE +} //namespace CGAL #undef CGAL_USING #endif // CGAL_SM_CHECKER_H diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_const_decorator.h b/Nef_S2/include/CGAL/Nef_S2/SM_const_decorator.h index 517ef257b3e6..dde0249b9d61 100644 --- a/Nef_S2/include/CGAL/Nef_S2/SM_const_decorator.h +++ b/Nef_S2/include/CGAL/Nef_S2/SM_const_decorator.h @@ -36,7 +36,7 @@ #define CGAL_NEF_DEBUG 67 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SM_const_decorator { @@ -411,5 +411,5 @@ number_of_connected_components() const return comp_num; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SM_CONST_DECORATOR_H diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_constrained_triang_traits.h b/Nef_S2/include/CGAL/Nef_S2/SM_constrained_triang_traits.h index 7f2e501d38c2..0a736a269605 100644 --- a/Nef_S2/include/CGAL/Nef_S2/SM_constrained_triang_traits.h +++ b/Nef_S2/include/CGAL/Nef_S2/SM_constrained_triang_traits.h @@ -30,7 +30,7 @@ #define CGAL_NEF_DEBUG 139 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /* For a detailed documentation see the MPI research report 2001-1-003 which documents the planar flavor of this baby; only minor deviations @@ -402,5 +402,5 @@ class SM_constrained_triang_traits : public Decorator_ { }; // SM_constrained_triang_traits -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SM_CONSTRAINED_TRIANG_TRAITS_H diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_decorator.h b/Nef_S2/include/CGAL/Nef_S2/SM_decorator.h index c3c43761733f..5ae2ba977c5c 100644 --- a/Nef_S2/include/CGAL/Nef_S2/SM_decorator.h +++ b/Nef_S2/include/CGAL/Nef_S2/SM_decorator.h @@ -35,7 +35,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*{\Moptions print_title=yes }*/ /*{\Moptions outfile=SM_decorator.man }*/ @@ -958,5 +958,5 @@ void check_integrity_and_topological_planarity(bool faces=true) const { }; // SM_decorator -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SM_DECORATOR_H diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_decorator_traits.h b/Nef_S2/include/CGAL/Nef_S2/SM_decorator_traits.h index 1c799809dc93..5f647e1ad75c 100644 --- a/Nef_S2/include/CGAL/Nef_S2/SM_decorator_traits.h +++ b/Nef_S2/include/CGAL/Nef_S2/SM_decorator_traits.h @@ -20,7 +20,7 @@ #ifndef CGAL_NEF_SM_DECORATOR_TRAITS_H #define CGAL_NEF_SM_DECORATOR_TRAITS_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SM_decorator_traits { @@ -90,5 +90,5 @@ class SM_decorator_const_traits { typedef typename Refs::SFace_cycle_const_iterator SFace_cycle_const_iterator; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEF_SM_DECORATOR_TRAITS_H diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h b/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h index b0c7ce6ee554..243ffc824e4c 100644 --- a/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h +++ b/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h @@ -32,7 +32,7 @@ # pragma warning(disable:4355) // complaint about using 'this' to #endif // initialize a member -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*{\Moptions outfile=SM_io_parser.man }*/ /*{\Manpage {SM_io_parser}{Decorator_}{IO of embedded maps}{IO}}*/ @@ -481,7 +481,7 @@ void SM_io_parser::dump(const Decorator_& D, std::ostream& os) -CGAL_END_NAMESPACE +} //namespace CGAL #if defined(BOOST_MSVC) diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_items.h b/Nef_S2/include/CGAL/Nef_S2/SM_items.h index a3713669ab41..45653242a5bd 100644 --- a/Nef_S2/include/CGAL/Nef_S2/SM_items.h +++ b/Nef_S2/include/CGAL/Nef_S2/SM_items.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //template class Sphere_map; template class SM_const_decorator; @@ -335,5 +335,5 @@ struct SM_items { }; // SM_items -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SM_ITEMS_H diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_list.h b/Nef_S2/include/CGAL/Nef_S2/SM_list.h index 2b2d8544c1ac..d0e04bfc1818 100644 --- a/Nef_S2/include/CGAL/Nef_S2/SM_list.h +++ b/Nef_S2/include/CGAL/Nef_S2/SM_list.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /* template @@ -102,6 +102,6 @@ class SNC_in_place_list_sface } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SM_LIST_H diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h b/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h index b66e26102941..252e592478fb 100644 --- a/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h +++ b/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h @@ -39,7 +39,7 @@ #define LEDA_MEMORY(t) #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct SMO_from_segs { @@ -2331,6 +2331,6 @@ typedef CGAL::generic_sweep Negative_halfsphere_sweep; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SM_OVERLAYER_H diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_point_locator.h b/Nef_S2/include/CGAL/Nef_S2/SM_point_locator.h index 0952c7d5dd65..25022b7f3f7b 100644 --- a/Nef_S2/include/CGAL/Nef_S2/SM_point_locator.h +++ b/Nef_S2/include/CGAL/Nef_S2/SM_point_locator.h @@ -30,7 +30,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*{\Moptions print_title=yes }*/ @@ -654,5 +654,5 @@ marks_of_halfspheres(Mark& lower, Mark& upper, int axis) { } } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SM_POINT_LOCATOR_H diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_triangulator.h b/Nef_S2/include/CGAL/Nef_S2/SM_triangulator.h index 9867476f8f35..63c9819410e9 100644 --- a/Nef_S2/include/CGAL/Nef_S2/SM_triangulator.h +++ b/Nef_S2/include/CGAL/Nef_S2/SM_triangulator.h @@ -38,7 +38,7 @@ #ifndef CGAL_USE_LEDA #define LEDA_MEMORY(t) #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct SM_subdivision { @@ -670,6 +670,6 @@ complete_support(SVertex_iterator v_start, SVertex_iterator v_end, -CGAL_END_NAMESPACE +} //namespace CGAL #undef CGAL_USING #endif //CGAL_SM_TRIANGULATOR_H diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_visualizor.h b/Nef_S2/include/CGAL/Nef_S2/SM_visualizor.h index 1c2f1e1c0038..51cc4545ad76 100644 --- a/Nef_S2/include/CGAL/Nef_S2/SM_visualizor.h +++ b/Nef_S2/include/CGAL/Nef_S2/SM_visualizor.h @@ -27,7 +27,7 @@ #define CGAL_NEF_LGREY CGAL::Color(170,170,200) #define CGAL_NEF_DGREY CGAL::Color(30,30,50) -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class SM_BooleColor @@ -196,7 +196,7 @@ void draw_triangulation() const -CGAL_END_NAMESPACE +} //namespace CGAL #undef CGAL_USING //#undef CGAL_NEF_LGREY //#undef CGAL_NEF_DGREY diff --git a/Nef_S2/include/CGAL/Nef_S2/Sphere_circle.h b/Nef_S2/include/CGAL/Nef_S2/Sphere_circle.h index c1e956c0cffe..fdba4df5ef8c 100644 --- a/Nef_S2/include/CGAL/Nef_S2/Sphere_circle.h +++ b/Nef_S2/include/CGAL/Nef_S2/Sphere_circle.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Sphere_segment; @@ -173,5 +173,5 @@ Sphere_point intersection(const Sphere_circle& c1, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SPHERE_CIRCLE_H diff --git a/Nef_S2/include/CGAL/Nef_S2/Sphere_direction.h b/Nef_S2/include/CGAL/Nef_S2/Sphere_direction.h index 28a609b22390..3e804d5175e8 100644 --- a/Nef_S2/include/CGAL/Nef_S2/Sphere_direction.h +++ b/Nef_S2/include/CGAL/Nef_S2/Sphere_direction.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*{\Manpage{Sphere_direction}{R}{Directions on the unit sphere}{c}}*/ @@ -114,5 +114,5 @@ bool strictly_ordered_ccw_at(const Sphere_point& p, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SPHERE_DIRECTION_H diff --git a/Nef_S2/include/CGAL/Nef_S2/Sphere_geometry.h b/Nef_S2/include/CGAL/Nef_S2/Sphere_geometry.h index 29714782a4c1..1d3ad3425905 100644 --- a/Nef_S2/include/CGAL/Nef_S2/Sphere_geometry.h +++ b/Nef_S2/include/CGAL/Nef_S2/Sphere_geometry.h @@ -29,7 +29,7 @@ #define CGAL_NEF_DEBUG 113 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Sphere_point; template class Sphere_segment; @@ -37,7 +37,7 @@ template class Sphere_triangle; template class Sphere_circle; template class Sphere_direction; -CGAL_END_NAMESPACE +} //namespace CGAL #include #include @@ -46,7 +46,7 @@ CGAL_END_NAMESPACE #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Positive_halfsphere_geometry { @@ -255,5 +255,5 @@ get_negative_halfsphere_geometry(int a) const { -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SPHERE_GEOMETRY_H diff --git a/Nef_S2/include/CGAL/Nef_S2/Sphere_geometry_OGL.h b/Nef_S2/include/CGAL/Nef_S2/Sphere_geometry_OGL.h index 6bbf1bf08d7b..533f080e295c 100644 --- a/Nef_S2/include/CGAL/Nef_S2/Sphere_geometry_OGL.h +++ b/Nef_S2/include/CGAL/Nef_S2/Sphere_geometry_OGL.h @@ -39,7 +39,7 @@ #define CGAL_NEF_LGREY CGAL::Color(170,170,200) #define CGAL_NEF_DGREY CGAL::Color(30,30,50) -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace OGL { struct Gen_object { @@ -787,7 +787,7 @@ class NefS2_to_UnitSphere }; } // OGL -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Nef_S2/include/CGAL/Nef_S2/Sphere_map.h b/Nef_S2/include/CGAL/Nef_S2/Sphere_map.h index 2931e9383b38..ed5869dad13e 100644 --- a/Nef_S2/include/CGAL/Nef_S2/Sphere_map.h +++ b/Nef_S2/include/CGAL/Nef_S2/Sphere_map.h @@ -37,7 +37,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class move_edge_around_svertex { @@ -571,5 +571,5 @@ pointer_update(const Sphere_map& D) } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SPHERE_MAP_H diff --git a/Nef_S2/include/CGAL/Nef_S2/Sphere_point.h b/Nef_S2/include/CGAL/Nef_S2/Sphere_point.h index b4764664cda6..5fd7eaad65c9 100644 --- a/Nef_S2/include/CGAL/Nef_S2/Sphere_point.h +++ b/Nef_S2/include/CGAL/Nef_S2/Sphere_point.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*{\Mtext \headerline{Restricted Spherical Geometry} @@ -128,5 +128,5 @@ typename R::Point_3 operator+ (const typename R::Point_3& p, const Sphere_point& q) { return p + (q-CGAL::ORIGIN); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SPHERE_POINT_H diff --git a/Nef_S2/include/CGAL/Nef_S2/Sphere_segment.h b/Nef_S2/include/CGAL/Nef_S2/Sphere_segment.h index dcfd82118954..edcfda88423b 100644 --- a/Nef_S2/include/CGAL/Nef_S2/Sphere_segment.h +++ b/Nef_S2/include/CGAL/Nef_S2/Sphere_segment.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Sphere_segment_rep { @@ -383,5 +383,5 @@ bool do_intersect_internally(const Sphere_circle& c1, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SPHERE_SEGMENT_H diff --git a/Nef_S2/include/CGAL/Nef_S2/Sphere_triangle.h b/Nef_S2/include/CGAL/Nef_S2/Sphere_triangle.h index c564eddccd83..405f92619a07 100644 --- a/Nef_S2/include/CGAL/Nef_S2/Sphere_triangle.h +++ b/Nef_S2/include/CGAL/Nef_S2/Sphere_triangle.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Sphere_triangle_rep { typedef Sphere_point Point; @@ -113,5 +113,5 @@ std::istream& operator>>(std::istream& is, t = CGAL::Sphere_triangle(p1,p2,p3,c1,c2,c3); return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SPHERE_TRIANGLE_H diff --git a/Nef_S2/include/CGAL/Nef_S2/sphere_predicates.h b/Nef_S2/include/CGAL/Nef_S2/sphere_predicates.h index c104b215d1a2..ebb2b5fe25f7 100644 --- a/Nef_S2/include/CGAL/Nef_S2/sphere_predicates.h +++ b/Nef_S2/include/CGAL/Nef_S2/sphere_predicates.h @@ -31,7 +31,7 @@ for(x = (L).begin(); x != (L).end(); ++x) -CGAL_BEGIN_NAMESPACE +namespace CGAL { /* |spherical_orientation| takes three points of one hemisphere and returns the orientation of $p_3$ with respect to the halfcircle @@ -405,6 +405,6 @@ intersection(const CGAL::Sphere_circle& c, return -1; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SPHERE_PREDICATES_H diff --git a/Nef_S2/include/CGAL/Nef_polyhedron_S2.h b/Nef_S2/include/CGAL/Nef_polyhedron_S2.h index 3d06b149d136..f7cbb367d09e 100644 --- a/Nef_S2/include/CGAL/Nef_polyhedron_S2.h +++ b/Nef_S2/include/CGAL/Nef_polyhedron_S2.h @@ -43,7 +43,7 @@ #define CGAL_NEF_DEBUG 53 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Nef_polyhedron_S2; template class Nef_polyhedron_S2_rep; @@ -721,5 +721,5 @@ std::istream& operator>> # pragma warning(pop) #endif -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_NEF_POLYHEDRON_S2_H diff --git a/Number_types/include/CGAL/CORE_BigFloat.h b/Number_types/include/CGAL/CORE_BigFloat.h index 9633556db411..cdc08604a9f7 100644 --- a/Number_types/include/CGAL/CORE_BigFloat.h +++ b/Number_types/include/CGAL/CORE_BigFloat.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ######### Interval_traits @@ -515,7 +515,7 @@ template <> class Real_embeddable_traits< CORE::BigFloat > }; }; -CGAL_END_NAMESPACE +} //namespace CGAL //since types are included by CORE_coercion_traits.h: #include diff --git a/Number_types/include/CGAL/CORE_BigInt.h b/Number_types/include/CGAL/CORE_BigInt.h index 00d91c072104..c593035b481c 100644 --- a/Number_types/include/CGAL/CORE_BigInt.h +++ b/Number_types/include/CGAL/CORE_BigInt.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template<> struct Root_of_traits: public internal::Root_of_traits_helper { }; -CGAL_END_NAMESPACE +} //namespace CGAL //since types are included by CORE_coercion_traits.h: #include diff --git a/Number_types/include/CGAL/CORE_BigRat.h b/Number_types/include/CGAL/CORE_BigRat.h index fee7e0834843..ac3c183e5e3c 100644 --- a/Number_types/include/CGAL/CORE_BigRat.h +++ b/Number_types/include/CGAL/CORE_BigRat.h @@ -34,7 +34,7 @@ #define CGAL_CORE_DENOMINATOR(X) (denominator((X))) //#else -CGAL_BEGIN_NAMESPACE +namespace CGAL { // // Algebraic structure traits @@ -223,7 +223,7 @@ class Benchmark_rep< CORE::BigRat > { } }; -CGAL_END_NAMESPACE +} //namespace CGAL //since types are included by CORE_coercion_traits.h: #include diff --git a/Number_types/include/CGAL/CORE_Expr.h b/Number_types/include/CGAL/CORE_Expr.h index d967c26f7bfc..a7189af3a527 100644 --- a/Number_types/include/CGAL/CORE_Expr.h +++ b/Number_types/include/CGAL/CORE_Expr.h @@ -30,7 +30,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template <> class Algebraic_structure_traits< CORE::Expr > : public Algebraic_structure_traits_base< CORE::Expr, @@ -179,7 +179,7 @@ template <> class Real_embeddable_traits< CORE::Expr > }; }; -CGAL_END_NAMESPACE +} //namespace CGAL //since types are included by CORE_coercion_traits.h: #include diff --git a/Number_types/include/CGAL/CORE_coercion_traits.h b/Number_types/include/CGAL/CORE_coercion_traits.h index 3f02911f70e5..15c6322525c7 100644 --- a/Number_types/include/CGAL/CORE_coercion_traits.h +++ b/Number_types/include/CGAL/CORE_coercion_traits.h @@ -34,7 +34,7 @@ //#include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //CORE internal coercions: @@ -156,7 +156,7 @@ template <> struct Coercion_traits< ::CORE::Expr, CORE::BigFloat > //CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long long ,::CORE::Expr) //CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long double,::CORE::Expr) -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_USE_CORE #endif //CGAL_CORE_COERCION_TRAITS_H 1 diff --git a/Number_types/include/CGAL/Counted_number.h b/Number_types/include/CGAL/Counted_number.h index a452e21eb311..8a285daaaec1 100644 --- a/Number_types/include/CGAL/Counted_number.h +++ b/Number_types/include/CGAL/Counted_number.h @@ -29,7 +29,7 @@ #include // for Root_of_selector #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Counted_number { @@ -781,6 +781,6 @@ const Counted_number & y){ return CGAL::Max > ()(x,y); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Number_types/include/CGAL/FPU.h b/Number_types/include/CGAL/FPU.h index 1aedd65e308b..241a129ec78d 100644 --- a/Number_types/include/CGAL/FPU.h +++ b/Number_types/include/CGAL/FPU.h @@ -103,7 +103,7 @@ extern "C" { # define CGAL_FPU_HAS_EXCESS_PRECISION #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -410,6 +410,6 @@ inline void force_ieee_double_precision() #endif } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_FPU_H diff --git a/Number_types/include/CGAL/GMP/Gmpq_type.h b/Number_types/include/CGAL/GMP/Gmpq_type.h index a3f4f01c2888..ab8933f65c2e 100644 --- a/Number_types/include/CGAL/GMP/Gmpq_type.h +++ b/Number_types/include/CGAL/GMP/Gmpq_type.h @@ -38,7 +38,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Wrapper around mpq_t to get the destructor call mpq_clear. // Contrary to mpz_t, there are no mpq_init_set_* functions, @@ -536,6 +536,6 @@ inline Gmpq max BOOST_PREVENT_MACRO_SUBSTITUTION(const Gmpq& x,const Gmpq& y){ return (x>=y)?x:y; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_GMPQ_TYPE_H diff --git a/Number_types/include/CGAL/GMP/Gmpz_type.h b/Number_types/include/CGAL/GMP/Gmpz_type.h index 2f44f19be507..8dcc25a03490 100644 --- a/Number_types/include/CGAL/GMP/Gmpz_type.h +++ b/Number_types/include/CGAL/GMP/Gmpz_type.h @@ -35,7 +35,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // TODO : benchmark without ref-counting, and maybe give the possibility // to select ref-counting or not, then... => template class. @@ -435,6 +435,6 @@ inline Gmpz max BOOST_PREVENT_MACRO_SUBSTITUTION(const Gmpz& x,const Gmpz& y){ #include -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_GMPZ_TYPE_H diff --git a/Number_types/include/CGAL/GMP/Gmpzf_type.h b/Number_types/include/CGAL/GMP/Gmpzf_type.h index a3d16579b781..5843b6206960 100644 --- a/Number_types/include/CGAL/GMP/Gmpzf_type.h +++ b/Number_types/include/CGAL/GMP/Gmpzf_type.h @@ -35,7 +35,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //internal fwd class Gmpzf; @@ -582,6 +582,6 @@ inline Gmpzf max BOOST_PREVENT_MACRO_SUBSTITUTION(const Gmpzf& x,const Gmpzf& y) return (x>=y)?x:y; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_GMPZF_TYPE_H diff --git a/Number_types/include/CGAL/Gmp_coercion_traits.h b/Number_types/include/CGAL/Gmp_coercion_traits.h index e93cf5a00ffe..91ec72f0d763 100644 --- a/Number_types/include/CGAL/Gmp_coercion_traits.h +++ b/Number_types/include/CGAL/Gmp_coercion_traits.h @@ -35,7 +35,7 @@ #ifdef CGAL_USE_GMP -CGAL_BEGIN_NAMESPACE +namespace CGAL { //Gmp internal coercions: CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(Gmpz) @@ -67,7 +67,7 @@ CGAL_DEFINE_COERCION_TRAITS_FROM_TO(Gmpfr,Gmpq) CGAL_DEFINE_COERCION_TRAITS_FROM_TO(float ,Gmpq) CGAL_DEFINE_COERCION_TRAITS_FROM_TO(double ,Gmpq) -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_USE_GMP diff --git a/Number_types/include/CGAL/Gmpq.h b/Number_types/include/CGAL/Gmpq.h index bcc4f72b76f4..ab6891d47847 100644 --- a/Number_types/include/CGAL/Gmpq.h +++ b/Number_types/include/CGAL/Gmpq.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // AST for Gmpq-class template <> class Algebraic_structure_traits< Gmpq > @@ -132,7 +132,7 @@ class Fraction_traits< Gmpq > { }; }; -CGAL_END_NAMESPACE +} //namespace CGAL //since types are included by Gmp_coercion_traits.h: #include diff --git a/Number_types/include/CGAL/Gmpz.h b/Number_types/include/CGAL/Gmpz.h index f2051cc8b47b..6d3a7c7fd059 100644 --- a/Number_types/include/CGAL/Gmpz.h +++ b/Number_types/include/CGAL/Gmpz.h @@ -39,7 +39,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Gmpq; @@ -213,7 +213,7 @@ class Modular_traits< Gmpz > { }; }; -CGAL_END_NAMESPACE +} //namespace CGAL #if defined(BOOST_MSVC) # pragma warning(pop) diff --git a/Number_types/include/CGAL/Gmpzf.h b/Number_types/include/CGAL/Gmpzf.h index 861d288d8b05..7f3720ec3d4d 100644 --- a/Number_types/include/CGAL/Gmpzf.h +++ b/Number_types/include/CGAL/Gmpzf.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Algebraic structure traits template <> class Algebraic_structure_traits< Gmpzf > @@ -173,7 +173,7 @@ INTERN_QUOTIENT::Real_embeddable_traits_quotient_base< Quotient > }; }; -CGAL_END_NAMESPACE +} //namespace CGAL //since types are included by Gmp_coercion_traits.h: #include diff --git a/Number_types/include/CGAL/Interval_nt.h b/Number_types/include/CGAL/Interval_nt.h index 5d03d15e3007..d1bcdbcdfe2e 100644 --- a/Number_types/include/CGAL/Interval_nt.h +++ b/Number_types/include/CGAL/Interval_nt.h @@ -44,7 +44,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Interval_nt @@ -1372,6 +1372,6 @@ class Interval_traits< Interval_nt > }; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_INTERVAL_NT_H diff --git a/Number_types/include/CGAL/Lazy_exact_nt.h b/Number_types/include/CGAL/Lazy_exact_nt.h index 75de6430b755..0e8b51a2e7cb 100644 --- a/Number_types/include/CGAL/Lazy_exact_nt.h +++ b/Number_types/include/CGAL/Lazy_exact_nt.h @@ -87,7 +87,7 @@ * - .rafine_approx() ?? */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Lazy_exact_nt; @@ -1412,6 +1412,6 @@ class Modular_traits > #undef CGAL_int #undef CGAL_To_interval -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LAZY_EXACT_NT_H diff --git a/Number_types/include/CGAL/MP_Float.h b/Number_types/include/CGAL/MP_Float.h index 24dc0a5665f0..6ec75f61bf05 100644 --- a/Number_types/include/CGAL/MP_Float.h +++ b/Number_types/include/CGAL/MP_Float.h @@ -58,7 +58,7 @@ // - nothing // - convert to double, take approximation, compute over double, reconstruct -CGAL_BEGIN_NAMESPACE +namespace CGAL { class MP_Float; @@ -856,6 +856,6 @@ CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(MP_Float) CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int, MP_Float) -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MP_FLOAT_H diff --git a/Number_types/include/CGAL/NT_converter.h b/Number_types/include/CGAL/NT_converter.h index 1efef7b2ad67..9048b0eaf2fb 100644 --- a/Number_types/include/CGAL/NT_converter.h +++ b/Number_types/include/CGAL/NT_converter.h @@ -25,7 +25,7 @@ template class Interval_nt; -CGAL_BEGIN_NAMESPACE +namespace CGAL { // A number type converter usable as default, using the conversion operator. @@ -100,6 +100,6 @@ struct NT_converter < Interval_nt, Interval_nt > } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NT_CONVERTER_H diff --git a/Number_types/include/CGAL/Number_type_checker.h b/Number_types/include/CGAL/Number_type_checker.h index b14ab936b40f..1f6e05afe123 100644 --- a/Number_types/include/CGAL/Number_type_checker.h +++ b/Number_types/include/CGAL/Number_type_checker.h @@ -34,7 +34,7 @@ // #define CGAL_NT_CHECK_DEBUG(s) std::cerr << s << std::endl #define CGAL_NT_CHECK_DEBUG(s) -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -912,6 +912,6 @@ operator>> (std::istream & is, Number_type_checker &b) return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NUMBER_TYPE_CHECKER_H diff --git a/Number_types/include/CGAL/Quotient.h b/Number_types/include/CGAL/Quotient.h index b5bc78f3a3fd..737346f29ada 100644 --- a/Number_types/include/CGAL/Quotient.h +++ b/Number_types/include/CGAL/Quotient.h @@ -43,7 +43,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define CGAL_int(T) typename First_if_different::Type #define CGAL_double(T) typename First_if_different::Type @@ -868,6 +868,6 @@ class Fraction_traits< Quotient > { }; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_QUOTIENT_H diff --git a/Number_types/include/CGAL/Root_of_traits.h b/Number_types/include/CGAL/Root_of_traits.h index e440ef86c3b6..ac6a0366495e 100644 --- a/Number_types/include/CGAL/Root_of_traits.h +++ b/Number_types/include/CGAL/Root_of_traits.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -190,6 +190,6 @@ make_root_of_2(const NT &a, const NT &b, const NT &c,const bool smaller) return make_root_of_2(a,b,c,smaller); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ROOT_OF_TRAITS_H diff --git a/Number_types/include/CGAL/Sqrt_extension/Algebraic_extension_traits.h b/Number_types/include/CGAL/Sqrt_extension/Algebraic_extension_traits.h index 063b1d04bf62..8c7d11d3c909 100644 --- a/Number_types/include/CGAL/Sqrt_extension/Algebraic_extension_traits.h +++ b/Number_types/include/CGAL/Sqrt_extension/Algebraic_extension_traits.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Algebraic_extension_traits > { @@ -137,6 +137,6 @@ class Algebraic_extension_traits > { }; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Number_types/include/CGAL/Sqrt_extension/Algebraic_structure_traits.h b/Number_types/include/CGAL/Sqrt_extension/Algebraic_structure_traits.h index 6d8ba769b2e6..e0b681a84fa1 100644 --- a/Number_types/include/CGAL/Sqrt_extension/Algebraic_structure_traits.h +++ b/Number_types/include/CGAL/Sqrt_extension/Algebraic_structure_traits.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -214,6 +214,6 @@ class Algebraic_structure_traits< Sqrt_extension< COEFF_, ROOT_ > > Is_numerical_sensitive; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Number_types/include/CGAL/Sqrt_extension/Coercion_traits.h b/Number_types/include/CGAL/Sqrt_extension/Coercion_traits.h index 1ed368cbb926..1860898ef3d8 100644 --- a/Number_types/include/CGAL/Sqrt_extension/Coercion_traits.h +++ b/Number_types/include/CGAL/Sqrt_extension/Coercion_traits.h @@ -26,7 +26,7 @@ #define CGAL_int(T) typename First_if_different::Type -CGAL_BEGIN_NAMESPACE +namespace CGAL { /////////// COERCION_TRAITS BEGIN @@ -276,7 +276,7 @@ struct CT_ext_not_to_fwsqrt, B_>{ /////////// COERCION_TRAITS END -CGAL_END_NAMESPACE +} //namespace CGAL #undef CGAL_int diff --git a/Number_types/include/CGAL/Sqrt_extension/Fraction_traits.h b/Number_types/include/CGAL/Sqrt_extension/Fraction_traits.h index f82b379afecb..9195bbbba00e 100644 --- a/Number_types/include/CGAL/Sqrt_extension/Fraction_traits.h +++ b/Number_types/include/CGAL/Sqrt_extension/Fraction_traits.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { @@ -229,6 +229,6 @@ class Cofraction_traits > }; */ -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Number_types/include/CGAL/Sqrt_extension/Get_arithmetic_kernel.h b/Number_types/include/CGAL/Sqrt_extension/Get_arithmetic_kernel.h index 07c0266332fb..5ca951840043 100644 --- a/Number_types/include/CGAL/Sqrt_extension/Get_arithmetic_kernel.h +++ b/Number_types/include/CGAL/Sqrt_extension/Get_arithmetic_kernel.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Get_arithmetic_kernel >{ @@ -33,6 +33,6 @@ struct Get_arithmetic_kernel >{ typedef typename GET::Arithmetic_kernel Arithmetic_kernel; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Number_types/include/CGAL/Sqrt_extension/Modular_traits.h b/Number_types/include/CGAL/Sqrt_extension/Modular_traits.h index 2cee203d48a2..412255da5cc0 100644 --- a/Number_types/include/CGAL/Sqrt_extension/Modular_traits.h +++ b/Number_types/include/CGAL/Sqrt_extension/Modular_traits.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /////////// MODULAR_TRAITS BEGIN @@ -78,6 +78,6 @@ class Modular_traits< Sqrt_extension > { /////////// MODULAR_TRAITS END -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Number_types/include/CGAL/Sqrt_extension/Real_embeddable_traits.h b/Number_types/include/CGAL/Sqrt_extension/Real_embeddable_traits.h index b48a270b25cc..b03b8f97634a 100644 --- a/Number_types/include/CGAL/Sqrt_extension/Real_embeddable_traits.h +++ b/Number_types/include/CGAL/Sqrt_extension/Real_embeddable_traits.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template< class COEFF, class ROOT > class Real_embeddable_traits< Sqrt_extension > @@ -88,6 +88,6 @@ class Real_embeddable_traits< Sqrt_extension > } }; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Number_types/include/CGAL/Sqrt_extension/Scalar_factor_traits.h b/Number_types/include/CGAL/Sqrt_extension/Scalar_factor_traits.h index 1abab3749870..3f67ebaea266 100644 --- a/Number_types/include/CGAL/Sqrt_extension/Scalar_factor_traits.h +++ b/Number_types/include/CGAL/Sqrt_extension/Scalar_factor_traits.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // This is the specialization for Sqrt_extension template @@ -79,6 +79,6 @@ class Scalar_factor_traits< Sqrt_extension > { }; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Number_types/include/CGAL/Sqrt_extension/Sqrt_extension_type.h b/Number_types/include/CGAL/Sqrt_extension/Sqrt_extension_type.h index a761f922949a..967ccae199c4 100644 --- a/Number_types/include/CGAL/Sqrt_extension/Sqrt_extension_type.h +++ b/Number_types/include/CGAL/Sqrt_extension/Sqrt_extension_type.h @@ -45,7 +45,7 @@ #define CGAL_int(T) typename First_if_different::Type -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Sqrt_extension; template @@ -629,7 +629,7 @@ CGAL::Comparison_result compare ( return x.compare(y,in_same_extension); } -CGAL_END_NAMESPACE +} //namespace CGAL #undef CGAL_int diff --git a/Number_types/include/CGAL/Sqrt_extension/Wang_traits.h b/Number_types/include/CGAL/Sqrt_extension/Wang_traits.h index 5f99cb502807..edef689a56dd 100644 --- a/Number_types/include/CGAL/Sqrt_extension/Wang_traits.h +++ b/Number_types/include/CGAL/Sqrt_extension/Wang_traits.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal{ template class Wang_traits; @@ -72,6 +72,6 @@ class Wang_traits< CGAL::Sqrt_extension >{ } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SQRT_EXTENSION_WANG_TRAITS_H diff --git a/Number_types/include/CGAL/Sqrt_extension/io.h b/Number_types/include/CGAL/Sqrt_extension/io.h index 0b3d77049149..838ec020b021 100644 --- a/Number_types/include/CGAL/Sqrt_extension/io.h +++ b/Number_types/include/CGAL/Sqrt_extension/io.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -164,6 +164,6 @@ std::istream& operator >> (std::istream& is, Sqrt_extension& ext) { return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Number_types/include/CGAL/constant.h b/Number_types/include/CGAL/constant.h index 5f484bb77afa..e3fd5193f916 100644 --- a/Number_types/include/CGAL/constant.h +++ b/Number_types/include/CGAL/constant.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // The function constant() returns a const reference to T(i). // TODO : is it worth documenting ? @@ -37,6 +37,6 @@ constant() return t; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CONSTANT_H diff --git a/Number_types/include/CGAL/double.h b/Number_types/include/CGAL/double.h index 26f5174d9982..7c731a786f7e 100644 --- a/Number_types/include/CGAL/double.h +++ b/Number_types/include/CGAL/double.h @@ -40,7 +40,7 @@ # include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { #ifdef CGAL_CFG_IEEE_754_BUG @@ -189,6 +189,6 @@ split_numerator_denominator(double d) return std::make_pair(num, den); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_DOUBLE_H diff --git a/Number_types/include/CGAL/float.h b/Number_types/include/CGAL/float.h index b027f18a9eab..74472b0a32c8 100644 --- a/Number_types/include/CGAL/float.h +++ b/Number_types/include/CGAL/float.h @@ -33,7 +33,7 @@ # include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { #ifdef CGAL_CFG_IEEE_754_BUG @@ -127,6 +127,6 @@ template <> class Real_embeddable_traits< float > }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_FLOAT_H diff --git a/Number_types/include/CGAL/gmpxx.h b/Number_types/include/CGAL/gmpxx.h index ece4725a60f0..db4fe2a00fd8 100644 --- a/Number_types/include/CGAL/gmpxx.h +++ b/Number_types/include/CGAL/gmpxx.h @@ -47,7 +47,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename T, typename U > @@ -58,6 +58,6 @@ template < typename T, typename U > class Real_embeddable_traits< ::__gmp_expr > : public Real_embeddable_traits< ::__gmp_expr >{}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_GMPXX_H diff --git a/Number_types/include/CGAL/gmpxx_coercion_traits.h b/Number_types/include/CGAL/gmpxx_coercion_traits.h index 69a14babbdaa..c248741de804 100644 --- a/Number_types/include/CGAL/gmpxx_coercion_traits.h +++ b/Number_types/include/CGAL/gmpxx_coercion_traits.h @@ -34,7 +34,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //mpz_class internal coercions: //self for mpz_class / mpq_class @@ -105,7 +105,7 @@ template struct Coercion_traits< int , ::__gmp_expr< T , U> > :public Coercion_traits< ::__gmp_expr< T , U>, int >{}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_GMPXX_COERCION_TRAITS_H 1 //EOF diff --git a/Number_types/include/CGAL/int.h b/Number_types/include/CGAL/int.h index 8500b58e92a1..ae8e8a03183b 100644 --- a/Number_types/include/CGAL/int.h +++ b/Number_types/include/CGAL/int.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace INTERN_INT { template< class Type > @@ -252,6 +252,6 @@ template <> class Real_embeddable_traits< short int > // Note : "long long" support is in -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_INT_H diff --git a/Number_types/include/CGAL/known_bit_size_integers.h b/Number_types/include/CGAL/known_bit_size_integers.h index fdd34c37d351..347f2dbbab4a 100644 --- a/Number_types/include/CGAL/known_bit_size_integers.h +++ b/Number_types/include/CGAL/known_bit_size_integers.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -85,6 +85,6 @@ typedef internal::USizeofSelect<4>::Type UInteger32; // 64 integer types are defined for other platforms in CGAL/long_long.h -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_KNOWN_BIT_SIZE_INTEGERS_H diff --git a/Number_types/include/CGAL/leda_bigfloat.h b/Number_types/include/CGAL/leda_bigfloat.h index 7918d6274e9f..754f0c121de3 100644 --- a/Number_types/include/CGAL/leda_bigfloat.h +++ b/Number_types/include/CGAL/leda_bigfloat.h @@ -39,7 +39,7 @@ #include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { template <> class Algebraic_structure_traits< leda_bigfloat > : public Algebraic_structure_traits_base< leda_bigfloat, @@ -146,7 +146,7 @@ class Is_valid< leda_bigfloat > }; -CGAL_END_NAMESPACE +} //namespace CGAL // Unary + is missing for leda::bigfloat namespace leda { diff --git a/Number_types/include/CGAL/leda_bigfloat_interval.h b/Number_types/include/CGAL/leda_bigfloat_interval.h index 4adf68324bf3..90d0f3740738 100644 --- a/Number_types/include/CGAL/leda_bigfloat_interval.h +++ b/Number_types/include/CGAL/leda_bigfloat_interval.h @@ -46,7 +46,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { struct Rounding_for_leda_bigfloat { @@ -140,7 +140,7 @@ class Checking_for_leda_bigfloat { }; } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL namespace boost { namespace numeric { @@ -160,7 +160,7 @@ std::ostream& operator << }//namespace numeric }//namespace boost -CGAL_BEGIN_NAMESPACE +namespace CGAL { typedef boost::numeric::interval < leda::bigfloat, @@ -485,6 +485,6 @@ leda_bigfloat_interval inline ipower(const leda_bigfloat_interval& x, int i ){ } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_USE_LEDA #endif // CGAL_LEDA_BIGFLOAT_INTERVAL_H diff --git a/Number_types/include/CGAL/leda_coercion_traits.h b/Number_types/include/CGAL/leda_coercion_traits.h index c21911e258b8..cdca6ec44429 100644 --- a/Number_types/include/CGAL/leda_coercion_traits.h +++ b/Number_types/include/CGAL/leda_coercion_traits.h @@ -43,7 +43,7 @@ #include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { //LEDA internal coercions: @@ -129,7 +129,7 @@ template <> struct Coercion_traits< ::leda::rational, ::leda::bigfloat > :public Coercion_traits< ::leda::bigfloat , ::leda::rational >{}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_USE_LEDA #endif //CGAL_LEDA_COERCION_TRAITS_H //EOF diff --git a/Number_types/include/CGAL/leda_integer.h b/Number_types/include/CGAL/leda_integer.h index 5d1629a40648..18a76bea50ef 100644 --- a/Number_types/include/CGAL/leda_integer.h +++ b/Number_types/include/CGAL/leda_integer.h @@ -45,7 +45,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template<> @@ -278,7 +278,7 @@ class Benchmark_rep< leda_integer > { }; -CGAL_END_NAMESPACE +} //namespace CGAL // Unary + is missing for leda::integer namespace leda { diff --git a/Number_types/include/CGAL/leda_rational.h b/Number_types/include/CGAL/leda_rational.h index 6e0909072d6f..12c12810e68f 100644 --- a/Number_types/include/CGAL/leda_rational.h +++ b/Number_types/include/CGAL/leda_rational.h @@ -53,7 +53,7 @@ #include // for GCD in Fraction_traits -CGAL_BEGIN_NAMESPACE +namespace CGAL { template <> class Algebraic_structure_traits< leda_rational > : public Algebraic_structure_traits_base< leda_rational, @@ -279,7 +279,7 @@ class Benchmark_rep< leda_rational > { }; -CGAL_END_NAMESPACE +} //namespace CGAL // Unary + is missing for leda::rational namespace leda{ diff --git a/Number_types/include/CGAL/leda_real.h b/Number_types/include/CGAL/leda_real.h index 2f10e057bd28..9902a7ae52e3 100644 --- a/Number_types/include/CGAL/leda_real.h +++ b/Number_types/include/CGAL/leda_real.h @@ -44,7 +44,7 @@ #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { template <> class Algebraic_structure_traits< leda_real > @@ -242,7 +242,7 @@ class Output_rep< ::leda::real, CGAL::Parens_as_product_tag > { -CGAL_END_NAMESPACE +} //namespace CGAL // Unary + is missing for leda::real diff --git a/Number_types/include/CGAL/long_double.h b/Number_types/include/CGAL/long_double.h index aae7cd366e52..694829dcb074 100644 --- a/Number_types/include/CGAL/long_double.h +++ b/Number_types/include/CGAL/long_double.h @@ -35,7 +35,7 @@ // #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Is_valid moved to top, since used by is_finite #ifdef CGAL_CFG_IEEE_754_BUG @@ -160,6 +160,6 @@ template <> class Real_embeddable_traits< long double > }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LONG_DOUBLE_H diff --git a/Number_types/include/CGAL/long_long.h b/Number_types/include/CGAL/long_long.h index f987f2ecbca5..17d14595e85c 100644 --- a/Number_types/include/CGAL/long_long.h +++ b/Number_types/include/CGAL/long_long.h @@ -30,7 +30,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template<> class Algebraic_structure_traits< long long int > : public Algebraic_structure_traits_base< long long int, @@ -86,7 +86,7 @@ typedef unsigned long long int UInteger64; #define CGAL_HAS_INTEGER64 #endif -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Number_types/include/CGAL/mpq_class.h b/Number_types/include/CGAL/mpq_class.h index fb2bf4549f40..74a0db8291b1 100644 --- a/Number_types/include/CGAL/mpq_class.h +++ b/Number_types/include/CGAL/mpq_class.h @@ -41,7 +41,7 @@ BOOST_STATIC_ASSERT( \ (::boost::is_same< ::__gmp_expr< T , T >,Type>::value )); -CGAL_BEGIN_NAMESPACE +namespace CGAL { // AST for mpq_class @@ -260,7 +260,7 @@ class Fraction_traits< mpq_class > { }; }; -CGAL_END_NAMESPACE +} //namespace CGAL #undef CGAL_CHECK_GMP_EXPR diff --git a/Number_types/include/CGAL/mpz_class.h b/Number_types/include/CGAL/mpz_class.h index 5eac32ad8313..84e825dc99a8 100644 --- a/Number_types/include/CGAL/mpz_class.h +++ b/Number_types/include/CGAL/mpz_class.h @@ -43,7 +43,7 @@ BOOST_STATIC_ASSERT( \ (::boost::is_same< ::__gmp_expr< T , T >,Type>::value )); -CGAL_BEGIN_NAMESPACE +namespace CGAL { // AST for mpz_class @@ -318,7 +318,7 @@ struct Split_double } }; -CGAL_END_NAMESPACE +} //namespace CGAL #undef CGAL_CHECK_GMP_EXPR diff --git a/Number_types/include/CGAL/simplest_rational_in_interval.h b/Number_types/include/CGAL/simplest_rational_in_interval.h index 9bf73e09dd61..f5234de0757f 100644 --- a/Number_types/include/CGAL/simplest_rational_in_interval.h +++ b/Number_types/include/CGAL/simplest_rational_in_interval.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /* simplest_rational_in_interval(x,y) returns the rational number with the smallest denominator in the interval [x,y]. See Knuth, @@ -106,6 +106,6 @@ simplest_rational_in_interval(double x, double y) { return Compose()(r_numerator, r_denominator); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SIMPLEST_RATIONAL_IN_INTERVAL_H diff --git a/Number_types/include/CGAL/to_rational.h b/Number_types/include/CGAL/to_rational.h index aba7c14d6e63..111f8e7aabd5 100644 --- a/Number_types/include/CGAL/to_rational.h +++ b/Number_types/include/CGAL/to_rational.h @@ -29,7 +29,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template Rational @@ -89,6 +89,6 @@ to_rational(double x) return compose(num,den); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TO_RATIONAL_H diff --git a/Number_types/include/CGAL/utils.h b/Number_types/include/CGAL/utils.h index 82addbbf40b9..dea6f019692e 100644 --- a/Number_types/include/CGAL/utils.h +++ b/Number_types/include/CGAL/utils.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // use Min template< class T > @@ -57,6 +57,6 @@ inline bool is_valid( const T& x ) { return Is_valid< T >()( x ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_UTILS_H diff --git a/Number_types/include/CGAL/utils_classes.h b/Number_types/include/CGAL/utils_classes.h index 7a7fe8a73eaa..3dc76d4ff64c 100644 --- a/Number_types/include/CGAL/utils_classes.h +++ b/Number_types/include/CGAL/utils_classes.h @@ -19,7 +19,7 @@ #define CGAL_UTILS_CLASSES_H #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class A, class B = A > struct Equal_to : public std::binary_function< A, B, bool > { @@ -86,6 +86,6 @@ class Is_valid }; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_UTILS_CLASSES_H diff --git a/Number_types/src/CGAL/Interval_arithmetic.cpp b/Number_types/src/CGAL/Interval_arithmetic.cpp index 061fbc80c04d..4e467daca81c 100644 --- a/Number_types/src/CGAL/Interval_arithmetic.cpp +++ b/Number_types/src/CGAL/Interval_arithmetic.cpp @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #ifdef CGAL_CFG_DENORMALS_COMPILE_BUG // For compilers which bug on denormalized values at compile time. @@ -53,4 +53,4 @@ int dummy_symbol_for_stopping_VC_linker_warning; } // namespace #endif -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Number_types/src/CGAL/MP_Float.cpp b/Number_types/src/CGAL/MP_Float.cpp index e83ccc4ed059..8adf4816474b 100644 --- a/Number_types/src/CGAL/MP_Float.cpp +++ b/Number_types/src/CGAL/MP_Float.cpp @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { using std::pair; @@ -524,4 +524,4 @@ operator>> (std::istream & is, MP_Float &b) return is; } -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Number_types/test/Number_types/Sqrt_extension.cpp b/Number_types/test/Number_types/Sqrt_extension.cpp index 26b86888aae0..ef35f423f46e 100644 --- a/Number_types/test/Number_types/Sqrt_extension.cpp +++ b/Number_types/test/Number_types/Sqrt_extension.cpp @@ -13,7 +13,7 @@ #include // TODO: Included from EXACUS/NumeriX/include/NiX/number_type_utils.h -CGAL_BEGIN_NAMESPACE +namespace CGAL { template inline void convert_to(const NT& x, RT& r){ @@ -22,7 +22,7 @@ void convert_to(const NT& x, RT& r){ BOOST_STATIC_ASSERT((::boost::is_same::value)); r = typename CT::Cast()(x); } -CGAL_END_NAMESPACE +} //namespace CGAL // end included from number_type_utils.h template diff --git a/Number_types/test/Number_types/include/CGAL/_test_utilities.h b/Number_types/test/Number_types/include/CGAL/_test_utilities.h index abab9309c10f..505ab44d72f2 100644 --- a/Number_types/test/Number_types/include/CGAL/_test_utilities.h +++ b/Number_types/test/Number_types/include/CGAL/_test_utilities.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Used to shut down some warnings about unused variables. template < class T > @@ -377,6 +377,6 @@ test_utilities(const NT& x) return true; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_2.h b/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_2.h index 8d3fc896f4ef..f94c900efb51 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_2.h +++ b/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_2.h @@ -26,7 +26,7 @@ -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declarations // ================== @@ -123,7 +123,7 @@ class Access_coordinates_begin_2 { operator() ( const Point& p) const { return Coordinate_iterator( p); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_OPTIMISATION_ACCESS_COORDINATES_BEGIN_2_H diff --git a/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_3.h b/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_3.h index 76504f3eeb8e..0ab13b672eda 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_3.h +++ b/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_3.h @@ -26,7 +26,7 @@ -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declarations // ================== @@ -123,7 +123,7 @@ class Access_coordinates_begin_3 { operator() ( const Point& p) const { return Coordinate_iterator( p); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_OPTIMISATION_ACCESS_COORDINATES_BEGIN_3_H diff --git a/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_d.h b/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_d.h index 3343bc18e2ea..e9d6aeac3412 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_d.h +++ b/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_d.h @@ -25,7 +25,7 @@ #define CGAL_OPTIMISATION_ACCESS_COORDINATES_BEGIN_D_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Cartesian_tag; class Homogeneous_tag; @@ -74,7 +74,7 @@ class Access_coordinates_begin_d { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_OPTIMISATION_ACCESS_COORDINATES_BEGIN_D_H diff --git a/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_2.h b/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_2.h index 3923ba4c445b..a110ee57281f 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_2.h +++ b/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_2.h @@ -26,7 +26,7 @@ -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declaration // ================= @@ -56,7 +56,7 @@ class Access_dimension_2 { int operator() ( const Point& p) const { return p.dimension(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_OPTIMISATION_ACCESS_DIMENSION_2_H diff --git a/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_3.h b/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_3.h index 657242319909..9df8fb4c9905 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_3.h +++ b/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_3.h @@ -24,7 +24,7 @@ #ifndef CGAL_OPTIMISATION_ACCESS_DIMENSION_3_H #define CGAL_OPTIMISATION_ACCESS_DIMENSION_3_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declaration // ================= @@ -54,7 +54,7 @@ class Access_dimension_3 { int operator() ( const Point& p) const { return p.dimension(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_OPTIMISATION_ACCESS_DIMENSION_3_H diff --git a/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_d.h b/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_d.h index 405c8b9f0b2a..d9fa583daae9 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_d.h +++ b/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_d.h @@ -24,7 +24,7 @@ #ifndef CGAL_OPTIMISATION_ACCESS_DIMENSION_D_H #define CGAL_OPTIMISATION_ACCESS_DIMENSION_D_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declaration // ================= @@ -54,7 +54,7 @@ class Access_dimension_d { int operator() ( const Point& p) const { return p.dimension(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_OPTIMISATION_ACCESS_DIMENSION_D_H diff --git a/Optimisation_basic/include/CGAL/Optimisation/Construct_point_2.h b/Optimisation_basic/include/CGAL/Optimisation/Construct_point_2.h index ea5e0f9745d0..351c1d2f27a2 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/Construct_point_2.h +++ b/Optimisation_basic/include/CGAL/Optimisation/Construct_point_2.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declaration // ================= @@ -70,7 +70,7 @@ class _Construct_point_2 { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_OPTIMISATION_CONSTRUCT_POINT_2_H diff --git a/Optimisation_basic/include/CGAL/Optimisation/Construct_point_3.h b/Optimisation_basic/include/CGAL/Optimisation/Construct_point_3.h index 9df1819509cc..2ca513a78104 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/Construct_point_3.h +++ b/Optimisation_basic/include/CGAL/Optimisation/Construct_point_3.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declaration // ================= @@ -72,7 +72,7 @@ class _Construct_point_3 { }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_OPTIMISATION_CONSTRUCT_POINT_3_H diff --git a/Optimisation_basic/include/CGAL/Optimisation/Construct_point_d.h b/Optimisation_basic/include/CGAL/Optimisation/Construct_point_d.h index ea471137e22a..beebaef07cca 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/Construct_point_d.h +++ b/Optimisation_basic/include/CGAL/Optimisation/Construct_point_d.h @@ -28,7 +28,7 @@ # include # include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declaration // ================= @@ -61,7 +61,7 @@ class _Construct_point_d { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_OPTIMISATION_CONSTRUCT_POINT_D_H diff --git a/Optimisation_basic/include/CGAL/Optimisation/basic.h b/Optimisation_basic/include/CGAL/Optimisation/basic.h index 80676224b6ea..9b4a5bb1e6a5 100644 --- a/Optimisation_basic/include/CGAL/Optimisation/basic.h +++ b/Optimisation_basic/include/CGAL/Optimisation/basic.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Function declarations // ===================== @@ -47,6 +47,6 @@ _optimisation_is_valid_fail( CGAL::Verbose_ostream& verr, verr << " object is NOT valid!" << std::endl; return false; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_OPTIMISATION_BASIC_H diff --git a/Optimisation_basic/include/CGAL/Optimisation_d_traits_2.h b/Optimisation_basic/include/CGAL/Optimisation_d_traits_2.h index f0cafcd600f5..2ed091f36d9c 100644 --- a/Optimisation_basic/include/CGAL/Optimisation_d_traits_2.h +++ b/Optimisation_basic/include/CGAL/Optimisation_d_traits_2.h @@ -29,7 +29,7 @@ # include # include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declaration // ================= @@ -83,7 +83,7 @@ class Optimisation_d_traits_2 { { return Construct_point_d(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_OPTIMISATION_D_TRAITS_2_H diff --git a/Optimisation_basic/include/CGAL/Optimisation_d_traits_3.h b/Optimisation_basic/include/CGAL/Optimisation_d_traits_3.h index 0d9a134eb736..6ce4210966ab 100644 --- a/Optimisation_basic/include/CGAL/Optimisation_d_traits_3.h +++ b/Optimisation_basic/include/CGAL/Optimisation_d_traits_3.h @@ -29,7 +29,7 @@ # include # include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declaration // ================= @@ -83,7 +83,7 @@ class Optimisation_d_traits_3 { { return Construct_point_d(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_OPTIMISATION_D_TRAITS_3_H diff --git a/Optimisation_basic/include/CGAL/Optimisation_d_traits_d.h b/Optimisation_basic/include/CGAL/Optimisation_d_traits_d.h index 875626638712..fb83a600700f 100644 --- a/Optimisation_basic/include/CGAL/Optimisation_d_traits_d.h +++ b/Optimisation_basic/include/CGAL/Optimisation_d_traits_d.h @@ -29,7 +29,7 @@ # include # include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declaration // ================= @@ -81,7 +81,7 @@ class Optimisation_d_traits_d { { return Construct_point_d(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_OPTIMISATION_D_TRAITS_D_H diff --git a/PDB/include/CGAL/PDB/small_map.h b/PDB/include/CGAL/PDB/small_map.h index 75f666defdd9..4071619feca9 100644 --- a/PDB/include/CGAL/PDB/small_map.h +++ b/PDB/include/CGAL/PDB/small_map.h @@ -92,13 +92,13 @@ bool operator< (const K& k, const small_map_value_type& sm) /*}} -CGAL_BEGIN_NAMESPACE +namespace CGAL { template CGAL::Comparison_result compare(const PDB::small_map_value_type &a, const PDB::small_map_value_type &b) { return CGAL::compare(a.key(), b.key()); } -CGAL_END_NAMESPACE +} //namespace CGAL namespace CGAL { namespace PDB {*/ /*template diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_Delaunay_triangulation_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_Delaunay_triangulation_3.h index 2e2664a4b719..48653b111dae 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_Delaunay_triangulation_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_Delaunay_triangulation_3.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Gt, class Tds = Triangulation_data_structure_3 < @@ -1236,6 +1236,6 @@ struct Periodic_3_Delaunay_triangulation_3::Vertex_remover }; #endif //CGAL_CFG_OUTOFLINE_TEMPLATE_MEMBER_DEFINITION_BUG -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PERIODIC_3_DELAUNAY_TRIANGULATION_3_H diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_offset_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_offset_3.h index c63d739400e8..1cb44b5edc26 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_offset_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_offset_3.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Periodic_3_offset_3 { template @@ -136,6 +136,6 @@ inline std::istream return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PERIODIC_3_OFFSET_H diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h index e2d5d96cf66d..d94161f21e57 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h @@ -51,7 +51,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class GT, class TDS > class Periodic_3_triangulation_3; @@ -3879,6 +3879,6 @@ operator!=(const Periodic_3_triangulation_3 &t1, return ! (t1 == t2); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PERIODIC_3_TRIANGULATION_3_H diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_ds_cell_base_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_ds_cell_base_3.h index ff83423774b5..1892c8a319cd 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_ds_cell_base_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_ds_cell_base_3.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename TDS = void > class Periodic_3_triangulation_ds_cell_base_3 @@ -307,6 +307,6 @@ class Periodic_3_triangulation_ds_cell_base_3 }; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PERIODIC_3_TRIANGULATION_DS_CELL_BASE_3_H diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_ds_vertex_base_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_ds_vertex_base_3.h index 2d4377879e4f..c902311e8ede 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_ds_vertex_base_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_ds_vertex_base_3.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename TDS = void > class Periodic_3_triangulation_ds_vertex_base_3 @@ -120,6 +120,6 @@ class Periodic_3_triangulation_ds_vertex_base_3 }; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PERIODIC_3_TRIANGULATION_DS_VERTEX_BASE_3_H diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_filtered_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_filtered_traits_3.h index 45bc755b44da..062db7c86227 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_filtered_traits_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_filtered_traits_3.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // This template class is a wrapper that implements the filtering for any // predicate (dynamic filters with IA). @@ -566,11 +566,11 @@ class Periodic_3_triangulation_filtered_traits_base_3 Approximate_iso_cuboid_3 _domain_f; }; -CGAL_END_NAMESPACE +} //namespace CGAL #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename K > class Periodic_3_triangulation_filtered_traits_3 @@ -578,6 +578,6 @@ class Periodic_3_triangulation_filtered_traits_3 Periodic_3_triangulation_filtered_traits_base_3 > { }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PERIODIC_3_TRIANGULATION_FILTERED_TRAITS_3_H diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_hierarchy_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_hierarchy_3.h index 3ce991711234..f158a81ce19b 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_hierarchy_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_hierarchy_3.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class PTr > class Periodic_3_triangulation_hierarchy_3 @@ -525,6 +525,6 @@ random_level() return std::min(die()-1, level_mult_cover); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PERIODIC_3_TRIANGULATION_HIERARCHY_3_H diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_iterators_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_iterators_3.h index 3f1af110c326..fd02451bfe1b 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_iterators_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_iterators_3.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class T > class Periodic_3_triangulation_tetrahedron_iterator_3 { @@ -1070,6 +1070,6 @@ class Periodic_3_triangulation_unique_vertex_iterator_3 operator Vertex_handle() const { return Base::base(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PERIODIC_3_TRIANGULATION_ITERATORS_3_H diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_remove_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_remove_traits_3.h index 75b803ca275c..09327dcb652b 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_remove_traits_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_remove_traits_3.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Traits_, class Predicate_ > class Point_offset_adaptor { @@ -128,6 +128,6 @@ class Periodic_3_triangulation_remove_traits_3 : public P3DTTraits::K PT _pt; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PERIODIC_3_TRIANGULATION_REMOVE_TRAITS_3_H diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_statically_filtered_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_statically_filtered_traits_3.h index df728cd99995..bec68a18b877 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_statically_filtered_traits_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_statically_filtered_traits_3.h @@ -41,7 +41,7 @@ // TODO : // - add more predicates : -CGAL_BEGIN_NAMESPACE +namespace CGAL { // The K_base argument is supposed to provide exact primitives. template < typename Traits > @@ -70,6 +70,6 @@ class Periodic_3_triangulation_statically_filtered_traits_3 : public Traits } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PERIODIC_3_TRIANGULATION_STATICALLY_FILTERED_TRAITS_3_H diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_traits_3.h index 371f7202c38b..ec024526a52b 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_traits_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_traits_3.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class K, class Predicate_ > class Traits_with_offsets_adaptor { @@ -244,13 +244,13 @@ class Periodic_3_triangulation_traits_base_3 template < typename K, typename Off = CGAL::Periodic_3_offset_3 > class Periodic_3_triangulation_traits_3; -CGAL_END_NAMESPACE +} //namespace CGAL // Partial specialization for Filtered_kernel. #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // This declaration is needed to break the cyclic dependency. template < typename K > @@ -270,6 +270,6 @@ class Periodic_3_triangulation_traits_3 : public Periodic_3_triangulation_traits_base_3 {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PERIODIC_3_TRIANGULATION_TRAITS_3_H diff --git a/Point_set_2/include/CGAL/Point_set_2.h b/Point_set_2/include/CGAL/Point_set_2.h index fcbf7c3b9ed0..15a45e4a7fbb 100644 --- a/Point_set_2/include/CGAL/Point_set_2.h +++ b/Point_set_2/include/CGAL/Point_set_2.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template > > class Point_set_2 : public Delaunay_triangulation_2 @@ -439,7 +439,7 @@ class Point_set_2 : public Delaunay_triangulation_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Point_set_2/include/CGAL/compare_vertices.h b/Point_set_2/include/CGAL/compare_vertices.h index 3ec12dce28b6..e3166b20c5f8 100644 --- a/Point_set_2/include/CGAL/compare_vertices.h +++ b/Point_set_2/include/CGAL/compare_vertices.h @@ -20,7 +20,7 @@ #ifndef CGAL_COMPARE_VERTICES_H #define CGAL_COMPARE_VERTICES_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -45,6 +45,6 @@ class compare_vertices { } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_COMPARE_VERTICES_H diff --git a/Point_set_2/include/CGAL/nearest_neighbor_delaunay_2.h b/Point_set_2/include/CGAL/nearest_neighbor_delaunay_2.h index 44c9421cc8d0..7ef7f6ca9b51 100644 --- a/Point_set_2/include/CGAL/nearest_neighbor_delaunay_2.h +++ b/Point_set_2/include/CGAL/nearest_neighbor_delaunay_2.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { @@ -255,6 +255,6 @@ void nearest_neighbors_list(const Dt& delau, typename Dt::Vertex_handle v, int k } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Point_set_2/include/CGAL/range_search_delaunay_2.h b/Point_set_2/include/CGAL/range_search_delaunay_2.h index 54620280cbd3..2f7bbbfcc4f6 100644 --- a/Point_set_2/include/CGAL/range_search_delaunay_2.h +++ b/Point_set_2/include/CGAL/range_search_delaunay_2.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // was // std::map > @@ -445,6 +445,6 @@ OutputIterator range_search(Dt& delau, -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Point_set_processing_3/include/CGAL/IO/read_off_points.h b/Point_set_processing_3/include/CGAL/IO/read_off_points.h index c1a829e41cd0..3dcb9e37e661 100644 --- a/Point_set_processing_3/include/CGAL/IO/read_off_points.h +++ b/Point_set_processing_3/include/CGAL/IO/read_off_points.h @@ -34,7 +34,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //=================================================================================== @@ -266,6 +266,6 @@ read_off_points( /// @endcond -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_READ_OFF_POINTS_H diff --git a/Point_set_processing_3/include/CGAL/IO/read_xyz_points.h b/Point_set_processing_3/include/CGAL/IO/read_xyz_points.h index 8752af048548..2f7e73be236b 100644 --- a/Point_set_processing_3/include/CGAL/IO/read_xyz_points.h +++ b/Point_set_processing_3/include/CGAL/IO/read_xyz_points.h @@ -34,7 +34,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //=================================================================================== @@ -255,6 +255,6 @@ read_xyz_points( /// @endcond -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_READ_XYZ_POINTS_H diff --git a/Point_set_processing_3/include/CGAL/IO/write_off_points.h b/Point_set_processing_3/include/CGAL/IO/write_off_points.h index f250b9a0a7e3..1bc3de2ab24a 100644 --- a/Point_set_processing_3/include/CGAL/IO/write_off_points.h +++ b/Point_set_processing_3/include/CGAL/IO/write_off_points.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //=================================================================================== @@ -233,6 +233,6 @@ write_off_points( /// @endcond -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_WRITE_OFF_POINTS_H diff --git a/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h b/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h index 2d02f5152ec1..4804c6e6a20e 100644 --- a/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h +++ b/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //=================================================================================== @@ -223,6 +223,6 @@ write_xyz_points( /// @endcond -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_WRITE_XYZ_POINTS_H diff --git a/Point_set_processing_3/include/CGAL/Point_with_normal_3.h b/Point_set_processing_3/include/CGAL/Point_with_normal_3.h index b7fcd41d30ff..379838fe01f8 100644 --- a/Point_set_processing_3/include/CGAL/Point_with_normal_3.h +++ b/Point_set_processing_3/include/CGAL/Point_with_normal_3.h @@ -32,7 +32,7 @@ #include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// The Point_with_normal_3 class represents a 3D point with: @@ -170,7 +170,7 @@ make_normal_of_point_with_normal_pmap(Iter) } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_POINT_WITH_NORMAL_3_H diff --git a/Point_set_processing_3/include/CGAL/Search_traits_vertex_handle_3.h b/Point_set_processing_3/include/CGAL/Search_traits_vertex_handle_3.h index 9f90aa951319..55ecdd8ee315 100644 --- a/Point_set_processing_3/include/CGAL/Search_traits_vertex_handle_3.h +++ b/Point_set_processing_3/include/CGAL/Search_traits_vertex_handle_3.h @@ -21,7 +21,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// A Point_vertex_handle_3 objects wraps either @@ -182,6 +182,6 @@ class Search_traits_vertex_handle_3 {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEARCH_TRAITS_VERTEX_HANDLE_3_H diff --git a/Point_set_processing_3/include/CGAL/compute_average_spacing.h b/Point_set_processing_3/include/CGAL/compute_average_spacing.h index 317bba751c72..d952471ea922 100644 --- a/Point_set_processing_3/include/CGAL/compute_average_spacing.h +++ b/Point_set_processing_3/include/CGAL/compute_average_spacing.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ---------------------------------------------------------------------------- @@ -201,7 +201,7 @@ compute_average_spacing( /// @endcond -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_AVERAGE_SPACING_3_H diff --git a/Point_set_processing_3/include/CGAL/grid_simplify_point_set.h b/Point_set_processing_3/include/CGAL/grid_simplify_point_set.h index 191291e95f8d..518056cf833c 100644 --- a/Point_set_processing_3/include/CGAL/grid_simplify_point_set.h +++ b/Point_set_processing_3/include/CGAL/grid_simplify_point_set.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ---------------------------------------------------------------------------- @@ -214,6 +214,6 @@ grid_simplify_point_set( /// @endcond -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_GRID_SIMPLIFY_POINT_SET_H diff --git a/Point_set_processing_3/include/CGAL/improved_jet_smooth_point_set.h b/Point_set_processing_3/include/CGAL/improved_jet_smooth_point_set.h index b37826305c1a..f2b8159ba1a8 100644 --- a/Point_set_processing_3/include/CGAL/improved_jet_smooth_point_set.h +++ b/Point_set_processing_3/include/CGAL/improved_jet_smooth_point_set.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ---------------------------------------------------------------------------- @@ -348,6 +348,6 @@ improved_jet_smooth_point_set( /// @endcond -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IMPROVED_JET_SMOOTH_POINT_SET_H diff --git a/Point_set_processing_3/include/CGAL/improved_laplacian_smooth_point_set.h b/Point_set_processing_3/include/CGAL/improved_laplacian_smooth_point_set.h index e919a924eef9..6abd7238fef8 100644 --- a/Point_set_processing_3/include/CGAL/improved_laplacian_smooth_point_set.h +++ b/Point_set_processing_3/include/CGAL/improved_laplacian_smooth_point_set.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ---------------------------------------------------------------------------- @@ -330,6 +330,6 @@ improved_laplacian_smooth_point_set( /// @endcond -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IMPROVED_LAPLACIAN_SMOOTH_POINT_SET_H diff --git a/Point_set_processing_3/include/CGAL/jet_estimate_normals.h b/Point_set_processing_3/include/CGAL/jet_estimate_normals.h index 62d6d7d61d6d..9f20bbceec58 100644 --- a/Point_set_processing_3/include/CGAL/jet_estimate_normals.h +++ b/Point_set_processing_3/include/CGAL/jet_estimate_normals.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ---------------------------------------------------------------------------- @@ -238,6 +238,6 @@ jet_estimate_normals( /// @endcond -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_JET_ESTIMATE_NORMALS_H diff --git a/Point_set_processing_3/include/CGAL/jet_smooth_point_set.h b/Point_set_processing_3/include/CGAL/jet_smooth_point_set.h index ac6548828392..d4f431939f5a 100644 --- a/Point_set_processing_3/include/CGAL/jet_smooth_point_set.h +++ b/Point_set_processing_3/include/CGAL/jet_smooth_point_set.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ---------------------------------------------------------------------------- @@ -217,7 +217,7 @@ jet_smooth_point_set( /// @endcond -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_JET_SMOOTH_POINT_SET_H diff --git a/Point_set_processing_3/include/CGAL/mst_orient_normals.h b/Point_set_processing_3/include/CGAL/mst_orient_normals.h index 310a0d57a635..4314c0f65453 100644 --- a/Point_set_processing_3/include/CGAL/mst_orient_normals.h +++ b/Point_set_processing_3/include/CGAL/mst_orient_normals.h @@ -42,7 +42,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ---------------------------------------------------------------------------- @@ -668,6 +668,6 @@ mst_orient_normals( /// @endcond -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MST_ORIENT_NORMALS_H diff --git a/Point_set_processing_3/include/CGAL/pca_estimate_normals.h b/Point_set_processing_3/include/CGAL/pca_estimate_normals.h index c6fcbdf429b2..700c98b7e66d 100644 --- a/Point_set_processing_3/include/CGAL/pca_estimate_normals.h +++ b/Point_set_processing_3/include/CGAL/pca_estimate_normals.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ---------------------------------------------------------------------------- @@ -228,6 +228,6 @@ pca_estimate_normals( /// @endcond -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PCA_ESTIMATE_NORMALS_H diff --git a/Point_set_processing_3/include/CGAL/pca_smooth_point_set.h b/Point_set_processing_3/include/CGAL/pca_smooth_point_set.h index b605594113fb..f161ea2c27c6 100644 --- a/Point_set_processing_3/include/CGAL/pca_smooth_point_set.h +++ b/Point_set_processing_3/include/CGAL/pca_smooth_point_set.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ---------------------------------------------------------------------------- @@ -205,6 +205,6 @@ pca_smooth_point_set( /// @endcond -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PCA_SMOOTH_POINT_SET_H diff --git a/Point_set_processing_3/include/CGAL/radial_orient_normals.h b/Point_set_processing_3/include/CGAL/radial_orient_normals.h index 51a7024002b5..9dd6761a33a9 100644 --- a/Point_set_processing_3/include/CGAL/radial_orient_normals.h +++ b/Point_set_processing_3/include/CGAL/radial_orient_normals.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// Radial orientation of the [first, beyond) range of points. @@ -166,6 +166,6 @@ radial_orient_normals( /// @endcond -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_RADIAL_ORIENT_NORMALS_H diff --git a/Point_set_processing_3/include/CGAL/random_simplify_point_set.h b/Point_set_processing_3/include/CGAL/random_simplify_point_set.h index dd4e24060377..ea72218a0701 100644 --- a/Point_set_processing_3/include/CGAL/random_simplify_point_set.h +++ b/Point_set_processing_3/include/CGAL/random_simplify_point_set.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// Randomly deletes a user-specified fraction of the input points. @@ -112,6 +112,6 @@ random_simplify_point_set( /// @endcond -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_RANDOM_SIMPLIFY_POINT_SET_H diff --git a/Point_set_processing_3/include/CGAL/remove_outliers.h b/Point_set_processing_3/include/CGAL/remove_outliers.h index 02fb0044962e..5667bfa5421b 100644 --- a/Point_set_processing_3/include/CGAL/remove_outliers.h +++ b/Point_set_processing_3/include/CGAL/remove_outliers.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ---------------------------------------------------------------------------- @@ -238,6 +238,6 @@ remove_outliers( /// @endcond -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_REMOVE_OUTLIERS_H diff --git a/Point_set_processing_3/include/CGAL/remove_outliers_wrt_median_knn_sq_distance.h b/Point_set_processing_3/include/CGAL/remove_outliers_wrt_median_knn_sq_distance.h index a3b8d8d8f192..c020c27879b5 100644 --- a/Point_set_processing_3/include/CGAL/remove_outliers_wrt_median_knn_sq_distance.h +++ b/Point_set_processing_3/include/CGAL/remove_outliers_wrt_median_knn_sq_distance.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ---------------------------------------------------------------------------- @@ -235,6 +235,6 @@ remove_outliers_wrt_median_knn_sq_distance( /// @endcond -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_REMOVE_OUTLIERS_WRT_MEDIAN_KNN_SQ_DISTANCE_H diff --git a/Point_set_processing_3/include/CGAL/value_type_traits.h b/Point_set_processing_3/include/CGAL/value_type_traits.h index 2c15680072b0..dc97839e675e 100644 --- a/Point_set_processing_3/include/CGAL/value_type_traits.h +++ b/Point_set_processing_3/include/CGAL/value_type_traits.h @@ -21,7 +21,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// Traits class to get the value type of any iterator, @@ -45,6 +45,6 @@ struct value_type_traits > }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VALUE_TYPE_TRAITS_H diff --git a/Polygon/include/CGAL/Polygon_2.h b/Polygon/include/CGAL/Polygon_2.h index 7f3b50f72355..919b556d26d5 100644 --- a/Polygon/include/CGAL/Polygon_2.h +++ b/Polygon/include/CGAL/Polygon_2.h @@ -40,7 +40,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template > @@ -385,11 +385,11 @@ std::ostream // implementation //-----------------------------------------------------------------------// -CGAL_END_NAMESPACE +} //namespace CGAL #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template inline @@ -400,6 +400,6 @@ operator!=(const Polygon_2 &x, return !(x==y); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Polygon/include/CGAL/Polygon_2/Polygon_2_algorithms_impl.h b/Polygon/include/CGAL/Polygon_2/Polygon_2_algorithms_impl.h index c96d3fb7eff7..72aa1db6a29d 100644 --- a/Polygon/include/CGAL/Polygon_2/Polygon_2_algorithms_impl.h +++ b/Polygon/include/CGAL/Polygon_2/Polygon_2_algorithms_impl.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //-----------------------------------------------------------------------// @@ -436,4 +436,4 @@ Orientation orientation_2(ForwardIterator first, return traits.orientation_2_object()(*prev, *i, *next); } -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_circulator.h b/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_circulator.h index d8b8fd662fd2..77ab5fc0ec73 100644 --- a/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_circulator.h +++ b/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_circulator.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Polygon_2; @@ -219,6 +219,6 @@ value_type(const Polygon_2_const_edge_circulator<_Traits,_Container>&) // { return a+n; } //--------------------------------------------------------------------// -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_iterator.h b/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_iterator.h index a600409e8d49..b863fee551fe 100644 --- a/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_iterator.h +++ b/Polygon/include/CGAL/Polygon_2/Polygon_2_edge_iterator.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Polygon_2; @@ -191,6 +191,6 @@ value_type(const Polygon_2_edge_iterator&) // { return a+n; } //--------------------------------------------------------------------// -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Polygon/include/CGAL/Polygon_2/Polygon_2_impl.h b/Polygon/include/CGAL/Polygon_2/Polygon_2_impl.h index 47f58ea93057..6d35e32340fb 100644 --- a/Polygon/include/CGAL/Polygon_2/Polygon_2_impl.h +++ b/Polygon/include/CGAL/Polygon_2/Polygon_2_impl.h @@ -25,7 +25,7 @@ // operator== //-----------------------------------------------------------------------// -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace i_polygon { template @@ -155,4 +155,4 @@ transform(const Transformation& t, const Polygon_2& p) return result; } -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Polygon/include/CGAL/Polygon_2_algorithms.h b/Polygon/include/CGAL/Polygon_2_algorithms.h index 8914f196c6db..d4b7957fdca2 100644 --- a/Polygon/include/CGAL/Polygon_2_algorithms.h +++ b/Polygon/include/CGAL/Polygon_2_algorithms.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //-----------------------------------------------------------------------// // algorithms for sequences of 2D points @@ -265,7 +265,7 @@ Orientation orientation_2(ForwardIterator first, return orientation_2(first, last, K()); } -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Polygon/include/CGAL/Polygon_traits_2.h b/Polygon/include/CGAL/Polygon_traits_2.h index c45c5cba9d25..14f7a25afa5f 100644 --- a/Polygon/include/CGAL/Polygon_traits_2.h +++ b/Polygon/include/CGAL/Polygon_traits_2.h @@ -28,11 +28,11 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Polygon_traits_2 : public R_ {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYGON_TRAITS_2_H diff --git a/Polyhedron/include/CGAL/Polyhedron_3.h b/Polyhedron/include/CGAL/Polyhedron_3.h index 876b29ff37e4..54198ae538d5 100644 --- a/Polyhedron/include/CGAL/Polyhedron_3.h +++ b/Polyhedron/include/CGAL/Polyhedron_3.h @@ -36,7 +36,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class I_Polyhedron_vertex : public VertexBase { @@ -1532,6 +1532,6 @@ class Polyhedron_3 { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYHEDRON_3_H // diff --git a/Polyhedron/include/CGAL/Polyhedron_copy_3.h b/Polyhedron/include/CGAL/Polyhedron_copy_3.h index 4abcb039be5f..1c4075784b3a 100644 --- a/Polyhedron/include/CGAL/Polyhedron_copy_3.h +++ b/Polyhedron/include/CGAL/Polyhedron_copy_3.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Poly, class HDS > class Polyhedron_copy_3 : public Modifier_base { @@ -81,6 +81,6 @@ Polyhedron_copy_3:: operator()( HDS& target) { target.normalize_border(); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYHEDRON_COPY_3_H // // EOF // diff --git a/Polyhedron/include/CGAL/Polyhedron_incremental_builder_3.h b/Polyhedron/include/CGAL/Polyhedron_incremental_builder_3.h index 4a9725ff43b5..2aa7e0a5ffb1 100644 --- a/Polyhedron/include/CGAL/Polyhedron_incremental_builder_3.h +++ b/Polyhedron/include/CGAL/Polyhedron_incremental_builder_3.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class HalfedgeDS_> class Polyhedron_incremental_builder_3 { @@ -834,7 +834,7 @@ remove_unconnected_vertices( Tag_true) { return true; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYHEDRON_INCREMENTAL_BUILDER_3_H // // EOF // diff --git a/Polyhedron/include/CGAL/Polyhedron_min_items_3.h b/Polyhedron/include/CGAL/Polyhedron_min_items_3.h index d0d8466a8511..548830c0d73b 100644 --- a/Polyhedron/include/CGAL/Polyhedron_min_items_3.h +++ b/Polyhedron/include/CGAL/Polyhedron_min_items_3.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Polyhedron_min_items_3 { public: @@ -42,6 +42,6 @@ class Polyhedron_min_items_3 { }; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYHEDRON_MIN_ITEMS_3_H // // EOF // diff --git a/Polyhedron/include/CGAL/Polyhedron_traits_3.h b/Polyhedron/include/CGAL/Polyhedron_traits_3.h index 0ff5ffc873b3..9173b24aad56 100644 --- a/Polyhedron/include/CGAL/Polyhedron_traits_3.h +++ b/Polyhedron/include/CGAL/Polyhedron_traits_3.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Kernel_ > class Polyhedron_traits_3 { @@ -45,6 +45,6 @@ class Polyhedron_traits_3 { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYHEDRON_TRAITS_3_H // diff --git a/Polyhedron/include/CGAL/Polyhedron_traits_with_normals_3.h b/Polyhedron/include/CGAL/Polyhedron_traits_with_normals_3.h index 03928312d650..9b9ee034f58e 100644 --- a/Polyhedron/include/CGAL/Polyhedron_traits_with_normals_3.h +++ b/Polyhedron/include/CGAL/Polyhedron_traits_with_normals_3.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Kernel_ > class Polyhedron_traits_with_normals_3 { @@ -46,7 +46,7 @@ class Polyhedron_traits_with_normals_3 { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYHEDRON_TRAITS_WITH_NORMALS_3_H // // EOF // diff --git a/Polyhedron/include/CGAL/polyhedron_cut_plane_3.h b/Polyhedron/include/CGAL/polyhedron_cut_plane_3.h index 9801bb8eafd1..537f520714aa 100644 --- a/Polyhedron/include/CGAL/polyhedron_cut_plane_3.h +++ b/Polyhedron/include/CGAL/polyhedron_cut_plane_3.h @@ -29,7 +29,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Auxiliary classes and functions to make polyhedron_cut_plane_3 work. // See below for the implementations of polyhedron_cut_plane_3. @@ -147,6 +147,6 @@ polyhedron_cut_plane_3( Poly& poly, return polyhedron_cut_plane_3( poly, h, plane, Kernel()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYHEDRON_CUT_PLANE_3_H // // EOF // diff --git a/Polyhedron_IO/examples/Polyhedron_IO/triangulation_print_OFF.h b/Polyhedron_IO/examples/Polyhedron_IO/triangulation_print_OFF.h index 01cfcc8c0b9d..19ad94464f23 100644 --- a/Polyhedron_IO/examples/Polyhedron_IO/triangulation_print_OFF.h +++ b/Polyhedron_IO/examples/Polyhedron_IO/triangulation_print_OFF.h @@ -5,7 +5,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Triang > void @@ -67,7 +67,7 @@ triangulation_print_OFF( std::ostream& out, writer.write_footer(); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_PRINT_OFF_H // // EOF // diff --git a/Polyhedron_IO/include/CGAL/IO/Polyhedron_VRML_2_ostream.h b/Polyhedron_IO/include/CGAL/IO/Polyhedron_VRML_2_ostream.h index 9a76de3f04d0..b8b4b08d6ede 100644 --- a/Polyhedron_IO/include/CGAL/IO/Polyhedron_VRML_2_ostream.h +++ b/Polyhedron_IO/include/CGAL/IO/Polyhedron_VRML_2_ostream.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Traits, class Items, @@ -43,6 +43,6 @@ operator<<( VRML_2_ostream& out, return out; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_POLYHEDRON_VRML_2_OSTREAM_H // // EOF // diff --git a/Polyhedron_IO/include/CGAL/IO/Polyhedron_geomview_ostream.h b/Polyhedron_IO/include/CGAL/IO/Polyhedron_geomview_ostream.h index a234029e6727..b35b6c1974ad 100644 --- a/Polyhedron_IO/include/CGAL/IO/Polyhedron_geomview_ostream.h +++ b/Polyhedron_IO/include/CGAL/IO/Polyhedron_geomview_ostream.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Polyhedron_writer_geomview { Geomview_stream* out; @@ -75,7 +75,7 @@ operator<<( Geomview_stream &gv, return gv; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_POLYHEDRON_GEOMVIEW_OSTREAM_H // // EOF // diff --git a/Polyhedron_IO/include/CGAL/IO/Polyhedron_inventor_ostream.h b/Polyhedron_IO/include/CGAL/IO/Polyhedron_inventor_ostream.h index 6421c6d32d44..fc076234cac3 100644 --- a/Polyhedron_IO/include/CGAL/IO/Polyhedron_inventor_ostream.h +++ b/Polyhedron_IO/include/CGAL/IO/Polyhedron_inventor_ostream.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Traits, class Items, @@ -41,6 +41,6 @@ operator<<( Inventor_ostream_base& out, return out; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_POLYHEDRON_INVENTOR_OSTREAM_H // // EOF // diff --git a/Polyhedron_IO/include/CGAL/IO/Polyhedron_iostream.h b/Polyhedron_IO/include/CGAL/IO/Polyhedron_iostream.h index 6eff9b398ee3..a1156df19c4b 100644 --- a/Polyhedron_IO/include/CGAL/IO/Polyhedron_iostream.h +++ b/Polyhedron_IO/include/CGAL/IO/Polyhedron_iostream.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Traits, class Items, @@ -55,6 +55,6 @@ std::istream& operator>>(std::istream& in, return in; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_POLYHEDRON_IOSTREAM_H // // EOF // diff --git a/Polyhedron_IO/include/CGAL/IO/Polyhedron_scan_OFF.h b/Polyhedron_IO/include/CGAL/IO/Polyhedron_scan_OFF.h index c6d9f135472a..2dcc10faa259 100644 --- a/Polyhedron_IO/include/CGAL/IO/Polyhedron_scan_OFF.h +++ b/Polyhedron_IO/include/CGAL/IO/Polyhedron_scan_OFF.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class HDS> class Polyhedron_scan_OFF : public Modifier_base { @@ -138,6 +138,6 @@ Polyhedron_scan_OFF:: operator()( HDS& target) { B.end_surface(); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_POLYHEDRON_SCAN_OFF_H // // EOF // diff --git a/Polyhedron_IO/include/CGAL/IO/generic_print_polyhedron.h b/Polyhedron_IO/include/CGAL/IO/generic_print_polyhedron.h index 9322fcf14670..873ec96b7573 100644 --- a/Polyhedron_IO/include/CGAL/IO/generic_print_polyhedron.h +++ b/Polyhedron_IO/include/CGAL/IO/generic_print_polyhedron.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void @@ -65,6 +65,6 @@ generic_print_polyhedron( std::ostream& out, writer.write_footer(); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_GENERIC_PRINT_POLYHEDRON_H // // EOF // diff --git a/Polyhedron_IO/include/CGAL/IO/print_OFF.h b/Polyhedron_IO/include/CGAL/IO/print_OFF.h index 84f1a2e1cf2f..ea36a1936578 100644 --- a/Polyhedron_IO/include/CGAL/IO/print_OFF.h +++ b/Polyhedron_IO/include/CGAL/IO/print_OFF.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void print_polyhedron_with_header_OFF( std::ostream& out, @@ -86,6 +86,6 @@ print_OFF( std::ostream& out, generic_print_polyhedron( out, P, writer); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_PRINT_OFF_H // // EOF // diff --git a/Polyhedron_IO/include/CGAL/IO/print_VRML_1.h b/Polyhedron_IO/include/CGAL/IO/print_VRML_1.h index b244921c5bec..26b9454718c5 100644 --- a/Polyhedron_IO/include/CGAL/IO/print_VRML_1.h +++ b/Polyhedron_IO/include/CGAL/IO/print_VRML_1.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void print_polyhedron_VRML_1( std::ostream& out, const Polyhedron& P) { @@ -45,6 +45,6 @@ print_VRML_1( std::ostream& out, os << P; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_PRINT_VRML_1_H // // EOF // diff --git a/Polyhedron_IO/include/CGAL/IO/print_VRML_2.h b/Polyhedron_IO/include/CGAL/IO/print_VRML_2.h index e7d85e4e6fb7..d9d688ef0573 100644 --- a/Polyhedron_IO/include/CGAL/IO/print_VRML_2.h +++ b/Polyhedron_IO/include/CGAL/IO/print_VRML_2.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void print_polyhedron_VRML_2( std::ostream& out, const Polyhedron& P) { @@ -45,6 +45,6 @@ print_VRML_2( std::ostream& out, os << P; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_PRINT_VRML_2_H // // EOF // diff --git a/Polyhedron_IO/include/CGAL/IO/print_inventor.h b/Polyhedron_IO/include/CGAL/IO/print_inventor.h index 27c2af4d5ab5..4d2ddc405fab 100644 --- a/Polyhedron_IO/include/CGAL/IO/print_inventor.h +++ b/Polyhedron_IO/include/CGAL/IO/print_inventor.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void print_polyhedron_inventor( std::ostream& out, const Polyhedron& P) { @@ -46,6 +46,6 @@ print_inventor( std::ostream& out, os << P; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_PRINT_INVENTOR_H // // EOF // diff --git a/Polyhedron_IO/include/CGAL/IO/print_wavefront.h b/Polyhedron_IO/include/CGAL/IO/print_wavefront.h index 2c64581e2383..863057ac81c9 100644 --- a/Polyhedron_IO/include/CGAL/IO/print_wavefront.h +++ b/Polyhedron_IO/include/CGAL/IO/print_wavefront.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void print_polyhedron_wavefront( std::ostream& out, const Polyhedron& P) { @@ -48,6 +48,6 @@ print_wavefront( std::ostream& out, generic_print_polyhedron( out, P, writer); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_PRINT_WAVEFRONT_H // // EOF // diff --git a/Polyhedron_IO/include/CGAL/IO/scan_OFF.h b/Polyhedron_IO/include/CGAL/IO/scan_OFF.h index 3934b43bc090..86016423f965 100644 --- a/Polyhedron_IO/include/CGAL/IO/scan_OFF.h +++ b/Polyhedron_IO/include/CGAL/IO/scan_OFF.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Traits, class Items, @@ -62,6 +62,6 @@ void scan_OFF( std::istream& in, Polyhedron_3& P, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_SCAN_OFF_H // // EOF // diff --git a/Polynomial/include/CGAL/Exponent_vector.h b/Polynomial/include/CGAL/Exponent_vector.h index 07dc33721425..73c865df7308 100644 --- a/Polynomial/include/CGAL/Exponent_vector.h +++ b/Polynomial/include/CGAL/Exponent_vector.h @@ -30,7 +30,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Exponent_vector : @@ -160,7 +160,7 @@ inline std::ostream& operator << (std::ostream& os, const Exponent_vector& ev) { return os; } -CGAL_END_NAMESPACE +} //namespace CGAL namespace std{ template <> inline diff --git a/Polynomial/include/CGAL/Polynomial/Algebraic_structure_traits.h b/Polynomial/include/CGAL/Polynomial/Algebraic_structure_traits.h index 8a0621db6626..53949cb3b4c5 100644 --- a/Polynomial/include/CGAL/Polynomial/Algebraic_structure_traits.h +++ b/Polynomial/include/CGAL/Polynomial/Algebraic_structure_traits.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Extend to a UFDomain as coefficient range // Forward declaration for for NT_traits::Gcd @@ -348,5 +348,5 @@ template< class NT > class Algebraic_structure_traits< Polynomial< NT > > typedef typename Algebraic_structure_traits< NT >::Is_exact Is_exact; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYNOMIAL_ALGEBRAIC_STRUCTURE_TRAITS_H diff --git a/Polynomial/include/CGAL/Polynomial/Cached_extended_euclidean_algorithm.h b/Polynomial/include/CGAL/Polynomial/Cached_extended_euclidean_algorithm.h index 01212def0764..5b31841382fb 100644 --- a/Polynomial/include/CGAL/Polynomial/Cached_extended_euclidean_algorithm.h +++ b/Polynomial/include/CGAL/Polynomial/Cached_extended_euclidean_algorithm.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal{ template @@ -63,6 +63,6 @@ Cached_extended_euclidean_algorithm::cache; } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif//CGAL_POLYNOMIAL_CACHED_EXTENDED_EUCLIDEAN_ALGORITHM_H diff --git a/Polynomial/include/CGAL/Polynomial/Coercion_traits.h b/Polynomial/include/CGAL/Polynomial/Coercion_traits.h index 6adb342470c7..05ba0d336aa9 100644 --- a/Polynomial/include/CGAL/Polynomial/Coercion_traits.h +++ b/Polynomial/include/CGAL/Polynomial/Coercion_traits.h @@ -40,7 +40,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal{ @@ -183,6 +183,6 @@ class Coercion_traits_for_level,CTL_POLYNOMIAL > // COERCION_TRAITS END -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYNOMIAL_COERCION_TRAITS_H diff --git a/Polynomial/include/CGAL/Polynomial/Degree.h b/Polynomial/include/CGAL/Polynomial/Degree.h index 0f7b0887e97d..bdee09102033 100644 --- a/Polynomial/include/CGAL/Polynomial/Degree.h +++ b/Polynomial/include/CGAL/Polynomial/Degree.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal{ @@ -80,6 +80,6 @@ struct Degree > }; } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_POLYNOMIAL_DEGREE_H diff --git a/Polynomial/include/CGAL/Polynomial/Fraction_traits.h b/Polynomial/include/CGAL/Polynomial/Fraction_traits.h index bf93f82e6726..7a31f7adc2a9 100644 --- a/Polynomial/include/CGAL/Polynomial/Fraction_traits.h +++ b/Polynomial/include/CGAL/Polynomial/Fraction_traits.h @@ -29,7 +29,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // We need to play a similar game to provide Fraction_traits @@ -150,5 +150,5 @@ class Fraction_traits< Polynomial > // nothing new }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYNOMIAL_FRACTION_TRAITS_H diff --git a/Polynomial/include/CGAL/Polynomial/Get_arithmetic_kernel.h b/Polynomial/include/CGAL/Polynomial/Get_arithmetic_kernel.h index 22ece093a6cb..63f4f9081e4c 100644 --- a/Polynomial/include/CGAL/Polynomial/Get_arithmetic_kernel.h +++ b/Polynomial/include/CGAL/Polynomial/Get_arithmetic_kernel.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Get_arithmetic_kernel >{ @@ -33,6 +33,6 @@ struct Get_arithmetic_kernel >{ typedef typename GET::Arithmetic_kernel Arithmetic_kernel; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Polynomial/include/CGAL/Polynomial/Interpolator.h b/Polynomial/include/CGAL/Polynomial/Interpolator.h index 15cbf09be2db..9b20e4185357 100644 --- a/Polynomial/include/CGAL/Polynomial/Interpolator.h +++ b/Polynomial/include/CGAL/Polynomial/Interpolator.h @@ -20,7 +20,7 @@ #ifndef CGAL_POLYNOMIAL_INTERPOLATE_H #define CGAL_POLYNOMIAL_INTERPOLATE_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { // Class for interpolation of univariate or multivariate polynomials. @@ -129,6 +129,6 @@ class Interpolator{ }; } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYNOMIAL_INTERPOLATE_H diff --git a/Polynomial/include/CGAL/Polynomial/Modular_traits.h b/Polynomial/include/CGAL/Polynomial/Modular_traits.h index ed30e091c95d..88795a929659 100644 --- a/Polynomial/include/CGAL/Polynomial/Modular_traits.h +++ b/Polynomial/include/CGAL/Polynomial/Modular_traits.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \ingroup CGAL_Polynomial * \ingroup CGAL_Modular_traits_spec @@ -73,5 +73,5 @@ class Modular_traits< Polynomial > { }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYNOMIAL_MODULAR_TRAITS_TRAITS_H diff --git a/Polynomial/include/CGAL/Polynomial/Monomial_representation.h b/Polynomial/include/CGAL/Polynomial/Monomial_representation.h index 39c9e38705ef..e335bb76dc72 100644 --- a/Polynomial/include/CGAL/Polynomial/Monomial_representation.h +++ b/Polynomial/include/CGAL/Polynomial/Monomial_representation.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal{ template struct Monomial_representation; @@ -86,6 +86,6 @@ struct Monomial_representation >{ }; } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_POLYNOMIAL_MONOMIAL_REPRESENTAION_H diff --git a/Polynomial/include/CGAL/Polynomial/Polynomial_type.h b/Polynomial/include/CGAL/Polynomial/Polynomial_type.h index 3873013d7792..40de5c8b31a1 100644 --- a/Polynomial/include/CGAL/Polynomial/Polynomial_type.h +++ b/Polynomial/include/CGAL/Polynomial/Polynomial_type.h @@ -44,7 +44,7 @@ typename CGAL::internal::Innermost_coefficient_type::Type , 2>::Type #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Polynomial; template class Scalar_factor_traits; @@ -1449,7 +1449,7 @@ struct Needs_parens_as_product >{ -CGAL_END_NAMESPACE +} //namespace CGAL #undef CGAL_icoeff #undef CGAL_int diff --git a/Polynomial/include/CGAL/Polynomial/Real_embeddable_traits.h b/Polynomial/include/CGAL/Polynomial/Real_embeddable_traits.h index c0ddb2cf0552..1b1ef1db6fca 100644 --- a/Polynomial/include/CGAL/Polynomial/Real_embeddable_traits.h +++ b/Polynomial/include/CGAL/Polynomial/Real_embeddable_traits.h @@ -29,7 +29,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { template< class Polynomial , class TAG> class Real_embeddable_traits_poly_base; @@ -117,5 +117,5 @@ struct Real_embeddable_traits > typename Real_embeddable_traits::Type>::Is_real_embeddable> {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYNOMIAL_REAL_EMBEDDABLE_TRAITS_H diff --git a/Polynomial/include/CGAL/Polynomial/Scalar_factor_traits.h b/Polynomial/include/CGAL/Polynomial/Scalar_factor_traits.h index 037b66924307..0aee114aa357 100644 --- a/Polynomial/include/CGAL/Polynomial/Scalar_factor_traits.h +++ b/Polynomial/include/CGAL/Polynomial/Scalar_factor_traits.h @@ -29,7 +29,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // see /*! \ingroup CGAL_Polynomial @@ -90,5 +90,5 @@ class Scalar_factor_traits< Polynomial > { }; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYNOMIAL_SCALAR_FACTOR_TRAITS_H diff --git a/Polynomial/include/CGAL/Polynomial/bezout_matrix.h b/Polynomial/include/CGAL/Polynomial/bezout_matrix.h index 38919fd8ae55..487701f4fddd 100644 --- a/Polynomial/include/CGAL/Polynomial/bezout_matrix.h +++ b/Polynomial/include/CGAL/Polynomial/bezout_matrix.h @@ -38,7 +38,7 @@ //#include //#include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -608,7 +608,7 @@ polynomial_subresultant_matrix(typename Polynomial_traits_d::Polynomial_d f, } -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Polynomial/include/CGAL/Polynomial/determinant.h b/Polynomial/include/CGAL/Polynomial/determinant.h index d0454581cb19..68ac817f66ec 100644 --- a/Polynomial/include/CGAL/Polynomial/determinant.h +++ b/Polynomial/include/CGAL/Polynomial/determinant.h @@ -24,7 +24,7 @@ #ifndef CGAL_POLYNOMIAL_DETERMINANT_H #define CGAL_POLYNOMIAL_DETERMINANT_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { #include @@ -359,6 +359,6 @@ namespace internal { -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYNOMIAL_DETERMINANT_H diff --git a/Polynomial/include/CGAL/Polynomial/hgdelta_update.h b/Polynomial/include/CGAL/Polynomial/hgdelta_update.h index a9738eb25068..5c9a9f84229f 100644 --- a/Polynomial/include/CGAL/Polynomial/hgdelta_update.h +++ b/Polynomial/include/CGAL/Polynomial/hgdelta_update.h @@ -24,7 +24,7 @@ #ifndef CGAL_POLYNOMIAL_HGDELTA_UPDATE_H #define CGAL_POLYNOMIAL_HGDELTA_UPDATE_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { // This subroutine has been retained here for use in both new files. namespace internal { @@ -47,6 +47,6 @@ namespace internal { } } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYNOMIAL_HGDELTA_UPDATE_H diff --git a/Polynomial/include/CGAL/Polynomial/modular_filter.h b/Polynomial/include/CGAL/Polynomial/modular_filter.h index 19e18dca9efa..68300a5a885a 100644 --- a/Polynomial/include/CGAL/Polynomial/modular_filter.h +++ b/Polynomial/include/CGAL/Polynomial/modular_filter.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { template inline @@ -180,6 +180,6 @@ bool may_have_multiple_factor( const Polynomial& P ) { } } //namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_MODULAR_FILTER_H diff --git a/Polynomial/include/CGAL/Polynomial/polynomial_functions.h b/Polynomial/include/CGAL/Polynomial/polynomial_functions.h index 07b0f322f9c9..d1faf4fc85f0 100644 --- a/Polynomial/include/CGAL/Polynomial/polynomial_functions.h +++ b/Polynomial/include/CGAL/Polynomial/polynomial_functions.h @@ -33,7 +33,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // leading coefficient ////////////////////// @@ -165,7 +165,7 @@ substitute_xy( return sub; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYNOMIAL_FUNCTIONS_H // EOF diff --git a/Polynomial/include/CGAL/Polynomial/prs_resultant.h b/Polynomial/include/CGAL/Polynomial/prs_resultant.h index 2262495f2bca..f1e77e1f4dc3 100644 --- a/Polynomial/include/CGAL/Polynomial/prs_resultant.h +++ b/Polynomial/include/CGAL/Polynomial/prs_resultant.h @@ -37,7 +37,7 @@ #ifndef CGAL_POLYNOMIAL_PRS_RESULTANT_H #define CGAL_POLYNOMIAL_PRS_RESULTANT_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template inline NT prs_resultant_integral_domain(Polynomial A, Polynomial B) { @@ -254,7 +254,7 @@ NT prs_resultant(Polynomial A, Polynomial B) { return INTERN_PRS_RESULTANT::prs_resultant_(A, B, Algebraic_category()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYNOMIAL_PRS_RESULTANT_H diff --git a/Polynomial/include/CGAL/Polynomial/resultant.h b/Polynomial/include/CGAL/Polynomial/resultant.h index 523f2f224905..5f97b9c48049 100644 --- a/Polynomial/include/CGAL/Polynomial/resultant.h +++ b/Polynomial/include/CGAL/Polynomial/resultant.h @@ -46,7 +46,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // The main function provided within this file is CGAL::internal::resultant(F,G), @@ -410,7 +410,7 @@ Coeff resultant( } } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Polynomial/include/CGAL/Polynomial/square_free_factorize.h b/Polynomial/include/CGAL/Polynomial/square_free_factorize.h index 6937356639c9..021d058a4bd3 100644 --- a/Polynomial/include/CGAL/Polynomial/square_free_factorize.h +++ b/Polynomial/include/CGAL/Polynomial/square_free_factorize.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { // square-free factorization @@ -354,6 +354,6 @@ int filtered_square_free_factorize_utcf( const Polynomial& p, } } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYNOMIAL_SQUARE_FREE_FACTORIZATION_H diff --git a/Polynomial/include/CGAL/Polynomial/sturm_habicht_sequence.h b/Polynomial/include/CGAL/Polynomial/sturm_habicht_sequence.h index 22a02f1b75e5..01268dc42bd1 100644 --- a/Polynomial/include/CGAL/Polynomial/sturm_habicht_sequence.h +++ b/Polynomial/include/CGAL/Polynomial/sturm_habicht_sequence.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -482,6 +482,6 @@ template #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -872,6 +872,6 @@ CGAL_BEGIN_NAMESPACE } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif// CGAL_POLYNOMIAL_SUBRESULTANTS_H diff --git a/Polynomial/include/CGAL/Polynomial_traits_d.h b/Polynomial/include/CGAL/Polynomial_traits_d.h index 68212ae46c60..4435cbcfb7cb 100644 --- a/Polynomial/include/CGAL/Polynomial_traits_d.h +++ b/Polynomial/include/CGAL/Polynomial_traits_d.h @@ -83,7 +83,7 @@ -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -1706,6 +1706,6 @@ typename internal::Innermost_coefficient_type::Type >::Algebraic_cat //------------ Rebind ----------- }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYNOMIAL_TRAITS_D_H diff --git a/Polynomial/include/CGAL/Polynomial_type_generator.h b/Polynomial/include/CGAL/Polynomial_type_generator.h index 4d0a4c4c1b04..d9c6046dedb1 100644 --- a/Polynomial/include/CGAL/Polynomial_type_generator.h +++ b/Polynomial/include/CGAL/Polynomial_type_generator.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Polynomial_type_generator @@ -40,6 +40,6 @@ struct Polynomial_type_generator template struct Polynomial_type_generator{ typedef T Type; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYNOMIAL_GENERATOR_H diff --git a/Polynomial/include/CGAL/polynomial_utils.h b/Polynomial/include/CGAL/polynomial_utils.h index bf7c14eed8be..e11c42c4c3fd 100644 --- a/Polynomial/include/CGAL/polynomial_utils.h +++ b/Polynomial/include/CGAL/polynomial_utils.h @@ -68,7 +68,7 @@ return typename PT::functor()(p,second,index); \ } -CGAL_BEGIN_NAMESPACE +namespace CGAL { // GetCoefficient template inline @@ -389,7 +389,7 @@ Polynomial reversal(const Polynomial& p) { Polynomial q(p); q.reversal(); return q; } -CGAL_END_NAMESPACE +} //namespace CGAL #undef CGAL_UNARY_POLY_FUNCTION #undef CGAL_UNARY_POLY_FUNCTION_INDEX diff --git a/Polynomial/test/Polynomial/include/CGAL/gen_sparse_polynomial.h b/Polynomial/test/Polynomial/include/CGAL/gen_sparse_polynomial.h index 62eeef27a6e3..b6e5c4abf68a 100644 --- a/Polynomial/test/Polynomial/include/CGAL/gen_sparse_polynomial.h +++ b/Polynomial/test/Polynomial/include/CGAL/gen_sparse_polynomial.h @@ -7,7 +7,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template Polynomial_d_ @@ -93,6 +93,6 @@ generate_polynomial_degree_each(CGAL::Random random, int max_degree = 6, int bit -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_GEN_SPARSE_POLYNOMIAL_H diff --git a/Polynomial/test/Polynomial/test_polynomial.h b/Polynomial/test/Polynomial/test_polynomial.h index c352ae268b3f..d7a97807dbd6 100644 --- a/Polynomial/test/Polynomial/test_polynomial.h +++ b/Polynomial/test/Polynomial/test_polynomial.h @@ -29,7 +29,7 @@ // TODO: copied from number_type_utils.h -CGAL_BEGIN_NAMESPACE +namespace CGAL { template inline void convert_to(const NT& x, RT& r){ @@ -38,7 +38,7 @@ void convert_to(const NT& x, RT& r){ BOOST_STATIC_ASSERT((::boost::is_same::value)); r = typename CT::Cast()(x); } -CGAL_END_NAMESPACE +} //namespace CGAL template void datastru() { diff --git a/Polytope_distance_d/include/CGAL/Polytope_distance_d.h b/Polytope_distance_d/include/CGAL/Polytope_distance_d.h index f4d51f550a50..56350e728a3c 100644 --- a/Polytope_distance_d/include/CGAL/Polytope_distance_d.h +++ b/Polytope_distance_d/include/CGAL/Polytope_distance_d.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // To determine the polytope distance, we set up the following QP: // @@ -962,7 +962,7 @@ operator >> ( std::istream& is, return( is); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYTOPE_DISTANCE_D_H diff --git a/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_2.h b/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_2.h index 20302bb046c7..532d821a4758 100644 --- a/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_2.h +++ b/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_2.h @@ -29,7 +29,7 @@ # include # include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declaration // ================= @@ -83,7 +83,7 @@ class Polytope_distance_d_traits_2 { { return Construct_point_d(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYTOPE_DISTANCE_D_TRAITS_2_H diff --git a/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_3.h b/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_3.h index 1c0796fddda9..a67475d05bcf 100644 --- a/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_3.h +++ b/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_3.h @@ -29,7 +29,7 @@ # include # include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declaration // ================= @@ -83,7 +83,7 @@ class Polytope_distance_d_traits_3 { { return Construct_point_d(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYTOPE_DISTANCE_D_TRAITS_3_H diff --git a/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_d.h b/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_d.h index c3eaba615f63..a0ec95b5a842 100644 --- a/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_d.h +++ b/Polytope_distance_d/include/CGAL/Polytope_distance_d_traits_d.h @@ -29,7 +29,7 @@ # include # include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class declaration // ================= @@ -81,7 +81,7 @@ class Polytope_distance_d_traits_d { { return Construct_point_d(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYTOPE_DISTANCE_D_TRAITS_D_H diff --git a/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d.h b/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d.h index 6f54422954d6..186d9deed92b 100644 --- a/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d.h +++ b/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d.h @@ -31,7 +31,7 @@ # include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define COVER(text,code) \ verr0.out().width( 26); verr0 << text << "..." << flush; \ @@ -189,7 +189,7 @@ test_Polytope_distance_d( ForwardIterator p_first, ForwardIterator p_last, ) } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TEST_POLYTOPE_DISTANCE_D_H diff --git a/Principal_component_analysis/include/CGAL/PCA_util.h b/Principal_component_analysis/include/CGAL/PCA_util.h index eb7c7a73e5ea..4b2dcba0ca89 100644 --- a/Principal_component_analysis/include/CGAL/PCA_util.h +++ b/Principal_component_analysis/include/CGAL/PCA_util.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -766,6 +766,6 @@ fitting_line_3(const typename K::FT covariance[6], // covariance matrix } // end namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LINEAR_LEAST_SQUARES_FITTING_UTIL_H diff --git a/Principal_component_analysis/include/CGAL/barycenter.h b/Principal_component_analysis/include/CGAL/barycenter.h index d6fcb5e395a9..83a092d1020e 100644 --- a/Principal_component_analysis/include/CGAL/barycenter.h +++ b/Principal_component_analysis/include/CGAL/barycenter.h @@ -36,7 +36,7 @@ // TODO : Grep for "barycenter" and "centroid" in CGAL to check existing usages. // TODO : Add barycentric_coordinates() (to the kernel, this time). -CGAL_BEGIN_NAMESPACE +namespace CGAL { // This one takes an iterator range over std::pair template < typename InputIterator, typename K > @@ -122,6 +122,6 @@ barycenter(PointInputIterator begin, PointInputIterator end, return CGAL::barycenter(begin, end, wbegin, K()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Principal_component_analysis/include/CGAL/bounding_box.h b/Principal_component_analysis/include/CGAL/bounding_box.h index 28f077b9db2a..7a6960b23d7a 100644 --- a/Principal_component_analysis/include/CGAL/bounding_box.h +++ b/Principal_component_analysis/include/CGAL/bounding_box.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // TODO : // - Add support for more types of objects. @@ -145,6 +145,6 @@ bounding_box(ForwardIterator f, ForwardIterator l) return bounding_box(f, l, Kernel()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_BOUNDING_BOX_H diff --git a/Principal_component_analysis/include/CGAL/centroid.h b/Principal_component_analysis/include/CGAL/centroid.h index 9423befe3520..ea7acbec134c 100644 --- a/Principal_component_analysis/include/CGAL/centroid.h +++ b/Principal_component_analysis/include/CGAL/centroid.h @@ -39,7 +39,7 @@ // TODO : Grep for "barycenter" and "centroid" in CGAL to check existing usages. // TODO : Add barycentric_coordinates() (to the kernel, this time). -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -938,6 +938,6 @@ centroid(InputIterator begin, InputIterator end) return CGAL::centroid(begin, end, K()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Principal_component_analysis/include/CGAL/eigen.h b/Principal_component_analysis/include/CGAL/eigen.h index 16a568d5b7d9..89572a14e34d 100644 --- a/Principal_component_analysis/include/CGAL/eigen.h +++ b/Principal_component_analysis/include/CGAL/eigen.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -223,6 +223,6 @@ void eigen_symmetric(const FT *mat, } // end namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_EIGEN_H diff --git a/Principal_component_analysis/include/CGAL/eigen_2.h b/Principal_component_analysis/include/CGAL/eigen_2.h index 5936f515f725..584c906508e2 100644 --- a/Principal_component_analysis/include/CGAL/eigen_2.h +++ b/Principal_component_analysis/include/CGAL/eigen_2.h @@ -21,7 +21,7 @@ #ifndef CGAL_EIGEN_2_H #define CGAL_EIGEN_2_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -112,6 +112,6 @@ namespace internal { } // end eigen_symmetric_2 } // end namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_EIGEN_2_H diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_2.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_2.h index c237a3532f59..b0b349e61d3e 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_2.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_2.h @@ -32,7 +32,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename InputIterator, typename Kernel, @@ -87,6 +87,6 @@ linear_least_squares_fitting_2(InputIterator first, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LINEAR_LEAST_SQUARES_FITTING_2_H diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_3.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_3.h index 9a40eac6bbb8..88648c788e9a 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_3.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_3.h @@ -37,7 +37,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // complete set of parameters template < typename InputIterator, @@ -93,6 +93,6 @@ linear_least_squares_fitting_3(InputIterator first, return CGAL::linear_least_squares_fitting_3(first,beyond,object,centroid,tag); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LINEAR_LEAST_SQUARES_FITTING_3_H diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_circles_2.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_circles_2.h index 285af3af089b..faf0e1ef464b 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_circles_2.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_circles_2.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { // Fits a line to a 2D circle set. @@ -257,6 +257,6 @@ linear_least_squares_fitting_2(InputIterator first, } // end namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LINEAR_LEAST_SQUARES_FITTING_CIRCLES_2_H diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_cuboids_3.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_cuboids_3.h index 7954c71af70a..b2f04d7d0a2c 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_cuboids_3.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_cuboids_3.h @@ -30,7 +30,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -327,6 +327,6 @@ linear_least_squares_fitting_3(InputIterator first, } // end namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LINEAR_LEAST_SQUARES_FITTING_CUBOIDS_3_H diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_points_2.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_points_2.h index 5e7b409c6621..905030db6545 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_points_2.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_points_2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -103,6 +103,6 @@ linear_least_squares_fitting_2(InputIterator first, } // end namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LINEAR_LEAST_SQUARES_FITTING_POINTS_2_H diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_points_3.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_points_3.h index f40c60af6454..449fbea14e77 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_points_3.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_points_3.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { // fits a plane to a 3D point set @@ -100,6 +100,6 @@ linear_least_squares_fitting_3(InputIterator first, } // end namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LINEAR_LEAST_SQUARES_FITTING_POINTS_3_H diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_rectangles_2.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_rectangles_2.h index 4286d7e7fe60..468d8c4ed345 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_rectangles_2.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_rectangles_2.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { // Fits a line to a 2D rectangle set. @@ -224,6 +224,6 @@ linear_least_squares_fitting_2(InputIterator first, } // end namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LINEAR_LEAST_SQUARES_FITTING_RECTANGLES_2_H diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_2.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_2.h index 32348125a087..33a3deacae67 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_2.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_2.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { // Fits a line to a 2D segment set. @@ -171,6 +171,6 @@ linear_least_squares_fitting_2(InputIterator first, } // end namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LINEAR_LEAST_SQUARES_FITTING_SEGMENTS_2_H diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_3.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_3.h index ac09b8a7141e..0df9796d2bf7 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_3.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_3.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -162,6 +162,6 @@ linear_least_squares_fitting_3(InputIterator first, } // end namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LINEAR_LEAST_SQUARES_FITTING_SEGMENTS_3_H diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_spheres_3.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_spheres_3.h index d3919e6463da..aaa3fd9482ac 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_spheres_3.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_spheres_3.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -155,6 +155,6 @@ linear_least_squares_fitting_3(InputIterator first, } // end namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LINEAR_LEAST_SQUARES_FITTING_SPHERES_3_H diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_tetrahedra_3.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_tetrahedra_3.h index e004b02da901..3f095f7006ad 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_tetrahedra_3.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_tetrahedra_3.h @@ -31,7 +31,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -316,6 +316,6 @@ linear_least_squares_fitting_3(InputIterator first, } // end namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LINEAR_LEAST_SQUARES_FITTING_TETRAHEDRA_3_H diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_2.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_2.h index 55d1ca641b6b..dd9f3314bed8 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_2.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_2.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { // Fits a line to a 2D triangle set. @@ -220,6 +220,6 @@ linear_least_squares_fitting_2(InputIterator first, } // end namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LINEAR_LEAST_SQUARES_FITTING_TRIANGLES_2_H diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_3.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_3.h index 4d8c04245028..78e04085f8e3 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_3.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_3.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -233,6 +233,6 @@ linear_least_squares_fitting_3(InputIterator first, } // end namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_LINEAR_LEAST_SQUARES_FITTING_TRIANGLES_3_H diff --git a/Profiling_tools/include/CGAL/Memory_sizer.h b/Profiling_tools/include/CGAL/Memory_sizer.h index 6f68d16f5626..ab667543f752 100644 --- a/Profiling_tools/include/CGAL/Memory_sizer.h +++ b/Profiling_tools/include/CGAL/Memory_sizer.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { struct Memory_sizer { @@ -36,7 +36,7 @@ struct Memory_sizer size_type resident_size() const { return 0; } }; -CGAL_END_NAMESPACE +} //namespace CGAL #else // defined _MSC_VER || defined __linux__ || defined __APPLE__ @@ -52,7 +52,7 @@ CGAL_END_NAMESPACE #include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { // A class giving access to the memory currently used by the process. // Both the virtual memory size and the resident size. @@ -160,7 +160,7 @@ struct Memory_sizer } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Profiling_tools/include/CGAL/Profile_counter.h b/Profiling_tools/include/CGAL/Profile_counter.h index 010a7d0573c1..67c8f323c884 100644 --- a/Profiling_tools/include/CGAL/Profile_counter.h +++ b/Profiling_tools/include/CGAL/Profile_counter.h @@ -54,7 +54,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { struct Profile_counter { @@ -177,6 +177,6 @@ struct Profile_branch_counter_3 # define CGAL_BRANCH_PROFILER_BRANCH_2(NAME) #endif -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PROFILE_COUNTER_H diff --git a/Profiling_tools/include/CGAL/Profile_timer.h b/Profiling_tools/include/CGAL/Profile_timer.h index 9245b36047c8..b7fac8ec87af 100644 --- a/Profiling_tools/include/CGAL/Profile_timer.h +++ b/Profiling_tools/include/CGAL/Profile_timer.h @@ -40,7 +40,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { struct Profile_timer { @@ -75,6 +75,6 @@ struct Profile_timer # define CGAL_TIME_PROFILER(NAME) #endif -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PROFILE_TIMER_H diff --git a/Profiling_tools/include/CGAL/Real_timer.h b/Profiling_tools/include/CGAL/Real_timer.h index 043e81ffba21..9ae0ae640559 100644 --- a/Profiling_tools/include/CGAL/Real_timer.h +++ b/Profiling_tools/include/CGAL/Real_timer.h @@ -29,7 +29,7 @@ // For the numerical limits #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // SECTION: A Timer Measuring Real-Time // ======================================================================== @@ -111,7 +111,7 @@ inline double Real_timer::time() const { return elapsed; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_REAL_TIMER_H // // EOF // diff --git a/Profiling_tools/include/CGAL/Timer.h b/Profiling_tools/include/CGAL/Timer.h index 177f5d052e67..c360ebddc073 100644 --- a/Profiling_tools/include/CGAL/Timer.h +++ b/Profiling_tools/include/CGAL/Timer.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // SECTION: A Timer for User-Process Time // ======================================================================== @@ -109,7 +109,7 @@ inline double Timer::time() const { return elapsed; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TIMER_H // // EOF // diff --git a/Profiling_tools/src/CGAL/Real_timer.cpp b/Profiling_tools/src/CGAL/Real_timer.cpp index 7c6f5247480c..21775f4e27fe 100644 --- a/Profiling_tools/src/CGAL/Real_timer.cpp +++ b/Profiling_tools/src/CGAL/Real_timer.cpp @@ -37,7 +37,7 @@ # include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Static member variable for Real_timer // ===================================== @@ -106,4 +106,4 @@ double Real_timer::precision() const { return prec; } -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Profiling_tools/src/CGAL/Timer.cpp b/Profiling_tools/src/CGAL/Timer.cpp index 47442f8e4a44..9a473efd3038 100644 --- a/Profiling_tools/src/CGAL/Timer.cpp +++ b/Profiling_tools/src/CGAL/Timer.cpp @@ -53,7 +53,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Static member variable for Timer @@ -132,6 +132,6 @@ double Timer::max BOOST_PREVENT_MACRO_SUBSTITUTION () const { #endif // CGAL__GETRUSAGE // } -CGAL_END_NAMESPACE +} //namespace CGAL // EOF // diff --git a/QP_solver/include/CGAL/QP_functions.h b/QP_solver/include/CGAL/QP_functions.h index 29c388022542..c32e081a19de 100644 --- a/QP_solver/include/CGAL/QP_functions.h +++ b/QP_solver/include/CGAL/QP_functions.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace QP_functions_detail { // internal routine; writes P to out in MPS format @@ -154,7 +154,7 @@ Quadratic_program_solution solve_nonnegative_linear_program (const NonnegativeLinearProgram &lp, const ET&, const Quadratic_program_options& options = Quadratic_program_options()); -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/QP_solver/include/CGAL/QP_models.h b/QP_solver/include/CGAL/QP_models.h index 6a7c03b37a15..dbecd24a53fe 100644 --- a/QP_solver/include/CGAL/QP_models.h +++ b/QP_solver/include/CGAL/QP_models.h @@ -54,7 +54,7 @@ typedef typename Base::D_iterator D_iterator;\ typedef typename Base::C_iterator C_iterator;\ typedef typename Base::C_entry C_entry -CGAL_BEGIN_NAMESPACE +namespace CGAL { // default iterator types to used to make linear / nonnegative models // conform to QuadraticProgramInterface @@ -1543,6 +1543,6 @@ class Quadratic_program_from_mps : }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_QP_MODELS_H diff --git a/QP_solver/include/CGAL/QP_options.h b/QP_solver/include/CGAL/QP_options.h index cc24b8c2f6ae..dc682e68999d 100644 --- a/QP_solver/include/CGAL/QP_options.h +++ b/QP_solver/include/CGAL/QP_options.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { enum Quadratic_program_pricing_strategy { @@ -132,6 +132,6 @@ std::ostream& operator<< (std::ostream& o, return o; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_QP_OPTIONS_H diff --git a/QP_solver/include/CGAL/QP_solution.h b/QP_solver/include/CGAL/QP_solution.h index a3805db5173e..ee827a8a4ae8 100644 --- a/QP_solver/include/CGAL/QP_solution.h +++ b/QP_solver/include/CGAL/QP_solution.h @@ -34,7 +34,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // forward references template @@ -828,7 +828,7 @@ namespace QP_solution_detail { const QP* s; }; } -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/QP_solver/include/CGAL/QP_solver/Initialization.h b/QP_solver/include/CGAL/QP_solver/Initialization.h index 110a151e649c..0a3681cda65b 100644 --- a/QP_solver/include/CGAL/QP_solver/Initialization.h +++ b/QP_solver/include/CGAL/QP_solver/Initialization.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // creation & initialization // ------------------------- @@ -660,6 +660,6 @@ init_additional_data_members() tmp_x_2.insert(tmp_x_2.end(), l, et0); } -CGAL_END_NAMESPACE +} //namespace CGAL // ===== EOF ================================================================== diff --git a/QP_solver/include/CGAL/QP_solver/QP__filtered_base.h b/QP_solver/include/CGAL/QP_solver/QP__filtered_base.h index da77a5630088..ab084422ae46 100644 --- a/QP_solver/include/CGAL/QP_solver/QP__filtered_base.h +++ b/QP_solver/include/CGAL/QP_solver/QP__filtered_base.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ================== // class declarations @@ -290,7 +290,7 @@ set_q(int c, int b, Tag_false) q = std::ldexp( 1.015625 * ( c+b+2) * ( c+b+3), -53); } -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/QP_solver/include/CGAL/QP_solver/QP__filtered_base_impl.h b/QP_solver/include/CGAL/QP_solver/QP__filtered_base_impl.h index 423154c1c569..bc9e9eb01097 100644 --- a/QP_solver/include/CGAL/QP_solver/QP__filtered_base_impl.h +++ b/QP_solver/include/CGAL/QP_solver/QP__filtered_base_impl.h @@ -20,7 +20,7 @@ // Franz Wessendorp // Kaspar Fischer -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ============================= // class implementation (cont'd) @@ -374,6 +374,6 @@ transition( ) transition( n, Is_linear()); } -CGAL_END_NAMESPACE +} //namespace CGAL // ===== EOF ================================================================== diff --git a/QP_solver/include/CGAL/QP_solver/QP__partial_base.h b/QP_solver/include/CGAL/QP_solver/QP__partial_base.h index c6b5f812bed0..64692cc1fcbc 100644 --- a/QP_solver/include/CGAL/QP_solver/QP__partial_base.h +++ b/QP_solver/include/CGAL/QP_solver/QP__partial_base.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ================== // class declarations @@ -231,7 +231,7 @@ transition( ) static_cast< unsigned int>(N.size())); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_QP__PARTIAL_BASE_H diff --git a/QP_solver/include/CGAL/QP_solver/QP_basis_inverse.h b/QP_solver/include/CGAL/QP_solver/QP_basis_inverse.h index e80041948fb6..a7f92f98e68f 100644 --- a/QP_solver/include/CGAL/QP_solver/QP_basis_inverse.h +++ b/QP_solver/include/CGAL/QP_solver/QP_basis_inverse.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ================= // class declaration @@ -1126,7 +1126,7 @@ update_entry( ET& entry, const ET& d_new, const ET& y, const ET& d_old) const entry = CGAL::integral_division(entry, d_old); } -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/QP_solver/include/CGAL/QP_solver/QP_basis_inverse_impl.h b/QP_solver/include/CGAL/QP_solver/QP_basis_inverse_impl.h index eb118401f148..b1c01eb3fab2 100644 --- a/QP_solver/include/CGAL/QP_solver/QP_basis_inverse_impl.h +++ b/QP_solver/include/CGAL/QP_solver/QP_basis_inverse_impl.h @@ -20,7 +20,7 @@ // Franz Wessendorp // Kaspar Fischer -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ============================= // class implementation (cont'd) @@ -707,6 +707,6 @@ print( ) vout.out() << "denominator = " << d << std::endl; } -CGAL_END_NAMESPACE +} //namespace CGAL // ===== EOF ================================================================== diff --git a/QP_solver/include/CGAL/QP_solver/QP_exact_bland_pricing.h b/QP_solver/include/CGAL/QP_solver/QP_exact_bland_pricing.h index 3508e6f7d4d1..a2c10f4a6f0f 100644 --- a/QP_solver/include/CGAL/QP_solver/QP_exact_bland_pricing.h +++ b/QP_solver/include/CGAL/QP_solver/QP_exact_bland_pricing.h @@ -26,7 +26,7 @@ // includes #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ================= // class declaration @@ -170,7 +170,7 @@ pricing_helper(int& direction, Tag_false /*is_in_standard_form*/) } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_QP_EXACT_BLAND_PRICING_H diff --git a/QP_solver/include/CGAL/QP_solver/QP_full_exact_pricing.h b/QP_solver/include/CGAL/QP_solver/QP_full_exact_pricing.h index 13d643e4ef27..b4f69b25d5bf 100644 --- a/QP_solver/include/CGAL/QP_solver/QP_full_exact_pricing.h +++ b/QP_solver/include/CGAL/QP_solver/QP_full_exact_pricing.h @@ -26,7 +26,7 @@ // includes #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ================= // class declaration @@ -173,7 +173,7 @@ pricing_helper(int& direction, Tag_false /*is_in_standard_form*/) } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_QP_FULL_EXACT_PRICING_H diff --git a/QP_solver/include/CGAL/QP_solver/QP_full_filtered_pricing.h b/QP_solver/include/CGAL/QP_solver/QP_full_filtered_pricing.h index 239be182fea7..019bae46210b 100644 --- a/QP_solver/include/CGAL/QP_solver/QP_full_filtered_pricing.h +++ b/QP_solver/include/CGAL/QP_solver/QP_full_filtered_pricing.h @@ -26,7 +26,7 @@ // includes #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ================= // class declaration @@ -252,7 +252,7 @@ pricing_helper(int& direction, Tag_false ) // bounds for variables return min_j; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_QP_FULL_FILTERED_PRICING_H diff --git a/QP_solver/include/CGAL/QP_solver/QP_functions_impl.h b/QP_solver/include/CGAL/QP_solver/QP_functions_impl.h index f5d60704eab9..a8b2c32231a4 100644 --- a/QP_solver/include/CGAL/QP_solver/QP_functions_impl.h +++ b/QP_solver/include/CGAL/QP_solver/QP_functions_impl.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace QP_functions_detail { // test whether the system is of the form A x == b (equations only) @@ -424,6 +424,6 @@ Quadratic_program_solution solve_nonnegative_linear_program solve_program(lp, dummy, Tag_true(), Tag_true(), options); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_QP_FUNCTIONS_IMPL_H diff --git a/QP_solver/include/CGAL/QP_solver/QP_partial_exact_pricing.h b/QP_solver/include/CGAL/QP_solver/QP_partial_exact_pricing.h index 3cb8af67d0e2..43e10fa86f2a 100644 --- a/QP_solver/include/CGAL/QP_solver/QP_partial_exact_pricing.h +++ b/QP_solver/include/CGAL/QP_solver/QP_partial_exact_pricing.h @@ -26,7 +26,7 @@ // includes #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ================= // class declaration @@ -244,7 +244,7 @@ pricing_helper(int& direction, Tag_false /*is_in_standard_form*/) return -1; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_QP_PARTIAL_EXACT_PRICING_H diff --git a/QP_solver/include/CGAL/QP_solver/QP_partial_filtered_pricing.h b/QP_solver/include/CGAL/QP_solver/QP_partial_filtered_pricing.h index c74dd9bd3c53..214290e50a4a 100644 --- a/QP_solver/include/CGAL/QP_solver/QP_partial_filtered_pricing.h +++ b/QP_solver/include/CGAL/QP_solver/QP_partial_filtered_pricing.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ================= // class declaration @@ -409,7 +409,7 @@ pricing_helper(int& direction, Tag_false /*is_in_standard_form*/ ) return -1; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_QP_PARTIAL_FILTERED_PRICING_H diff --git a/QP_solver/include/CGAL/QP_solver/QP_pricing_strategy.h b/QP_solver/include/CGAL/QP_solver/QP_pricing_strategy.h index 51947b457251..eef7817724ca 100644 --- a/QP_solver/include/CGAL/QP_solver/QP_pricing_strategy.h +++ b/QP_solver/include/CGAL/QP_solver/QP_pricing_strategy.h @@ -29,7 +29,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ================== // class declarations @@ -309,7 +309,7 @@ price_dantzig (int j, const NT& mu, const NT& nt0, -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_QP_PRICING_STRATEGY_H diff --git a/QP_solver/include/CGAL/QP_solver/QP_solution_impl.h b/QP_solver/include/CGAL/QP_solver/QP_solution_impl.h index 3736b8779e1f..71ccd6f80024 100644 --- a/QP_solver/include/CGAL/QP_solver/QP_solution_impl.h +++ b/QP_solver/include/CGAL/QP_solver/QP_solution_impl.h @@ -21,7 +21,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // checks whether the solution actually solves program p // this performs exactly the checks described in the doc // of the class Quadratic_program_solution @@ -728,6 +728,6 @@ void Quadratic_program_solution::add_c } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_QP_SOLUTION_IMPL_H diff --git a/QP_solver/include/CGAL/QP_solver/QP_solver.h b/QP_solver/include/CGAL/QP_solver/QP_solver.h index 1bf209ca77a4..f7e926f2f2fa 100644 --- a/QP_solver/include/CGAL/QP_solver/QP_solver.h +++ b/QP_solver/include/CGAL/QP_solver/QP_solver.h @@ -48,7 +48,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ================== // class declarations @@ -1976,7 +1976,7 @@ compute__x_B_S( Tag_false /*has_equalities_only_and_full_rank*/, } -CGAL_END_NAMESPACE +} //namespace CGAL #include #include diff --git a/QP_solver/include/CGAL/QP_solver/QP_solver_bounds_impl.h b/QP_solver/include/CGAL/QP_solver/QP_solver_bounds_impl.h index a7e3ec384b46..828330ba2a6d 100644 --- a/QP_solver/include/CGAL/QP_solver/QP_solver_bounds_impl.h +++ b/QP_solver/include/CGAL/QP_solver/QP_solver_bounds_impl.h @@ -20,7 +20,7 @@ // Franz Wessendorp // Kaspar Fischer -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename Q, typename ET, typename Tags > bool QP_solver::has_finite_lower_bound(int i) const @@ -93,6 +93,6 @@ QP_solver::upper_bnd(int i) const return Bnd(true, false, ET(0)); } -CGAL_END_NAMESPACE +} //namespace CGAL // ===== EOF ================================================================== diff --git a/QP_solver/include/CGAL/QP_solver/QP_solver_impl.h b/QP_solver/include/CGAL/QP_solver/QP_solver_impl.h index e27b59a92bc9..dd4968330a65 100644 --- a/QP_solver/include/CGAL/QP_solver/QP_solver_impl.h +++ b/QP_solver/include/CGAL/QP_solver/QP_solver_impl.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ============================= // class implementation (cont'd) @@ -3328,6 +3328,6 @@ get_l() const return l; } -CGAL_END_NAMESPACE +} //namespace CGAL // ===== EOF ================================================================== diff --git a/QP_solver/include/CGAL/QP_solver/QP_solver_nonstandardform_impl.h b/QP_solver/include/CGAL/QP_solver/QP_solver_nonstandardform_impl.h index b2febb3ba081..1ec6b8736c80 100644 --- a/QP_solver/include/CGAL/QP_solver/QP_solver_nonstandardform_impl.h +++ b/QP_solver/include/CGAL/QP_solver/QP_solver_nonstandardform_impl.h @@ -20,7 +20,7 @@ // Franz Wessendorp // Kaspar Fischer -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Looks in x_O_v_i which bound is present for variable i and returns // the variable's value corresponding to this bound. @@ -223,6 +223,6 @@ init_w() multiply__2D_OxN_O(w.begin()); } -CGAL_END_NAMESPACE +} //namespace CGAL // ===== EOF ================================================================== diff --git a/QP_solver/include/CGAL/QP_solver/Unbounded_direction.h b/QP_solver/include/CGAL/QP_solver/Unbounded_direction.h index fdfa77b75483..4220f5d8ab62 100644 --- a/QP_solver/include/CGAL/QP_solver/Unbounded_direction.h +++ b/QP_solver/include/CGAL/QP_solver/Unbounded_direction.h @@ -23,7 +23,7 @@ #ifndef CGAL_QP_SOLVER_UNBOUNDED_DIRECTION_H #define CGAL_QP_SOLVER_UNBOUNDED_DIRECTION_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename Q, typename ET, typename Tags > ET QP_solver::unbounded_direction_value(int i) const { @@ -35,7 +35,7 @@ ET QP_solver::unbounded_direction_value(int i) const return et0; } } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_QP_SOLVER_UNBOUNDED_DIRECTION_H diff --git a/QP_solver/include/CGAL/QP_solver/functors.h b/QP_solver/include/CGAL/QP_solver/functors.h index 008186ddd6b8..c8e215b44709 100644 --- a/QP_solver/include/CGAL/QP_solver/functors.h +++ b/QP_solver/include/CGAL/QP_solver/functors.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ================== // class declarations @@ -267,7 +267,7 @@ class Map_with_default { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_QP_SOLVER_FUNCTORS_H diff --git a/Random_numbers/include/CGAL/Random.h b/Random_numbers/include/CGAL/Random.h index 5ff11b40fa12..d2acb78be57d 100644 --- a/Random_numbers/include/CGAL/Random.h +++ b/Random_numbers/include/CGAL/Random.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Random { public: @@ -88,7 +88,7 @@ class Random { // ================ extern Random default_random; -CGAL_END_NAMESPACE +} //namespace CGAL // ============================================================================ @@ -97,7 +97,7 @@ CGAL_END_NAMESPACE // includes # include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // operations inline @@ -135,7 +135,7 @@ operator () ( int upper) return( get_int( 0, upper)); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_RANDOM_H diff --git a/Random_numbers/src/CGAL/Random.cpp b/Random_numbers/src/CGAL/Random.cpp index 6f4a7221fc01..8d7b9932f515 100644 --- a/Random_numbers/src/CGAL/Random.cpp +++ b/Random_numbers/src/CGAL/Random.cpp @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Class implementation (continued) // ================================ @@ -78,4 +78,4 @@ Random::restore_state( const Random::State& state) // ================ Random default_random; -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Ridges_3/include/CGAL/PolyhedralSurf_neighbors.h b/Ridges_3/include/CGAL/PolyhedralSurf_neighbors.h index 8f0f08298e04..c2dceddb481b 100644 --- a/Ridges_3/include/CGAL/PolyhedralSurf_neighbors.h +++ b/Ridges_3/include/CGAL/PolyhedralSurf_neighbors.h @@ -22,7 +22,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //--------------------------------------------------------------------------- //T_Gate : element of the priority queue. A gate is a halfedge and a @@ -293,6 +293,6 @@ reset_is_visited_map(std::vector &vces) for (;itb != ite; itb++) is_visited_map[*itb] = false; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Ridges_3/include/CGAL/Ridges.h b/Ridges_3/include/CGAL/Ridges.h index 46959454518b..23e898024bbd 100644 --- a/Ridges_3/include/CGAL/Ridges.h +++ b/Ridges_3/include/CGAL/Ridges.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { enum Ridge_interrogation_type {MAX_RIDGE, MIN_RIDGE, CREST_RIDGE}; @@ -893,6 +893,6 @@ template < class TriangulatedSurfaceMesh, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Ridges_3/include/CGAL/Umbilics.h b/Ridges_3/include/CGAL/Umbilics.h index 355e539a8874..e6d3d234e1fb 100644 --- a/Ridges_3/include/CGAL/Umbilics.h +++ b/Ridges_3/include/CGAL/Umbilics.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { enum Umbilic_type { NON_GENERIC_UMBILIC = 0, ELLIPTIC_UMBILIC, HYPERBOLIC_UMBILIC}; @@ -285,6 +285,6 @@ template < class TriangulatedSurfaceMesh, -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/STL_Extension/include/CGAL/Cache.h b/STL_Extension/include/CGAL/Cache.h index 182f68b1a2f2..f7c7cd16aeb8 100644 --- a/STL_Extension/include/CGAL/Cache.h +++ b/STL_Extension/include/CGAL/Cache.h @@ -29,7 +29,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \brief The Cache serves as a constructor for an object of type Output from * a object of type Input. @@ -160,6 +160,6 @@ class Cache{ }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/STL_Extension/include/CGAL/Circulator_identity.h b/STL_Extension/include/CGAL/Circulator_identity.h index 0049f95d8b30..52d3cbd1937b 100644 --- a/STL_Extension/include/CGAL/Circulator_identity.h +++ b/STL_Extension/include/CGAL/Circulator_identity.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class C, class Ref = typename C::reference, @@ -138,6 +138,6 @@ operator+( Dist n, Circulator_identity i) { return i += n; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CIRCULATOR_IDENTITY_H // // EOF // diff --git a/STL_Extension/include/CGAL/Circulator_on_node.h b/STL_Extension/include/CGAL/Circulator_on_node.h index 3903be1880c8..94692787ce00 100644 --- a/STL_Extension/include/CGAL/Circulator_on_node.h +++ b/STL_Extension/include/CGAL/Circulator_on_node.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Node, class Next, @@ -95,6 +95,6 @@ class Circulator_on_node { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CIRCULATOR_ON_NODE_H // // EOF // diff --git a/STL_Extension/include/CGAL/Circulator_project.h b/STL_Extension/include/CGAL/Circulator_project.h index d7dc66751863..458a53c9d17f 100644 --- a/STL_Extension/include/CGAL/Circulator_project.h +++ b/STL_Extension/include/CGAL/Circulator_project.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class C, class Fct, @@ -131,6 +131,6 @@ inline Circulator_project operator+( Dist n, Circulator_project i) { return i += n; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CIRCULATOR_PROJECT_H // // EOF // diff --git a/STL_Extension/include/CGAL/Compact_container.h b/STL_Extension/include/CGAL/Compact_container.h index 2e50941889f8..e24a8612d017 100644 --- a/STL_Extension/include/CGAL/Compact_container.h +++ b/STL_Extension/include/CGAL/Compact_container.h @@ -80,7 +80,7 @@ // could point back to the container, so that we can do more interesting // things (e.g. freeing empty blocks automatically) ? -CGAL_BEGIN_NAMESPACE +namespace CGAL { // The following base class can be used to easily add a squattable pointer // to a class (maybe you loose a bit of compactness though). @@ -893,6 +893,6 @@ namespace internal { } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_COMPACT_CONTAINER_H diff --git a/STL_Extension/include/CGAL/Concatenate_iterator.h b/STL_Extension/include/CGAL/Concatenate_iterator.h index 4343b744a1d8..3a08574d12ab 100644 --- a/STL_Extension/include/CGAL/Concatenate_iterator.h +++ b/STL_Extension/include/CGAL/Concatenate_iterator.h @@ -33,7 +33,7 @@ # pragma warning(push) # pragma warning(disable:4396) #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Concatenate_iterator; @@ -145,7 +145,7 @@ bool operator!=(const Concatenate_iterator& it1, } -CGAL_END_NAMESPACE +} //namespace CGAL #if defined(BOOST_MSVC) # pragma warning(pop) diff --git a/STL_Extension/include/CGAL/Flattening_iterator.h b/STL_Extension/include/CGAL/Flattening_iterator.h index 5476cea029cc..4528ca05c98c 100644 --- a/STL_Extension/include/CGAL/Flattening_iterator.h +++ b/STL_Extension/include/CGAL/Flattening_iterator.h @@ -28,7 +28,7 @@ // LiS2CGAL check whether Nested_iterator in CGAL works in STL_extensions -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! Suppose you have an iterator range and suppose further that * the values in that iterator range are containers and thus @@ -262,6 +262,6 @@ flattener(InputIterator it); #endif // DOXYGEN_RUNNING -CGAL_END_NAMESPACE +} //namespace CGAL #endif // LiS_FLATTENING_ITERATOR_H diff --git a/STL_Extension/include/CGAL/Fourtuple.h b/STL_Extension/include/CGAL/Fourtuple.h index a93a1edb21b4..5f0e41e8aed9 100644 --- a/STL_Extension/include/CGAL/Fourtuple.h +++ b/STL_Extension/include/CGAL/Fourtuple.h @@ -26,7 +26,7 @@ #ifndef CGAL_NO_DEPRECATED_CODE -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class T > struct Fourtuple @@ -43,7 +43,7 @@ struct Fourtuple {} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NO_DEPRECATED_CODE diff --git a/STL_Extension/include/CGAL/Handle.h b/STL_Extension/include/CGAL/Handle.h index 2395097dc4ab..1f25a0c7b6db 100644 --- a/STL_Extension/include/CGAL/Handle.h +++ b/STL_Extension/include/CGAL/Handle.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Rep { @@ -88,6 +88,6 @@ class Handle inline bool identical(const Handle &h1, const Handle &h2) { return h1.identical(h2); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HANDLE_H diff --git a/STL_Extension/include/CGAL/Handle_for.h b/STL_Extension/include/CGAL/Handle_for.h index 878b4cb9b2d0..501d5aaaf3fd 100644 --- a/STL_Extension/include/CGAL/Handle_for.h +++ b/STL_Extension/include/CGAL/Handle_for.h @@ -33,7 +33,7 @@ # pragma warning(push) # pragma warning(disable:4345) // Avoid warning http://msdn.microsoft.com/en-us/library/wewb47ee(VS.80).aspx #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Handle_for @@ -302,7 +302,7 @@ get(const T &t) return t; } -CGAL_END_NAMESPACE +} //namespace CGAL #if defined(BOOST_MSVC) # pragma warning(pop) diff --git a/STL_Extension/include/CGAL/Handle_for_virtual.h b/STL_Extension/include/CGAL/Handle_for_virtual.h index 5c7d1e90773c..1700b4a4fd39 100644 --- a/STL_Extension/include/CGAL/Handle_for_virtual.h +++ b/STL_Extension/include/CGAL/Handle_for_virtual.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Ref_counted_virtual { @@ -177,6 +177,6 @@ class Handle_for_virtual template inline bool identical(const Handle_for_virtual &h1, const Handle_for_virtual &h2) { return h1.identical(h2); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HANDLE_FOR_VIRTUAL_H diff --git a/STL_Extension/include/CGAL/Handle_with_policy.h b/STL_Extension/include/CGAL/Handle_with_policy.h index 99955c4c3544..8f89a75a5e5d 100644 --- a/STL_Extension/include/CGAL/Handle_with_policy.h +++ b/STL_Extension/include/CGAL/Handle_with_policy.h @@ -41,7 +41,7 @@ -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! \brief \#include for handles with policy parameter for reference counting and union-find strategy. Uses @@ -1396,6 +1396,6 @@ class Handle_id_less_than { //@} -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_HANDLE_WITH_POLICY_H diff --git a/STL_Extension/include/CGAL/In_place_list.h b/STL_Extension/include/CGAL/In_place_list.h index 39c7974fdb5e..77385ba95310 100644 --- a/STL_Extension/include/CGAL/In_place_list.h +++ b/STL_Extension/include/CGAL/In_place_list.h @@ -35,7 +35,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Forward declarations namespace internal { @@ -738,6 +738,6 @@ void In_place_list::sort() { swap(counter[fill-1]); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IN_PLACE_LIST_H diff --git a/STL_Extension/include/CGAL/Iterator_identity.h b/STL_Extension/include/CGAL/Iterator_identity.h index 98f7e9f87f30..9fdf27f6550d 100644 --- a/STL_Extension/include/CGAL/Iterator_identity.h +++ b/STL_Extension/include/CGAL/Iterator_identity.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class I, class Ref = typename std::iterator_traits::reference, @@ -141,6 +141,6 @@ Iterator_identity operator+( Dist n, Iterator_identity i) { return i += n; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ITERATOR_IDENTITY_H // // EOF // diff --git a/STL_Extension/include/CGAL/Iterator_project.h b/STL_Extension/include/CGAL/Iterator_project.h index 551641149517..e3044e478db4 100644 --- a/STL_Extension/include/CGAL/Iterator_project.h +++ b/STL_Extension/include/CGAL/Iterator_project.h @@ -26,7 +26,7 @@ #ifndef CGAL_ITERATOR_PROJECT_H #define CGAL_ITERATOR_PROJECT_H 1 -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Relies on iterator traits. Quite simplified compared to earlier version. @@ -161,6 +161,6 @@ operator+( Dist n, Iterator_project i) { return i += n; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ITERATOR_PROJECT_H // // EOF // diff --git a/STL_Extension/include/CGAL/Iterator_transform.h b/STL_Extension/include/CGAL/Iterator_transform.h index 111d854e1bf3..23309394419b 100644 --- a/STL_Extension/include/CGAL/Iterator_transform.h +++ b/STL_Extension/include/CGAL/Iterator_transform.h @@ -29,7 +29,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class I, class Fct> class Iterator_transform { @@ -159,6 +159,6 @@ operator+( Dist n, Iterator_transform i) { return i += n; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_Iterator_transform_H // // EOF // diff --git a/STL_Extension/include/CGAL/Multiset.h b/STL_Extension/include/CGAL/Multiset.h index 5986c924e20c..8bb4d8add83a 100644 --- a/STL_Extension/include/CGAL/Multiset.h +++ b/STL_Extension/include/CGAL/Multiset.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*! * Container class representing a red-black tree, which is a balanced binary @@ -3992,6 +3992,6 @@ void Multiset::_deallocate_node (Node* nodeP) return; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/STL_Extension/include/CGAL/Nested_iterator.h b/STL_Extension/include/CGAL/Nested_iterator.h index 9ec647b85f4c..6848f7a27764 100644 --- a/STL_Extension/include/CGAL/Nested_iterator.h +++ b/STL_Extension/include/CGAL/Nested_iterator.h @@ -33,7 +33,7 @@ # pragma warning(disable:4396) #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Nested_iterator_traits @@ -244,7 +244,7 @@ bool operator!=(const Nested_iterator& it1, } -CGAL_END_NAMESPACE +} //namespace CGAL #if defined(BOOST_MSVC) # pragma warning(pop) diff --git a/STL_Extension/include/CGAL/Object.h b/STL_Extension/include/CGAL/Object.h index c8883e8bfbc5..bd655e9e2935 100644 --- a/STL_Extension/include/CGAL/Object.h +++ b/STL_Extension/include/CGAL/Object.h @@ -33,7 +33,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Wrapper : public Ref_counted_virtual @@ -211,6 +211,6 @@ T object_cast(const Object & o) return *result; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_OBJECT_H diff --git a/STL_Extension/include/CGAL/Sixtuple.h b/STL_Extension/include/CGAL/Sixtuple.h index a966b56b8e63..8427f5ad06a9 100644 --- a/STL_Extension/include/CGAL/Sixtuple.h +++ b/STL_Extension/include/CGAL/Sixtuple.h @@ -26,7 +26,7 @@ #ifndef CGAL_NO_DEPRECATED_CODE -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class T > struct Sixtuple @@ -44,7 +44,7 @@ struct Sixtuple {} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NO_DEPRECATED_CODE diff --git a/STL_Extension/include/CGAL/Threetuple.h b/STL_Extension/include/CGAL/Threetuple.h index dc6631278f0b..cffec6c6c44e 100644 --- a/STL_Extension/include/CGAL/Threetuple.h +++ b/STL_Extension/include/CGAL/Threetuple.h @@ -26,7 +26,7 @@ #ifndef CGAL_NO_DEPRECATED_CODE -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class T > struct Threetuple @@ -43,7 +43,7 @@ struct Threetuple {} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NO_DEPRECATED_CODE diff --git a/STL_Extension/include/CGAL/Twotuple.h b/STL_Extension/include/CGAL/Twotuple.h index df861eb26db5..a31b6eb79851 100644 --- a/STL_Extension/include/CGAL/Twotuple.h +++ b/STL_Extension/include/CGAL/Twotuple.h @@ -26,7 +26,7 @@ #ifndef CGAL_NO_DEPRECATED_CODE -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class T > struct Twotuple @@ -42,7 +42,7 @@ struct Twotuple {} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NO_DEPRECATED_CODE diff --git a/STL_Extension/include/CGAL/Uncertain.h b/STL_Extension/include/CGAL/Uncertain.h index 3ee2d942cf63..196b642f5588 100644 --- a/STL_Extension/include/CGAL/Uncertain.h +++ b/STL_Extension/include/CGAL/Uncertain.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -643,6 +643,6 @@ Uncertain enum_cast(Uncertain u) #endif -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_UNCERTAIN_H diff --git a/STL_Extension/include/CGAL/algorithm.h b/STL_Extension/include/CGAL/algorithm.h index 1ebb609ee7d8..40d69a036369 100644 --- a/STL_Extension/include/CGAL/algorithm.h +++ b/STL_Extension/include/CGAL/algorithm.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // copy_n is usually in the STL as well, but not in the official // standard. We provide our own copy_n. It is planned for C++0x. @@ -305,6 +305,6 @@ output_range(std::ostream& os, return os; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ALGORITHM_H diff --git a/STL_Extension/include/CGAL/array.h b/STL_Extension/include/CGAL/array.h index d2c225c75000..96887591e0bb 100644 --- a/STL_Extension/include/CGAL/array.h +++ b/STL_Extension/include/CGAL/array.h @@ -29,7 +29,7 @@ # include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace cpp0x { @@ -140,6 +140,6 @@ make_array(const T& b1, const T& b2, const T& b3, const T& b4, const T& b5, #endif // CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ARRAY_H diff --git a/STL_Extension/include/CGAL/assertions.h b/STL_Extension/include/CGAL/assertions.h index 2838ab167535..9eb5be47f259 100644 --- a/STL_Extension/include/CGAL/assertions.h +++ b/STL_Extension/include/CGAL/assertions.h @@ -28,7 +28,7 @@ // #include // for backward compatibility -CGAL_BEGIN_NAMESPACE +namespace CGAL { // function declarations // ===================== @@ -274,7 +274,7 @@ inline bool possibly(Uncertain c); #define CGAL_error_msg(MSG) ::CGAL::assertion_fail( "", __FILE__, __LINE__, MSG ) #define CGAL_error() ::CGAL::assertion_fail( "", __FILE__, __LINE__ ) -CGAL_END_NAMESPACE +} //namespace CGAL // This comes last as it is dependant on the macros to be defined. // But the macros need CGAL::possibly(). diff --git a/STL_Extension/include/CGAL/assertions_behaviour.h b/STL_Extension/include/CGAL/assertions_behaviour.h index 31653fe9520f..992c6f45edb8 100644 --- a/STL_Extension/include/CGAL/assertions_behaviour.h +++ b/STL_Extension/include/CGAL/assertions_behaviour.h @@ -26,7 +26,7 @@ #ifndef CGAL_ASSERTIONS_BEHAVIOUR_H #define CGAL_ASSERTIONS_BEHAVIOUR_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { enum Failure_behaviour { ABORT, EXIT, EXIT_WITH_SUCCESS, CONTINUE, THROW_EXCEPTION }; @@ -54,6 +54,6 @@ set_error_behaviour(Failure_behaviour eb); Failure_behaviour set_warning_behaviour(Failure_behaviour eb); -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ASSERTIONS_BEHAVIOUR_H diff --git a/STL_Extension/include/CGAL/exceptions.h b/STL_Extension/include/CGAL/exceptions.h index 7d66b26fe82e..5c77a3447823 100644 --- a/STL_Extension/include/CGAL/exceptions.h +++ b/STL_Extension/include/CGAL/exceptions.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // [Sylvain] This was originaly written in the Exacus library. // I kept most doxygen comments. @@ -183,6 +183,6 @@ class Warning_exception : public Failure_exception { }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_EXCEPTIONS_H diff --git a/STL_Extension/include/CGAL/function_objects.h b/STL_Extension/include/CGAL/function_objects.h index 74a78c9f7013..6af65999fc2a 100644 --- a/STL_Extension/include/CGAL/function_objects.h +++ b/STL_Extension/include/CGAL/function_objects.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Value> struct Identity { @@ -526,6 +526,6 @@ struct Pair_lexicographical_less_than { }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_FUNCTION_OBJECTS_H diff --git a/STL_Extension/include/CGAL/iterator.h b/STL_Extension/include/CGAL/iterator.h index 3bce86d53360..4d38a284dbd2 100644 --- a/STL_Extension/include/CGAL/iterator.h +++ b/STL_Extension/include/CGAL/iterator.h @@ -36,7 +36,7 @@ # pragma warning(push) # pragma warning(disable:4396) #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { // +----------------------------------------------------------------+ // | Emptyset_iterator @@ -2187,7 +2187,7 @@ dispatch_or_drop_output(O1 out1,O2 out2,O3 out3,O4 out4,O5 out5,O6 out6,O7 out7) #endif -CGAL_END_NAMESPACE +} //namespace CGAL #if defined(BOOST_MSVC) # pragma warning(pop) diff --git a/STL_Extension/include/CGAL/min_max_n.h b/STL_Extension/include/CGAL/min_max_n.h index ea36bc46d062..0820b2e14f45 100644 --- a/STL_Extension/include/CGAL/min_max_n.h +++ b/STL_Extension/include/CGAL/min_max_n.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // min_n() and max_n() functions similar to std::min() and std::max(), // but which allow more than 2 arguments. @@ -109,6 +109,6 @@ max_n(const T& t0, const T& t1, const T& t2, const T& t3, const T& t4, const T& t5, const T& t6, const T& t7) { return (std::max)(t0, max_n(t1, t2, t3, t4, t5, t6, t7)); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MIN_MAX_N_H diff --git a/STL_Extension/include/CGAL/tags.h b/STL_Extension/include/CGAL/tags.h index ce01a92fdc0e..89e48c9e85c8 100644 --- a/STL_Extension/include/CGAL/tags.h +++ b/STL_Extension/include/CGAL/tags.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { struct Void {}; @@ -80,6 +80,6 @@ inline void assert_equal_types( const T&, const T&) {} -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TAGS_H diff --git a/STL_Extension/include/CGAL/tuple.h b/STL_Extension/include/CGAL/tuple.h index 1a48bab43408..627fb85c367a 100644 --- a/STL_Extension/include/CGAL/tuple.h +++ b/STL_Extension/include/CGAL/tuple.h @@ -33,7 +33,7 @@ # include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace cpp0x { @@ -177,6 +177,6 @@ struct Is_in_tuple > #endif -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TUPLE_H diff --git a/STL_Extension/include/CGAL/utility.h b/STL_Extension/include/CGAL/utility.h index 6f8f5f6e946c..bfbf5082cf71 100644 --- a/STL_Extension/include/CGAL/utility.h +++ b/STL_Extension/include/CGAL/utility.h @@ -32,7 +32,7 @@ // We recommend that you use cpp0x::tuple or cpp0x::array instead // for new uses. -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -275,6 +275,6 @@ operator<(const Quadruple& x, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_UTILITY_H diff --git a/STL_Extension/include/CGAL/vector.h b/STL_Extension/include/CGAL/vector.h index 51fb1d4efa8f..b4d2329cbe53 100644 --- a/STL_Extension/include/CGAL/vector.h +++ b/STL_Extension/include/CGAL/vector.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -593,6 +593,6 @@ void vector::insert( iterator position, size_type n, const T& x) { } // namespace internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VECTOR_H // diff --git a/STL_Extension/src/CGAL/assertions.cpp b/STL_Extension/src/CGAL/assertions.cpp index ac1e64d49f95..90f7aa026396 100644 --- a/STL_Extension/src/CGAL/assertions.cpp +++ b/STL_Extension/src/CGAL/assertions.cpp @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace { @@ -218,4 +218,4 @@ set_warning_behaviour(Failure_behaviour eb) return result; } -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Scripts/developer_scripts/replace_CGAL_NAMESPACE.py b/Scripts/developer_scripts/replace_CGAL_NAMESPACE.py new file mode 100644 index 000000000000..c02717a420ff --- /dev/null +++ b/Scripts/developer_scripts/replace_CGAL_NAMESPACE.py @@ -0,0 +1,23 @@ +#!/usr/bin/python + +import os +import fileinput +from sys import argv +from sys import exit +from sys import stderr + +if len(argv)!=2: + stderr.write("Usage: python "+argv[0]+" directory_name.\n") + stderr.write("Action:\nReplace CGAL_BEGIN_NAMESPACE and CGAL_END_NAMESPACE by \'namespace CGAL {\'\n") + stderr.write("and \'} //namespace CGAL\' respectively in all .h and .cpp files in the directory \n") + stderr.write("given as parameter.\n") + +for dirname, dirnames, filenames in os.walk(argv[1]): + for filename in filenames: + l=len(filename) + if l>4 and ( filename[(l-2):l]==".h" or filename[(l-4):l]==".cpp"): + fname=os.path.join(dirname, filename) + for lines in fileinput.FileInput(fname, inplace=1): + lines = lines.replace("CGAL_BEGIN_NAMESPACE","namespace CGAL {") + lines = lines.replace("CGAL_END_NAMESPACE","} //namespace CGAL") + print lines, diff --git a/SearchStructures/examples/RangeSegmentTrees/include/Tree_Traits.h b/SearchStructures/examples/RangeSegmentTrees/include/Tree_Traits.h index 6e78e6119b83..02b70af9a007 100644 --- a/SearchStructures/examples/RangeSegmentTrees/include/Tree_Traits.h +++ b/SearchStructures/examples/RangeSegmentTrees/include/Tree_Traits.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Tree_traits_1{ public: @@ -395,7 +395,7 @@ class Tree_traits_4{ typedef C_Key_4 key_4; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/SearchStructures/include/CGAL/Range_segment_tree_traits.h b/SearchStructures/include/CGAL/Range_segment_tree_traits.h index 51e1fb70beb6..05d360f496ed 100644 --- a/SearchStructures/include/CGAL/Range_segment_tree_traits.h +++ b/SearchStructures/include/CGAL/Range_segment_tree_traits.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -382,5 +382,5 @@ class Range_segment_tree_set_traits_2{ -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_RANGE_SEGMENT_TREE_TRAITS_H diff --git a/SearchStructures/include/CGAL/Range_tree_d.h b/SearchStructures/include/CGAL/Range_tree_d.h index 5abf12b0ed31..27d75b15f9d0 100644 --- a/SearchStructures/include/CGAL/Range_tree_d.h +++ b/SearchStructures/include/CGAL/Range_tree_d.h @@ -38,7 +38,7 @@ // access the data. // cf. file Tree_interface.h, class point_interface for the requirements. -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Range_tree_d; @@ -619,5 +619,5 @@ class Range_tree_d: public Tree_base< C_Data, C_Window> } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_RANGE_TREE_D_H diff --git a/SearchStructures/include/CGAL/Range_tree_k.h b/SearchStructures/include/CGAL/Range_tree_k.h index cbab8d9f31cf..e13e7563d699 100644 --- a/SearchStructures/include/CGAL/Range_tree_k.h +++ b/SearchStructures/include/CGAL/Range_tree_k.h @@ -38,7 +38,7 @@ // A one dimensional Range Tree is defined in this class. // Ti is the type of each dimension of the tree. -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -416,6 +416,6 @@ class Range_tree_4 } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/SearchStructures/include/CGAL/Segment_tree_d.h b/SearchStructures/include/CGAL/Segment_tree_d.h index cb4879fe30d8..b3bf2d9fc0ea 100644 --- a/SearchStructures/include/CGAL/Segment_tree_d.h +++ b/SearchStructures/include/CGAL/Segment_tree_d.h @@ -35,7 +35,7 @@ // C_Interface: Interface for the class with functions that allow to access the // data. cf. file _interface.h for the requirements. -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Segment_tree_d; @@ -707,6 +707,6 @@ template std::allocator > Segment_tree_d::alloc; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/SearchStructures/include/CGAL/Segment_tree_k.h b/SearchStructures/include/CGAL/Segment_tree_k.h index 8cf7d44ae1de..0e1e712d0524 100644 --- a/SearchStructures/include/CGAL/Segment_tree_k.h +++ b/SearchStructures/include/CGAL/Segment_tree_k.h @@ -35,7 +35,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Segment_tree_1 @@ -443,6 +443,6 @@ class Segment_tree_4 } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/SearchStructures/include/CGAL/Tree_base.h b/SearchStructures/include/CGAL/Tree_base.h index 126213d8ccff..f897998cb289 100644 --- a/SearchStructures/include/CGAL/Tree_base.h +++ b/SearchStructures/include/CGAL/Tree_base.h @@ -34,7 +34,7 @@ #define stlvector -CGAL_BEGIN_NAMESPACE +namespace CGAL { //link type definition of an ordinary vertex of the tree template < typename Node > @@ -232,6 +232,6 @@ class Tree_anchor: public Tree_base< C_Data, C_Window> bool is_anchor()const {return true;} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/SearchStructures/include/CGAL/Tree_traits.h b/SearchStructures/include/CGAL/Tree_traits.h index 0038ff3a493f..e9b84a005b4d 100644 --- a/SearchStructures/include/CGAL/Tree_traits.h +++ b/SearchStructures/include/CGAL/Tree_traits.h @@ -25,7 +25,7 @@ // (e.g. Range_tree_d.h and Segment_tree_d.h). // Any other interface must at least provide the interface of this class. -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Interface as it is expected for one layer of a Range Tree template #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Vbb, class Info_ > @@ -71,6 +71,6 @@ class Segment_Delaunay_graph_vertex_base_with_info_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_VERTEX_BASE_WITH_INFO_2_H diff --git a/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/Qt3/include/Which_diagram.h b/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/Qt3/include/Which_diagram.h index 814b15f97c44..cd436ef06c20 100644 --- a/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/Qt3/include/Which_diagram.h +++ b/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/Qt3/include/Which_diagram.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Which_diagram; @@ -40,7 +40,7 @@ struct Which_diagram< Segment_Delaunay_graph_hierarchy_2 > typedef Tag_true Is_hierarchy; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // WHICH_DIAGRAM_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Edge_hash_function.h b/Segment_Delaunay_graph_2/include/CGAL/Edge_hash_function.h index 5d2b7e76999d..a7d2c6816424 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Edge_hash_function.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Edge_hash_function.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Edge_hash_function @@ -43,7 +43,7 @@ class Edge_hash_function }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_EDGE_HASH_FUNCTION_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Filtered_construction.h b/Segment_Delaunay_graph_2/include/CGAL/Filtered_construction.h index d10544b0d0d2..2fb9e26628f9 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Filtered_construction.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Filtered_construction.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -108,7 +108,7 @@ class Filtered_construction -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_FILTERED_CONSTRUCTION_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2.h index 070dcbd15da4..322fc33bace5 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2.h @@ -61,7 +61,7 @@ */ -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -1764,7 +1764,7 @@ std::ostream& operator<<(std::ostream& os, return os; } -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Are_parallel_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Are_parallel_C2.h index cc707b93f7d5..f5df5fab28cd 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Are_parallel_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Are_parallel_C2.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -76,7 +76,7 @@ class Are_parallel_C2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_ARE_PARALLEL_C2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Are_same_points_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Are_same_points_C2.h index 8e55be33afb8..95097ef4a528 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Are_same_points_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Are_same_points_C2.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -92,6 +92,6 @@ class Are_same_points_C2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_ARE_SAME_POINTS_C2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Are_same_segments_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Are_same_segments_C2.h index c3430cf9962d..ec26ab1451f2 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Are_same_segments_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Are_same_segments_C2.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -55,6 +55,6 @@ class Are_same_segments_C2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_ARE_SAME_SEGMENTS_C2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Arrangement_enum.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Arrangement_enum.h index de5db32e73cf..0883caeb6997 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Arrangement_enum.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Arrangement_enum.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -197,6 +197,6 @@ namespace Internal { CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_ARRANGEMENT_ENUM_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Arrangement_type_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Arrangement_type_C2.h index a1227870d489..0e9104b0c6b7 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Arrangement_type_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Arrangement_type_C2.h @@ -31,7 +31,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -464,6 +464,6 @@ class Arrangement_type_C2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_ARRANGEMENT_TYPE_C2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Arrangement_type_non_intersecting_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Arrangement_type_non_intersecting_C2.h index df58fb23c7d0..645fcb95fca6 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Arrangement_type_non_intersecting_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Arrangement_type_non_intersecting_C2.h @@ -31,7 +31,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -157,6 +157,6 @@ class Arrangement_type_non_intersecting_C2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_ARRANGEMENT_TYPE_NON_INTERSECTING_C2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Basic_predicates_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Basic_predicates_C2.h index b7df56ea895c..80e5519a937f 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Basic_predicates_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Basic_predicates_C2.h @@ -31,7 +31,7 @@ -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -354,7 +354,7 @@ struct Basic_predicates_C2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_BASIC_PREDICATES_C2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Cartesian_converter.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Cartesian_converter.h index 5bd7d61409f5..f27bdea0eb43 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Cartesian_converter.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Cartesian_converter.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -138,7 +138,7 @@ class Cartesian_converter : public Converter CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_CARTESIAN_CONVERTER_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Compare_x_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Compare_x_2.h index 5fdb7f15fa8c..4d04710d59fa 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Compare_x_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Compare_x_2.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -61,7 +61,7 @@ class Compare_x_2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_COMPARE_X_2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Compare_y_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Compare_y_2.h index 7c5dd2c5d9c8..3e29bc1906f7 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Compare_y_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Compare_y_2.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -61,6 +61,6 @@ class Compare_y_2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_COMPARE_Y_2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Construct_storage_site_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Construct_storage_site_2.h index 5ca101c150b1..ba545a97f1e2 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Construct_storage_site_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Construct_storage_site_2.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -361,6 +361,6 @@ class Construct_storage_site_2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_CONSTRUCT_STORAGE_SITE_2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Construct_storage_site_with_info_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Construct_storage_site_with_info_2.h index a6a63306d006..3c1dd6218d52 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Construct_storage_site_with_info_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Construct_storage_site_with_info_2.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -75,6 +75,6 @@ class Construct_storage_site_with_info_2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_CONSTRUCT_STORAGE_SITE_WITH_INFO_2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Constructions_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Constructions_C2.h index 91197a49de57..2a7cd47c362e 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Constructions_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Constructions_C2.h @@ -30,7 +30,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -317,7 +317,7 @@ class Construct_sdg_bisector_segment_2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_CONSTRUCTIONS_C2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Filtered_traits_base_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Filtered_traits_base_2.h index a8b05f3b752b..1425b7335194 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Filtered_traits_base_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Filtered_traits_base_2.h @@ -33,7 +33,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------- @@ -451,6 +451,6 @@ class Segment_Delaunay_graph_filtered_traits_base_2 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_FILTERED_TRAITS_BASE_2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Filtered_traits_concept_check_tags.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Filtered_traits_concept_check_tags.h index b1615b6badde..0bf21fd6838f 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Filtered_traits_concept_check_tags.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Filtered_traits_concept_check_tags.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -146,6 +146,6 @@ namespace Internal { CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_FILTERED_TRAITS_CONCEPT_CHECK_TAGS_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Finite_edge_interior_conflict_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Finite_edge_interior_conflict_C2.h index 1016672b9c85..a9651bbceafc 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Finite_edge_interior_conflict_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Finite_edge_interior_conflict_C2.h @@ -30,7 +30,7 @@ # pragma warning(disable:4800) // complaint about performance where we can't do anything #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -731,7 +731,7 @@ class Finite_edge_interior_conflict_C2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #if defined(BOOST_MSVC) diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Infinite_edge_interior_conflict_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Infinite_edge_interior_conflict_C2.h index a375c5b5b0e5..773187632801 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Infinite_edge_interior_conflict_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Infinite_edge_interior_conflict_C2.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -111,6 +111,6 @@ class Infinite_edge_interior_conflict_C2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_INFINITE_EDGE_INTERIOR_CONFLICT_C2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Is_degenerate_edge_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Is_degenerate_edge_C2.h index 6d64f74ea48f..14d794cbabc0 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Is_degenerate_edge_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Is_degenerate_edge_C2.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -72,6 +72,6 @@ class Is_degenerate_edge_C2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_IS_DEGENERATE_EDGE_C2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Kernel_wrapper_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Kernel_wrapper_2.h index 44f896d2a2e4..2dd13060b878 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Kernel_wrapper_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Kernel_wrapper_2.h @@ -31,7 +31,7 @@ -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -89,7 +89,7 @@ class Kernel_wrapper_2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_KERNEL_WRAPPER_2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Orientation_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Orientation_C2.h index 8c24e1b34731..bc18c71b3afb 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Orientation_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Orientation_C2.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -184,6 +184,6 @@ class Orientation_C2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_ORIENTATION_C2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Oriented_side_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Oriented_side_C2.h index 72279d1818d7..f843d7a6af83 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Oriented_side_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Oriented_side_C2.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -98,6 +98,6 @@ class Oriented_side_C2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_ORIENTED_SIDE_C2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Oriented_side_of_bisector_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Oriented_side_of_bisector_C2.h index 7dcff3f89df2..d743b4ae9364 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Oriented_side_of_bisector_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Oriented_side_of_bisector_C2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -319,7 +319,7 @@ class Oriented_side_of_bisector_C2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_ORIENTED_SIDE_OF_BISECTOR_C2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_2_impl.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_2_impl.h index 346b00342ad4..63d53217dff5 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_2_impl.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_2_impl.h @@ -21,7 +21,7 @@ // class implementation continued //================================= -CGAL_BEGIN_NAMESPACE +namespace CGAL { //==================================================================== //==================================================================== @@ -3281,6 +3281,6 @@ file_input(std::istream& is, bool read_handle_vector, } -CGAL_END_NAMESPACE +} //namespace CGAL // EOF diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_hierarchy_2_impl.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_hierarchy_2_impl.h index 12cb8701c8ca..cccb9e49da71 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_hierarchy_2_impl.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_hierarchy_2_impl.h @@ -23,7 +23,7 @@ // class implementation continued //================================= -CGAL_BEGIN_NAMESPACE +namespace CGAL { //=========================================================================== @@ -1146,7 +1146,7 @@ file_input(std::istream& is) //-------------------------------------------------------------------- -CGAL_END_NAMESPACE +} //namespace CGAL // EOF diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Sqrt_extension_1.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Sqrt_extension_1.h index c868c659d261..c51c3b0e5797 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Sqrt_extension_1.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Sqrt_extension_1.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Sqrt_extension_1; @@ -297,7 +297,7 @@ operator<<(Stream& os, const Sqrt_extension_1& x) -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Sqrt_extension_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Sqrt_extension_2.h index 0e60dbb5f5cf..b8ce80dfabfe 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Sqrt_extension_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Sqrt_extension_2.h @@ -28,7 +28,7 @@ -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -323,7 +323,7 @@ operator<<(Stream& os, const Sqrt_extension_2& x) -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_SQRT_EXTENSION_2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Traits_base_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Traits_base_2.h index ee06f9449c1c..1337c3774fad 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Traits_base_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Traits_base_2.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Internal { @@ -265,6 +265,6 @@ class Segment_Delaunay_graph_traits_base_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_TRAITS_BASE_2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Traits_wrapper_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Traits_wrapper_2.h index 3dc9fcda139f..a1337736fd37 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Traits_wrapper_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Traits_wrapper_2.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Segment_Delaunay_graph_traits_wrapper_2 : public Gt_base @@ -38,6 +38,6 @@ class Segment_Delaunay_graph_traits_wrapper_2 : public Gt_base Segment_Delaunay_graph_traits_wrapper_2(const Gt_base&) {} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_TRAITS_WRAPPER_2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Triangulation_face_base_with_edges_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Triangulation_face_base_with_edges_2.h index ef30ae2a778c..081aac5ed3dd 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Triangulation_face_base_with_edges_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Triangulation_face_base_with_edges_2.h @@ -29,7 +29,7 @@ -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Gt, @@ -145,6 +145,6 @@ class Triangulation_face_base_with_edges_2 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_FACE_BASE_WITH_EDGES_2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Vertex_conflict_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Vertex_conflict_C2.h index ff87546a5581..733fff961147 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Vertex_conflict_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Vertex_conflict_C2.h @@ -32,7 +32,7 @@ #endif // CGAL_SDG_USE_OLD_INCIRCLE #endif // CGAL_SDG_CHECK_INCIRCLE_CONSISTENCY -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -565,6 +565,6 @@ class Vertex_conflict_C2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_VERTEX_CONFLICT_C2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_C2.h index 1a1c31b2f8f0..a96b61a57ab5 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_C2.h @@ -32,7 +32,7 @@ #include #endif // CGAL_SDG_USE_OLD_INCIRCLE -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -77,7 +77,7 @@ class Voronoi_vertex_C2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_ring_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_ring_C2.h index c73d83670ae0..b7e521329021 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_ring_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_ring_C2.h @@ -29,7 +29,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -1521,7 +1521,7 @@ class Voronoi_vertex_ring_C2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_VORONOI_VERTEX_RING_C2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_sqrt_field_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_sqrt_field_C2.h index 950b1209c30a..f7a6d0aa7b0e 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_sqrt_field_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_sqrt_field_C2.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -1272,6 +1272,6 @@ class Voronoi_vertex_sqrt_field_C2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_VORONOI_VEFTEX_SQRT_FIELD_C2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_sqrt_field_new_C2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_sqrt_field_new_C2.h index b50902954339..a800298b35ef 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_sqrt_field_new_C2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Voronoi_vertex_sqrt_field_new_C2.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_SEGMENT_DELAUNAY_GRAPH_2_BEGIN_NAMESPACE @@ -1486,6 +1486,6 @@ class Voronoi_vertex_sqrt_field_new_C2 CGAL_SEGMENT_DELAUNAY_GRAPH_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_VORONOI_VERTEX_SQRT_FIELD_NEW_C2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/edge_list.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/edge_list.h index 576de342f8f6..f216eb157451 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/edge_list.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/edge_list.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -554,7 +554,7 @@ class Edge_list } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_2_EDGE_LIST_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/in_place_edge_list.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/in_place_edge_list.h index b187c171b066..f53561438fdd 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/in_place_edge_list.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/in_place_edge_list.h @@ -22,7 +22,7 @@ #ifndef CGAL_SDG_IN_PLACE_EDGE_LIST_FOR_SDG_H #define CGAL_SDG_IN_PLACE_EDGE_LIST_FOR_SDG_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { template @@ -286,7 +286,7 @@ class In_place_edge_list_for_sdg { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SDG_IN_EDGE_PLACE_LIST_FOR_SDG_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_face_base_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_face_base_2.h index 05888ff4f894..317492a04b7c 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_face_base_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_face_base_2.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename Gt, typename Fb = Triangulation_ds_face_base_2<> > class Segment_Delaunay_graph_face_base_2 @@ -141,6 +141,6 @@ class Segment_Delaunay_graph_face_base_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SEGMENT_DELAUNAY_GRAPH_FACE_BASE_2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_filtered_traits_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_filtered_traits_2.h index 1cea885742e1..7c5e499aae5e 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_filtered_traits_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_filtered_traits_2.h @@ -40,7 +40,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define SDG2_INS CGAL_SEGMENT_DELAUNAY_GRAPH_2_NS::Internal @@ -240,6 +240,6 @@ struct Segment_Delaunay_graph_filtered_traits_without_intersections_2 #undef SDG2_INS -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_FILTERED_TRAITS_2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_hierarchy_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_hierarchy_2.h index 3c192e05e1f5..dc285b22ca53 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_hierarchy_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_hierarchy_2.h @@ -38,7 +38,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //-------------------------------------------------------------------- //-------------------------------------------------------------------- @@ -496,7 +496,7 @@ std::ostream& operator<<(std::ostream& os, } -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_hierarchy_vertex_base_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_hierarchy_vertex_base_2.h index 2c85d567e80d..14cd4ce45356 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_hierarchy_vertex_base_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_hierarchy_vertex_base_2.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -67,7 +67,7 @@ class Segment_Delaunay_graph_hierarchy_vertex_base_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_HIERARCHY_VERTEX_BASE_2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_simple_site_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_simple_site_2.h index 374bf7e80f66..d24ceb10316e 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_simple_site_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_simple_site_2.h @@ -29,7 +29,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /** A Site is either a point or a segment or a point defined as the intersection of two non-parallel segments (if defined) @@ -263,6 +263,6 @@ operator<<(Stream& str, Segment_Delaunay_graph_simple_site_2& t) } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_SIMPLE_SITE_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_simple_storage_site_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_simple_storage_site_2.h index 33131cedd3f0..1aed30f57ee1 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_simple_storage_site_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_simple_storage_site_2.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /** A Site is either a point or a segment or a point defined as the intersection of two non-parallel segments (if defined) @@ -213,6 +213,6 @@ class Segment_Delaunay_graph_simple_storage_site_2 //------------------------------------------------------------------------- -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_SIMPLE_STORAGE_SITE_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_site_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_site_2.h index a618e42f2f4e..06ee745e70b3 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_site_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_site_2.h @@ -29,7 +29,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /** A Site is either a point or a segment or a point defined as the intersection of two non-parallel segments (if defined) @@ -351,6 +351,6 @@ operator<<(Stream& str, Segment_Delaunay_graph_site_2& t) } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_SITE_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_storage_site_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_storage_site_2.h index e0f5927b3e2d..c98069bdf813 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_storage_site_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_storage_site_2.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /** A Site is either a point or a segment or a point defined as the intersection of two non-parallel segments (if defined) @@ -344,6 +344,6 @@ class Segment_Delaunay_graph_storage_site_2 //------------------------------------------------------------------------- -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_STORAGE_SITE_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_storage_site_with_info_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_storage_site_with_info_2.h index 8c26bb54e4cd..be7c8e004e1a 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_storage_site_with_info_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_storage_site_with_info_2.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /** A Site is either a point or a segment or a point defined as the intersection of two non-parallel segments (if defined) @@ -140,6 +140,6 @@ class Segment_Delaunay_graph_storage_site_with_info_2 //------------------------------------------------------------------------- -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_STORAGE_SITE_WITH_INFO_2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_storage_traits_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_storage_traits_2.h index 0f8ae30dafea..16597e319a6f 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_storage_traits_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_storage_traits_2.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //---------------------------------------------------------------------- //---------------------------------------------------------------------- @@ -113,6 +113,6 @@ class Segment_Delaunay_graph_storage_traits_2 //---------------------------------------------------------------------- //---------------------------------------------------------------------- -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_STORAGE_TRAITS_2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_storage_traits_with_info_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_storage_traits_with_info_2.h index 5b9eec8cac12..f6bcba51cfb1 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_storage_traits_with_info_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_storage_traits_with_info_2.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Segment_Delaunay_graph_storage_traits_with_info_2 @@ -83,6 +83,6 @@ class Segment_Delaunay_graph_storage_traits_with_info_2 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_STORAGE_TRAITS_WITH_INFO_2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_traits_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_traits_2.h index d8830222bb2d..e7a677b3b4fa 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_traits_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_traits_2.h @@ -31,7 +31,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //----------------------------------------------------------------------- // the Traits classes @@ -161,6 +161,6 @@ Segment_Delaunay_graph_traits_without_intersections_2, Field_with_sqrt_tag> {}; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_TRAITS_2_H diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_vertex_base_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_vertex_base_2.h index 08d6e0b27ef1..070ce8d8f0d2 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_vertex_base_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_vertex_base_2.h @@ -31,7 +31,7 @@ -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class STraits, class Vb = Triangulation_ds_vertex_base_2<> > class Segment_Delaunay_graph_vertex_base_2 @@ -92,6 +92,6 @@ class Segment_Delaunay_graph_vertex_base_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_VERTEX_BASE_2_H diff --git a/Segment_Delaunay_graph_2/new_stuff/Segment_Delaunay_graph_2/Delaunay_triangulation_nearest_neighbor_graph_traits_2.h b/Segment_Delaunay_graph_2/new_stuff/Segment_Delaunay_graph_2/Delaunay_triangulation_nearest_neighbor_graph_traits_2.h index d2f605bd018d..6d3710ef270c 100644 --- a/Segment_Delaunay_graph_2/new_stuff/Segment_Delaunay_graph_2/Delaunay_triangulation_nearest_neighbor_graph_traits_2.h +++ b/Segment_Delaunay_graph_2/new_stuff/Segment_Delaunay_graph_2/Delaunay_triangulation_nearest_neighbor_graph_traits_2.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Delaunay_triangulation_nearest_neighbor_graph_traits_2 @@ -78,6 +78,6 @@ class Delaunay_triangulation_nearest_neighbor_graph_traits_2 const Geom_traits& gt_; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_DELAUNAY_TRIANGULATION_NEAREST_NEIGHBOR_GRAPH_TRAITS_2_H diff --git a/Segment_Delaunay_graph_2/new_stuff/Segment_Delaunay_graph_2/Directed_graph.h b/Segment_Delaunay_graph_2/new_stuff/Segment_Delaunay_graph_2/Directed_graph.h index 763bb5745e9a..fb3d712ebc18 100644 --- a/Segment_Delaunay_graph_2/new_stuff/Segment_Delaunay_graph_2/Directed_graph.h +++ b/Segment_Delaunay_graph_2/new_stuff/Segment_Delaunay_graph_2/Directed_graph.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Directed_graph_node @@ -165,6 +165,6 @@ class Directed_graph -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_DIRECTED_GRAPH_H diff --git a/Segment_Delaunay_graph_2/new_stuff/Segment_Delaunay_graph_2/Nearest_neighbor_graph_2.h b/Segment_Delaunay_graph_2/new_stuff/Segment_Delaunay_graph_2/Nearest_neighbor_graph_2.h index 29dd76e493cd..cf5a6e8ffeab 100644 --- a/Segment_Delaunay_graph_2/new_stuff/Segment_Delaunay_graph_2/Nearest_neighbor_graph_2.h +++ b/Segment_Delaunay_graph_2/new_stuff/Segment_Delaunay_graph_2/Nearest_neighbor_graph_2.h @@ -26,7 +26,7 @@ #include "Directed_graph.h" -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Node_iterator_wrapper @@ -240,6 +240,6 @@ class Nearest_neighbor_graph_2 Traits tr_; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NEAREST_NEIGHBOR_GRAPH_2_H diff --git a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/IO/Null_output_stream.h b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/IO/Null_output_stream.h index 603cf2716b65..6cb1a419d95e 100644 --- a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/IO/Null_output_stream.h +++ b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/IO/Null_output_stream.h @@ -4,7 +4,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { struct Null_output_stream {}; @@ -23,6 +23,6 @@ operator<<(Null_output_stream& nos, const T&) } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NULL_OUTPUT_STREAM_H diff --git a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test.h b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test.h index 551197ea16b8..08a42998e67c 100644 --- a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test.h +++ b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test.h @@ -4,7 +4,7 @@ #include "IO/io_aux.h" #include "test_types.h" -CGAL_BEGIN_NAMESPACE +namespace CGAL { template bool test_x(InputStream& is, const char* ifname, bool test_remove = true) @@ -66,7 +66,7 @@ bool test_base(InputStream&, const SDG& sdg, const char* ifname, const char* ofn -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SDG_TEST_H diff --git a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_info.h b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_info.h index f65c83f7e9cc..3db6956d14bf 100644 --- a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_info.h +++ b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_info.h @@ -6,7 +6,7 @@ #include #include "IO/io_aux.h" -CGAL_BEGIN_NAMESPACE +namespace CGAL { template bool test_info(SDG& sdg, const char* fname) @@ -45,6 +45,6 @@ bool test_info(SDG& sdg, const char* fname) return valid; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TEST_INFO_H diff --git a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_info_hierarchy.h b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_info_hierarchy.h index 496c75615f7f..2836a96e508f 100644 --- a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_info_hierarchy.h +++ b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_info_hierarchy.h @@ -6,7 +6,7 @@ #include "IO/io_aux.h" #include "test_info.h" -CGAL_BEGIN_NAMESPACE +namespace CGAL { template bool test_info_hierarchy(SDG& sdg, const char* fname) @@ -30,6 +30,6 @@ bool test_info_hierarchy(SDG& sdg, const char* fname) return valid; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TEST_INFO_HIERARCHY_H diff --git a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types.h b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types.h index ca5cb7596c4c..17e16b4622a5 100644 --- a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types.h +++ b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types.h @@ -39,7 +39,7 @@ char* get_fname(const CGAL::Gmpq&, const char* ifname) { //======================================================================== -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Level_finder @@ -568,7 +568,7 @@ bool test_sdg(InputStream&, const SDG&, const char* ifname, const char* ofname, } -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types_hierarchy.h b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types_hierarchy.h index 6460ee9e12e8..634ada4ba825 100644 --- a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types_hierarchy.h +++ b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types_hierarchy.h @@ -3,7 +3,7 @@ #include "test_types.h" -CGAL_BEGIN_NAMESPACE +namespace CGAL { template bool test_sdg_hierarchy(InputStream& is, const SDG& sdg, char* fname) @@ -11,6 +11,6 @@ bool test_sdg_hierarchy(InputStream& is, const SDG& sdg, char* fname) return test_sdg(is, sdg, fname); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SDG_TEST_TYPES_HIERARCHY_H diff --git a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/test_sdg_2_et.cpp b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/test_sdg_2_et.cpp index f9a86ea168f1..13b1668d7076 100644 --- a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/test_sdg_2_et.cpp +++ b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/test_sdg_2_et.cpp @@ -11,13 +11,13 @@ typedef CGAL::Gmpq exact_ring_t; typedef CGAL::Gmpq exact_field_t; -CGAL_BEGIN_NAMESPACE +namespace CGAL { // needed for the drawing methods Gmpq sqrt(const Gmpq& x) { return Gmpq( CGAL::sqrt( CGAL::to_double(x) ) ); } -CGAL_END_NAMESPACE +} //namespace CGAL #else # include diff --git a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/test_sdg_hierarchy_2_et.cpp b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/test_sdg_hierarchy_2_et.cpp index 0b04a64faed1..30cf2507dcee 100644 --- a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/test_sdg_hierarchy_2_et.cpp +++ b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/test_sdg_hierarchy_2_et.cpp @@ -11,13 +11,13 @@ typedef CGAL::Gmpq exact_ring_t; typedef CGAL::Gmpq exact_field_t; -CGAL_BEGIN_NAMESPACE +namespace CGAL { // needed for the drawing methods Gmpq sqrt(const Gmpq& x) { return Gmpq( sqrt( to_double(x) ) ); } -CGAL_END_NAMESPACE +} //namespace CGAL #else # include diff --git a/Skin_surface_3/include/CGAL/Compute_anchor_3.h b/Skin_surface_3/include/CGAL/Compute_anchor_3.h index e00a450a1314..cde3484c0366 100644 --- a/Skin_surface_3/include/CGAL/Compute_anchor_3.h +++ b/Skin_surface_3/include/CGAL/Compute_anchor_3.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class RegularTriangulation_3> class Compute_anchor_3 @@ -585,6 +585,6 @@ Compute_anchor_3::compute_anchor_vor (Facet const &f) { } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_COMPUTE_ANCHOR_3_H diff --git a/Skin_surface_3/include/CGAL/Marching_tetrahedra_observer_default_3.h b/Skin_surface_3/include/CGAL/Marching_tetrahedra_observer_default_3.h index ee8d843ef236..be840c05fc0b 100644 --- a/Skin_surface_3/include/CGAL/Marching_tetrahedra_observer_default_3.h +++ b/Skin_surface_3/include/CGAL/Marching_tetrahedra_observer_default_3.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// NGHK: Is the converter needed or do we just use the Cartesian_converter template #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Skin_surface_3 : public Skin_surface_base_3 { @@ -108,6 +108,6 @@ Skin_surface_3(WP_iterator begin, WP_iterator end, CGAL_assertion(triangulated_mixed_complex().dimension() == 3); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SKIN_SURFACE_3_H diff --git a/Skin_surface_3/include/CGAL/Skin_surface_base_3.h b/Skin_surface_3/include/CGAL/Skin_surface_base_3.h index 424cc9708c72..91ca6c50193a 100644 --- a/Skin_surface_3/include/CGAL/Skin_surface_base_3.h +++ b/Skin_surface_3/include/CGAL/Skin_surface_base_3.h @@ -47,7 +47,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Skin_surface_base_3 { @@ -805,6 +805,6 @@ get_weighted_circumcenter(const Simplex &s, Gt2 &traits) { return result; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SKIN_SURFACE_BASE_3_H diff --git a/Skin_surface_3/include/CGAL/Skin_surface_filtered_traits_3.h b/Skin_surface_3/include/CGAL/Skin_surface_filtered_traits_3.h index f7f443e7d863..3b098e870d69 100644 --- a/Skin_surface_3/include/CGAL/Skin_surface_filtered_traits_3.h +++ b/Skin_surface_3/include/CGAL/Skin_surface_filtered_traits_3.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Skin_surface_filtered_traits_3 @@ -66,5 +66,5 @@ class Skin_surface_filtered_traits_3 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SKIN_SURFACE_FILTERED_TRAITS_3_H diff --git a/Skin_surface_3/include/CGAL/Skin_surface_marching_tetrahedra_observer_3.h b/Skin_surface_3/include/CGAL/Skin_surface_marching_tetrahedra_observer_3.h index 537ff94c3bbc..0e07feb925f3 100644 --- a/Skin_surface_3/include/CGAL/Skin_surface_marching_tetrahedra_observer_3.h +++ b/Skin_surface_3/include/CGAL/Skin_surface_marching_tetrahedra_observer_3.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Skin_Surface_polyhedral_face : public CGAL::HalfedgeDS_face_base { @@ -44,6 +44,6 @@ struct Skin_surface_polyhedral_items_3 : public Polyhedron_items_3 { }; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SKIN_SURFACE_POLYHEDRAL_ITEMS_3_H diff --git a/Skin_surface_3/include/CGAL/Skin_surface_polyhedral_items_with_face_information.h b/Skin_surface_3/include/CGAL/Skin_surface_polyhedral_items_with_face_information.h index ab61a127979a..6666952c50b0 100644 --- a/Skin_surface_3/include/CGAL/Skin_surface_polyhedral_items_with_face_information.h +++ b/Skin_surface_3/include/CGAL/Skin_surface_polyhedral_items_with_face_information.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Skin_Surface_polyhedral_face : public CGAL::HalfedgeDS_face_base { @@ -41,6 +41,6 @@ class Skin_surface_polyhedral_items_with_face_information_3 }; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SKIN_SURFACE_POLYHEDRAL_ITEMS_WITH_FACE_INFORMATION_H diff --git a/Skin_surface_3/include/CGAL/Skin_surface_quadratic_surface_3.h b/Skin_surface_3/include/CGAL/Skin_surface_quadratic_surface_3.h index fb46b22cdf8f..6a09ae0d6f3d 100644 --- a/Skin_surface_3/include/CGAL/Skin_surface_quadratic_surface_3.h +++ b/Skin_surface_3/include/CGAL/Skin_surface_quadratic_surface_3.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class SkinSurfaceQuadraticSurfaceTraits_3 > class Skin_surface_quadratic_surface_3 { @@ -188,6 +188,6 @@ class Skin_surface_quadratic_surface_3 { FT c; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SKIN_SURFACE_QUADRATIC_SURFACE_H diff --git a/Skin_surface_3/include/CGAL/Skin_surface_refinement_policy_3.h b/Skin_surface_3/include/CGAL/Skin_surface_refinement_policy_3.h index 437d4b3cf288..f3ea3b2d7462 100644 --- a/Skin_surface_3/include/CGAL/Skin_surface_refinement_policy_3.h +++ b/Skin_surface_3/include/CGAL/Skin_surface_refinement_policy_3.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -127,7 +127,7 @@ class Skin_surface_refinement_policy_3< Skin_surface const &ss_3; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SKIN_SURFACE_REFINEMENT_POLICY_3_H diff --git a/Skin_surface_3/include/CGAL/Skin_surface_traits_3.h b/Skin_surface_3/include/CGAL/Skin_surface_traits_3.h index 71d524968be8..698f590c9160 100644 --- a/Skin_surface_3/include/CGAL/Skin_surface_traits_3.h +++ b/Skin_surface_3/include/CGAL/Skin_surface_traits_3.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /** Input: a list of n weighted points p_1...p_n and a query point x. There is a plane separating the mixed cell defined by p_1...p_n-1 @@ -163,7 +163,7 @@ class Skin_surface_traits_3 enum { Has_filtered_predicates=false }; }; -CGAL_END_NAMESPACE +} //namespace CGAL // Now specialize for Filtered_kernel, to get // the filtered traits automatically. @@ -171,7 +171,7 @@ CGAL_END_NAMESPACE #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Just FK would be nicer, but VC 2005 messes it up with an "FK" in a base class when compiling degenerate_test.cpp template < typename Sst3FK > @@ -189,5 +189,5 @@ class Skin_surface_traits_3 < Sst3FK,true > -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SKIN_SURFACE_TRAITS_3_H diff --git a/Skin_surface_3/include/CGAL/Triangulated_mixed_complex_observer_3.h b/Skin_surface_3/include/CGAL/Triangulated_mixed_complex_observer_3.h index 9e3f1b4c20fc..bd0bf36365c3 100644 --- a/Skin_surface_3/include/CGAL/Triangulated_mixed_complex_observer_3.h +++ b/Skin_surface_3/include/CGAL/Triangulated_mixed_complex_observer_3.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct SS_Dereference_type { @@ -210,6 +210,6 @@ class Triangulated_mixed_complex_observer_3 { R2S_converter r2s_converter; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATED_MIXED_COMPLEX_OBSERVER_3 diff --git a/Skin_surface_3/include/CGAL/Triangulation_incremental_builder_3.h b/Skin_surface_3/include/CGAL/Triangulation_incremental_builder_3.h index a4b6824fb71b..b0ef866f0f99 100644 --- a/Skin_surface_3/include/CGAL/Triangulation_incremental_builder_3.h +++ b/Skin_surface_3/include/CGAL/Triangulation_incremental_builder_3.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Triangulation_3 > class Triangulation_incremental_builder_3 { @@ -239,6 +239,6 @@ Triangulation_incremental_builder_3< TDS_ >::construct_infinite_cells() { CGAL_assertion(ch_edges.empty()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TDS_INCREMENTAL_BUILDER_3_H // diff --git a/Skin_surface_3/include/CGAL/Union_of_balls_3.h b/Skin_surface_3/include/CGAL/Union_of_balls_3.h index c8ce790a855e..37ee8201fd0e 100644 --- a/Skin_surface_3/include/CGAL/Union_of_balls_3.h +++ b/Skin_surface_3/include/CGAL/Union_of_balls_3.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Union_of_balls_3 : public Skin_surface_base_3 { @@ -112,6 +112,6 @@ Union_of_balls_3(WP_iterator begin, WP_iterator end, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_UNION_OF_BALLS_3_H diff --git a/Skin_surface_3/include/CGAL/make_skin_surface_mesh_3.h b/Skin_surface_3/include/CGAL/make_skin_surface_mesh_3.h index a9bed40391de..26c404a7566d 100644 --- a/Skin_surface_3/include/CGAL/make_skin_surface_mesh_3.h +++ b/Skin_surface_3/include/CGAL/make_skin_surface_mesh_3.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -59,6 +59,6 @@ void make_skin_surface_mesh_3(Polyhedron_3 &p, -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MAKE_SKIN_SURFACE_MESH_3_H diff --git a/Skin_surface_3/include/CGAL/make_union_of_balls_3.h b/Skin_surface_3/include/CGAL/make_union_of_balls_3.h index 29ced9f94a2a..3f04618115c5 100644 --- a/Skin_surface_3/include/CGAL/make_union_of_balls_3.h +++ b/Skin_surface_3/include/CGAL/make_union_of_balls_3.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -49,6 +49,6 @@ void make_union_of_balls_mesh_3(Polyhedron_3 &p, -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MAKE_UNION_OF_BALLS_MESH_3_H diff --git a/Skin_surface_3/include/CGAL/marching_tetrahedra_3.h b/Skin_surface_3/include/CGAL/marching_tetrahedra_3.h index c1618d311317..5e1d012ee5eb 100644 --- a/Skin_surface_3/include/CGAL/marching_tetrahedra_3.h +++ b/Skin_surface_3/include/CGAL/marching_tetrahedra_3.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // If TriangulationDataStructure_3 only gets a Cell_handle range // it is not possible to derive the Vertex_handle type. @@ -270,6 +270,6 @@ void marching_tetrahedra_3( polyhedron.delegate(builder); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MARCHING_TETRAHEDRA_H diff --git a/Skin_surface_3/include/CGAL/mesh_skin_surface_3.h b/Skin_surface_3/include/CGAL/mesh_skin_surface_3.h index 366f4cd87839..053230f595b3 100644 --- a/Skin_surface_3/include/CGAL/mesh_skin_surface_3.h +++ b/Skin_surface_3/include/CGAL/mesh_skin_surface_3.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void mesh_skin_surface_3(SkinSurface_3 const &skin_surface, Polyhedron &p) @@ -47,6 +47,6 @@ void mesh_skin_surface_3(SkinSurface_3 const &skin_surface, Polyhedron &p) // -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MESH_SKIN_SURFACE_3_H diff --git a/Skin_surface_3/include/CGAL/mesh_union_of_balls_3.h b/Skin_surface_3/include/CGAL/mesh_union_of_balls_3.h index 900fe15fc764..aed44eae9319 100644 --- a/Skin_surface_3/include/CGAL/mesh_union_of_balls_3.h +++ b/Skin_surface_3/include/CGAL/mesh_union_of_balls_3.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void mesh_union_of_balls_3(UnionOfBalls_3 const &union_of_balls, Polyhedron &p) @@ -30,6 +30,6 @@ void mesh_union_of_balls_3(UnionOfBalls_3 const &union_of_balls, Polyhedron &p) union_of_balls.mesh_surface_3(p); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MESH_UNION_OF_BALLS_3_H diff --git a/Skin_surface_3/include/CGAL/predicates/predicates_for_mixed_complex_3.h b/Skin_surface_3/include/CGAL/predicates/predicates_for_mixed_complex_3.h index aefaf9c1f62d..9a901230d5cd 100644 --- a/Skin_surface_3/include/CGAL/predicates/predicates_for_mixed_complex_3.h +++ b/Skin_surface_3/include/CGAL/predicates/predicates_for_mixed_complex_3.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /* q: circumcenter(p1,p2) * - s* @@ -119,6 +119,6 @@ side_of_mixed_cellC3(const FT &p1x, const FT &p1y, const FT &p1z, const FT &p1w, ((1-s)*p1z+s*qz-xz)*nz); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PREDICATES_FOR_MIXED_COMPLEX_3_H diff --git a/Skin_surface_3/include/CGAL/subdivide_skin_surface_mesh_3.h b/Skin_surface_3/include/CGAL/subdivide_skin_surface_mesh_3.h index 2461f830bf99..d7f8dbe8032f 100644 --- a/Skin_surface_3/include/CGAL/subdivide_skin_surface_mesh_3.h +++ b/Skin_surface_3/include/CGAL/subdivide_skin_surface_mesh_3.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // This code is based on the Polyhedron tutorial @@ -151,6 +151,6 @@ void subdivide_skin_surface_mesh_3( } } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SUBDIVIDE_SKIN_SURFACE_MESH_3_H diff --git a/Skin_surface_3/include/CGAL/subdivide_union_of_balls_mesh_3.h b/Skin_surface_3/include/CGAL/subdivide_union_of_balls_mesh_3.h index e404be429fb7..8d8291183dad 100644 --- a/Skin_surface_3/include/CGAL/subdivide_union_of_balls_mesh_3.h +++ b/Skin_surface_3/include/CGAL/subdivide_union_of_balls_mesh_3.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void subdivide_union_of_balls_mesh_3( @@ -36,6 +36,6 @@ void subdivide_union_of_balls_mesh_3( } } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SUBDIVIDE_UNION_OF_BALLS_MESH_3_H diff --git a/Skin_surface_3/include/CGAL/triangulate_mixed_complex_3.h b/Skin_surface_3/include/CGAL/triangulate_mixed_complex_3.h index 6b1018990691..f177b8270a0d 100644 --- a/Skin_surface_3/include/CGAL/triangulate_mixed_complex_3.h +++ b/Skin_surface_3/include/CGAL/triangulate_mixed_complex_3.h @@ -35,7 +35,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < @@ -1318,6 +1318,6 @@ triangulate_mixed_complex_3(RegularTriangulation_3 const ®ular, triangulate_mixed_complex_3(regular, shrink_factor, tmc, observer, verbose); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATE_MIXED_COMPLEX_H diff --git a/Skin_surface_3/include/CGAL/triangulate_power_diagram_3.h b/Skin_surface_3/include/CGAL/triangulate_power_diagram_3.h index eddee58187e8..0ab163d81ad8 100644 --- a/Skin_surface_3/include/CGAL/triangulate_power_diagram_3.h +++ b/Skin_surface_3/include/CGAL/triangulate_power_diagram_3.h @@ -30,7 +30,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < @@ -784,6 +784,6 @@ triangulate_power_diagram_3(RegularTriangulation_3 const ®ular, triangulate_power_diagram_3(regular, tmc, observer, verbose); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATE_POWER_DIAGRAM_3_H diff --git a/Snap_rounding_2/include/CGAL/Snap_rounding_2.h b/Snap_rounding_2/include/CGAL/Snap_rounding_2.h index 2ab1163aeb7c..5cceb5621e95 100644 --- a/Snap_rounding_2/include/CGAL/Snap_rounding_2.h +++ b/Snap_rounding_2/include/CGAL/Snap_rounding_2.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { enum SEG_Direction {SEG_UP_RIGHT,SEG_UP_LEFT,SEG_DOWN_RIGHT,SEG_DOWN_LEFT, SEG_UP,SEG_DOWN,SEG_LEFT,SEG_RIGHT,SEG_POINT_SEG}; @@ -777,6 +777,6 @@ void snap_rounding_2(InputIterator begin, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Snap_rounding_2/include/CGAL/Snap_rounding_kd_2.h b/Snap_rounding_2/include/CGAL/Snap_rounding_kd_2.h index 0345271cf915..fed64de0d69f 100644 --- a/Snap_rounding_2/include/CGAL/Snap_rounding_kd_2.h +++ b/Snap_rounding_2/include/CGAL/Snap_rounding_kd_2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class My_point : public Traits::Point_2 { @@ -485,6 +485,6 @@ class Multiple_kd_tree { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Snap_rounding_2/include/CGAL/Snap_rounding_traits_2.h b/Snap_rounding_2/include/CGAL/Snap_rounding_traits_2.h index 34c2c27a26eb..ffe7650b4fb2 100644 --- a/Snap_rounding_2/include/CGAL/Snap_rounding_traits_2.h +++ b/Snap_rounding_2/include/CGAL/Snap_rounding_traits_2.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Snap_rounding_traits_2 : @@ -199,6 +199,6 @@ class Snap_rounding_traits_2 : }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ISR_2_TRAITS_H diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_2.h b/Spatial_sorting/include/CGAL/Hilbert_sort_2.h index 5fe994ffe2b9..2f1a8d8065dc 100644 --- a/Spatial_sorting/include/CGAL/Hilbert_sort_2.h +++ b/Spatial_sorting/include/CGAL/Hilbert_sort_2.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { template struct Hilbert_cmp_2; @@ -117,6 +117,6 @@ class Hilbert_sort_2 } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif//CGAL_HILBERT_SORT_2_H diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_3.h b/Spatial_sorting/include/CGAL/Hilbert_sort_3.h index 5756ba9d3a4c..68d606db2a93 100644 --- a/Spatial_sorting/include/CGAL/Hilbert_sort_3.h +++ b/Spatial_sorting/include/CGAL/Hilbert_sort_3.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { template struct Hilbert_cmp_3; @@ -139,6 +139,6 @@ class Hilbert_sort_3 } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif//CGAL_HILBERT_SORT_3_H diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_base.h b/Spatial_sorting/include/CGAL/Hilbert_sort_base.h index 757335cd9d53..6924700098db 100644 --- a/Spatial_sorting/include/CGAL/Hilbert_sort_base.h +++ b/Spatial_sorting/include/CGAL/Hilbert_sort_base.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -40,6 +40,6 @@ namespace internal { } } -CGAL_END_NAMESPACE +} //namespace CGAL #endif//CGAL_HILBERT_SORT_BASE_H diff --git a/Spatial_sorting/include/CGAL/Multiscale_sort.h b/Spatial_sorting/include/CGAL/Multiscale_sort.h index 0a1fbb14bb9a..1786858406e7 100644 --- a/Spatial_sorting/include/CGAL/Multiscale_sort.h +++ b/Spatial_sorting/include/CGAL/Multiscale_sort.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Multiscale_sort @@ -53,6 +53,6 @@ class Multiscale_sort } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_MULTISCALE_SORT_H diff --git a/Spatial_sorting/include/CGAL/hilbert_sort.h b/Spatial_sorting/include/CGAL/hilbert_sort.h index 92498a7a397c..d7956c416996 100644 --- a/Spatial_sorting/include/CGAL/hilbert_sort.h +++ b/Spatial_sorting/include/CGAL/hilbert_sort.h @@ -30,7 +30,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -76,6 +76,6 @@ void hilbert_sort (RandomAccessIterator begin, RandomAccessIterator end) hilbert_sort (begin, end, Kernel()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif//CGAL_HILBERT_SORT_H diff --git a/Spatial_sorting/include/CGAL/spatial_sort.h b/Spatial_sorting/include/CGAL/spatial_sort.h index e6b424b41524..3640c6492aa0 100644 --- a/Spatial_sorting/include/CGAL/spatial_sort.h +++ b/Spatial_sorting/include/CGAL/spatial_sort.h @@ -32,7 +32,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -82,6 +82,6 @@ void spatial_sort (RandomAccessIterator begin, RandomAccessIterator end) spatial_sort (begin, end, Kernel()); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif//CGAL_SPATIAL_SORT_H diff --git a/Straight_skeleton_2/include/CGAL/IO/Dxf_stream.h b/Straight_skeleton_2/include/CGAL/IO/Dxf_stream.h index 427fe969137a..c6dbafc8b0e0 100644 --- a/Straight_skeleton_2/include/CGAL/IO/Dxf_stream.h +++ b/Straight_skeleton_2/include/CGAL/IO/Dxf_stream.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Dxf_layer { @@ -317,6 +317,6 @@ class Dxf_stream }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h b/Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h index fa555fd63302..dfcd6836559a 100644 --- a/Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h +++ b/Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Dxf_writer { @@ -278,6 +278,6 @@ class Dxf_writer } ; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_DXF_WRITER_H diff --git a/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_2.h b/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_2.h index ed818fa85bc5..eafaf63ef96f 100644 --- a/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_2.h +++ b/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_2.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Default_polygon_offset_builder_2_visitor @@ -289,7 +289,7 @@ public : CGAL_POLYOFFSET_DEBUG_CODE( int mStepID ; ) }; -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_traits_2.h b/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_traits_2.h index 1d7dfb479c1d..db44947cf22f 100644 --- a/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_traits_2.h +++ b/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_traits_2.h @@ -28,7 +28,7 @@ #include "boost/mpl/if.hpp" #include "boost/mpl/or.hpp" -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace CGAL_SS_i { @@ -380,7 +380,7 @@ CGAL_STRAIGHT_SKELETON_CREATE_FUNCTOR_ADAPTER(Compare_offset_against_event_time_ CGAL_STRAIGHT_SKELETON_CREATE_FUNCTOR_ADAPTER(Construct_terminal_offset_point_2) CGAL_STRAIGHT_SKELETON_CREATE_FUNCTOR_ADAPTER(Construct_offset_point_2) -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYGON_OFFSET_BUILDER_TRAITS_2_H // diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2.h index c752ec3a950e..49f6d28ab2bb 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2.h @@ -22,7 +22,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template< class Traits_ , class Items_ = Straight_skeleton_items_2 @@ -362,7 +362,7 @@ public : }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_STRAIGHT_SKELETON_2_H // diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Polygon_offset_builder_2_impl.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Polygon_offset_builder_2_impl.h index 457dbd238693..a00577b7d920 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Polygon_offset_builder_2_impl.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Polygon_offset_builder_2_impl.h @@ -18,7 +18,7 @@ #ifndef CGAL_POLYGON_OFFSET_BUILDER_2_IMPL_H #define CGAL_POLYGON_OFFSET_BUILDER_2_IMPL_H 1 -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -439,7 +439,7 @@ Polygon_offset_builder_2::GetSeedVertex ( Vertex_const_handl return rSeed ; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYGON_OFFSET_BUILDER_2_IMPL_H // // EOF // diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_aux.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_aux.h index ed13ab369759..5050e7192ab3 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_aux.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_aux.h @@ -30,7 +30,7 @@ // // The heap objects used in this implementation are intrusively reference counted. Thus, they inherit from Ref_counted_base. // -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace CGAL_SS_i { @@ -201,7 +201,7 @@ class Ref_counted_base } }; -CGAL_END_NAMESPACE +} //namespace CGAL namespace boost { diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_2_impl.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_2_impl.h index 439f342f5f46..b6aea2fdbef1 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_2_impl.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_2_impl.h @@ -30,7 +30,7 @@ # pragma warning(disable:4355) // complaint about using 'this' to #endif // initialize a member -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -2071,7 +2071,7 @@ typename Straight_skeleton_builder_2::SSkelPtr Straight_skeleton_builde return mSSkel ; } -CGAL_END_NAMESPACE +} //namespace CGAL #if defined(BOOST_MSVC) # pragma warning(pop) diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_events_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_events_2.h index d886c00eb302..7ccb91c2de2c 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_events_2.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_events_2.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace CGAL_SS_i { @@ -253,7 +253,7 @@ private : } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_STRAIGHT_SKELETON_BUILDER_EVENTS_2_H // // EOF // diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_traits_2_aux.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_traits_2_aux.h index 095aede6a546..a114be622359 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_traits_2_aux.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_traits_2_aux.h @@ -38,7 +38,7 @@ # include #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace CGAL_SS_i { @@ -602,7 +602,7 @@ struct SS_converter : Converter } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_STRAIGHT_SKELETON_BUILDER_TRAITS_2_AUX_H // diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/assertions.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/assertions.h index ec8f9db5d558..d08f9d13ab74 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/assertions.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/assertions.h @@ -32,7 +32,7 @@ #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace { @@ -44,7 +44,7 @@ template inline bool handle_assigned ( Handle const& aH ) } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_STRAIGHT_SKELETON_ASSERTIONS_H // // EOF // diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/debug.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/debug.h index aab9d2de6709..f123f139f3ba 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/debug.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/debug.h @@ -306,7 +306,7 @@ bool sEnableTraitsTrace = false ; # include # include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace CGAL_STRAIGHT_SKELETON_i_profiling { @@ -320,7 +320,7 @@ template<> char const* kernel_type () { return "Expr" ; } // CGAL_STRAIGHT_SKELETON_i_profiling -CGAL_END_NAMESPACE +} //namespace CGAL #define CGAL_STSKEL_ASSERT_PREDICATE_RESULT(expr,K,pred,error) \ { \ diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/test.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/test.h index c069b150d89f..c9b356991080 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/test.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/test.h @@ -44,7 +44,7 @@ #ifdef CGAL_STRAIGHT_SKELETON_ENABLE_INTRINSIC_TESTING -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace CGAL_SS_i { @@ -167,7 +167,7 @@ inline bool is_time_clearly_within_possibly_inexact_bisector_time_interval( FT c } // namespace CGAL_SS_i -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h index deefd6e656cb..db7625be8373 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h @@ -42,7 +42,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Dummy_straight_skeleton_builder_2_visitor @@ -1139,7 +1139,7 @@ private : } ; -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_traits_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_traits_2.h index 12fe75936d38..21734b941224 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_traits_2.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_traits_2.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace CGAL_SS_i { @@ -484,7 +484,7 @@ CGAL_STRAIGHT_SKELETON_CREATE_FUNCTOR_ADAPTER(Are_ss_edges_collinear_2) CGAL_STRAIGHT_SKELETON_CREATE_FUNCTOR_ADAPTER(Construct_ss_event_time_and_point_2) CGAL_STRAIGHT_SKELETON_CREATE_FUNCTOR_ADAPTER(Construct_ss_trisegment_2) -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_STRAIGHT_SKELETON_BUILDER_TRAITS_2_H // // EOF // diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_converter_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_converter_2.h index c49853117c86..bf410e5b3fa8 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_converter_2.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_converter_2.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Straight_skeleton_face_base_base_2 @@ -83,7 +83,7 @@ class Straight_skeleton_face_base_2 : public Straight_skeleton_face_base_base_2< } ; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_STRAIGHT_SKELETON_FACE_BASE_2_H // // EOF // diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_halfedge_base_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_halfedge_base_2.h index ce6ad8f2e97e..13cfe42d2cf2 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_halfedge_base_2.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_halfedge_base_2.h @@ -19,7 +19,7 @@ #define CGAL_STRAIGHT_SKELETON_HALFEDGE_BASE_2_H 1 -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Refs, class FT_> class Straight_skeleton_halfedge_base_base_2 @@ -164,7 +164,7 @@ class Straight_skeleton_halfedge_base_2 : public Straight_skeleton_halfedge_base } ; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_STRAIGHT_SKELETON_HALFEDGE_BASE_2_H // // EOF // diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_items_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_items_2.h index d350fc4fdc4e..d4f213ba847d 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_items_2.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_items_2.h @@ -22,7 +22,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Straight_skeleton_items_2 { @@ -50,7 +50,7 @@ class Straight_skeleton_items_2 } ; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_STRAIGHT_SKELETON_ITEMS_2_H // // EOF // diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_vertex_base_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_vertex_base_2.h index 1392d954b6fa..cf20bb46a282 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_vertex_base_2.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_vertex_base_2.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Refs, class P, class N > class Straight_skeleton_vertex_base_base_2 @@ -296,7 +296,7 @@ class Straight_skeleton_vertex_base_2 : public Straight_skeleton_vertex_base_bas } ; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_STRAIGHT_SKELETON_VERTEX_BASE_2_H // // EOF // diff --git a/Straight_skeleton_2/include/CGAL/Unfiltered_predicate_adaptor.h b/Straight_skeleton_2/include/CGAL/Unfiltered_predicate_adaptor.h index aa6bfa880a81..6c92e5b824f6 100644 --- a/Straight_skeleton_2/include/CGAL/Unfiltered_predicate_adaptor.h +++ b/Straight_skeleton_2/include/CGAL/Unfiltered_predicate_adaptor.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Unfiltered_predicate_adaptor @@ -249,6 +249,6 @@ Unfiltered_predicate_adaptor:: } #endif -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_UNFILTERED_PREDICATE_ADAPTOR_H diff --git a/Straight_skeleton_2/include/CGAL/arrange_offset_polygons_2.h b/Straight_skeleton_2/include/CGAL/arrange_offset_polygons_2.h index 6757afb6d4a7..d0736601b433 100644 --- a/Straight_skeleton_2/include/CGAL/arrange_offset_polygons_2.h +++ b/Straight_skeleton_2/include/CGAL/arrange_offset_polygons_2.h @@ -22,7 +22,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // // This should only be used to arrange the polygons coming from Polygon_offset_builder @@ -109,7 +109,7 @@ arrange_offset_polygons_2 ( std::vector< boost::shared_ptr< Polygon_2 > > con return rResult ; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Straight_skeleton_2/include/CGAL/certified_numeric_predicates.h b/Straight_skeleton_2/include/CGAL/certified_numeric_predicates.h index f3da3157f538..09254ad4f34c 100644 --- a/Straight_skeleton_2/include/CGAL/certified_numeric_predicates.h +++ b/Straight_skeleton_2/include/CGAL/certified_numeric_predicates.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { inline Uncertain logical_or ( Uncertain a, Uncertain b ) { return a | b ; } inline Uncertain logical_and( Uncertain a, Uncertain b ) { return a & b ; } @@ -139,6 +139,6 @@ inline Uncertain certified_sign_of_determinant2x2( const NT& a00 return certified_compare(a00*a11, a10*a01) ; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CERTIFIED_NUMERIC_PREDICATES_H diff --git a/Straight_skeleton_2/include/CGAL/certified_quotient_predicates.h b/Straight_skeleton_2/include/CGAL/certified_quotient_predicates.h index f0f3a144c3e9..0bd17133e8e9 100644 --- a/Straight_skeleton_2/include/CGAL/certified_quotient_predicates.h +++ b/Straight_skeleton_2/include/CGAL/certified_quotient_predicates.h @@ -22,7 +22,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template inline Uncertain certified_quotient_is_positive(const Quotient& x) @@ -129,6 +129,6 @@ inline Uncertain certified_compare(const Quotient& n1, c return certified_quotient_compare(n1,n2); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CERTIFIED_QUOTIENT_PREDICATES_H diff --git a/Straight_skeleton_2/include/CGAL/compute_outer_frame_margin.h b/Straight_skeleton_2/include/CGAL/compute_outer_frame_margin.h index 44e3dba4a982..1882d531df68 100644 --- a/Straight_skeleton_2/include/CGAL/compute_outer_frame_margin.h +++ b/Straight_skeleton_2/include/CGAL/compute_outer_frame_margin.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template boost::optional< typename Traits::FT > compute_outer_frame_margin ( ForwardPointIterator aBegin @@ -114,7 +114,7 @@ boost::optional compute_outer_frame_margin ( ForwardPointIterator aBegin, Fo return compute_outer_frame_margin(aBegin,aEnd,aOffset,traits); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_COMPUTE_OUTER_FRAME_MARGIN_H // // EOF // diff --git a/Straight_skeleton_2/include/CGAL/constructions/Polygon_offset_cons_ftC2.h b/Straight_skeleton_2/include/CGAL/constructions/Polygon_offset_cons_ftC2.h index e636b20181f8..dad5e8416d9b 100644 --- a/Straight_skeleton_2/include/CGAL/constructions/Polygon_offset_cons_ftC2.h +++ b/Straight_skeleton_2/include/CGAL/constructions/Polygon_offset_cons_ftC2.h @@ -20,7 +20,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace CGAL_SS_i { @@ -187,7 +187,7 @@ optional< typename Kernel_traits::Kernel::Point_2 > construct_offs } // namespace CGAL_SS_i -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYGON_OFFSET_CONS_FTC2_H // // EOF // diff --git a/Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h b/Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h index 7c2db86db68d..8d8bd40b33cf 100644 --- a/Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h +++ b/Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h @@ -18,7 +18,7 @@ #ifndef CGAL_STRAIGHT_SKELETON_CONS_FTC2_H #define CGAL_STRAIGHT_SKELETON_CONS_FTC2_H 1 -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace CGAL_SS_i { @@ -766,7 +766,7 @@ optional< typename Kernel_traits::Kernel::Point_2 > construct_offs } // namnepsace CGAIL_SS_i -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_STRAIGHT_SKELETON_CONS_FTC2_H // // EOF // diff --git a/Straight_skeleton_2/include/CGAL/create_offset_polygons_2.h b/Straight_skeleton_2/include/CGAL/create_offset_polygons_2.h index 28f1b253be46..e226f0bb6b9a 100644 --- a/Straight_skeleton_2/include/CGAL/create_offset_polygons_2.h +++ b/Straight_skeleton_2/include/CGAL/create_offset_polygons_2.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace CGAL_SS_i { @@ -259,7 +259,7 @@ create_exterior_skeleton_and_offset_polygons_2 ( FT const& aOffset, Polygon cons } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Straight_skeleton_2/include/CGAL/create_offset_polygons_from_polygon_with_holes_2.h b/Straight_skeleton_2/include/CGAL/create_offset_polygons_from_polygon_with_holes_2.h index d53263d00da8..e633d7174077 100644 --- a/Straight_skeleton_2/include/CGAL/create_offset_polygons_from_polygon_with_holes_2.h +++ b/Straight_skeleton_2/include/CGAL/create_offset_polygons_from_polygon_with_holes_2.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template std::vector< boost::shared_ptr< Polygon_2 > > @@ -97,7 +97,7 @@ create_exterior_skeleton_and_offset_polygons_with_holes_2 ( FT const& -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Straight_skeleton_2/include/CGAL/create_straight_skeleton_2.h b/Straight_skeleton_2/include/CGAL/create_straight_skeleton_2.h index 9d680e8b9e05..f0b4469874bc 100644 --- a/Straight_skeleton_2/include/CGAL/create_straight_skeleton_2.h +++ b/Straight_skeleton_2/include/CGAL/create_straight_skeleton_2.h @@ -22,7 +22,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace CGAL_SS_i { @@ -427,7 +427,7 @@ create_exterior_straight_skeleton_2 ( Polygon const& aContour ) return create_exterior_straight_skeleton_2(aContour, Exact_predicates_inexact_constructions_kernel() ); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_STRAIGHT_SKELETON_BUILDER_2_H // diff --git a/Straight_skeleton_2/include/CGAL/create_straight_skeleton_from_polygon_with_holes_2.h b/Straight_skeleton_2/include/CGAL/create_straight_skeleton_from_polygon_with_holes_2.h index c570dd2c7901..447ed422b046 100644 --- a/Straight_skeleton_2/include/CGAL/create_straight_skeleton_from_polygon_with_holes_2.h +++ b/Straight_skeleton_2/include/CGAL/create_straight_skeleton_from_polygon_with_holes_2.h @@ -22,7 +22,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -80,7 +80,7 @@ create_exterior_straight_skeleton_2 ( Polygon_with_holes_2 -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace CGAL_SS_i { @@ -55,7 +55,7 @@ Uncertain compare_offset_against_isec_timeC2 ( FT const& t, i } // namespace CGAL_SS_i -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POLYGON_OFFSET_PRED_FTC2_H // // EOF // diff --git a/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h b/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h index 48d082943bf7..30f34ba1cf01 100644 --- a/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h +++ b/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h @@ -22,7 +22,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace CGAL_SS_i { @@ -567,6 +567,6 @@ Uncertain are_events_simultaneousC2 ( intrusive_ptr< Trisegment_2 > const& } // namespace CGAL_SS_i -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_STRAIGHT_SKELETON_PREDICATES_FTC2_H // diff --git a/Stream_lines_2/include/CGAL/Euler_integrator_2.h b/Stream_lines_2/include/CGAL/Euler_integrator_2.h index 365d8e76ba32..d83c8119ce53 100644 --- a/Stream_lines_2/include/CGAL/Euler_integrator_2.h +++ b/Stream_lines_2/include/CGAL/Euler_integrator_2.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // The class Euler_integrator_2 is a model of the concept Integrator template @@ -116,6 +116,6 @@ Euler_integrator_2::operator() return euler_integrator(p, vector_field_2, default_integration_step,index); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Stream_lines_2/include/CGAL/Regular_grid_2.h b/Stream_lines_2/include/CGAL/Regular_grid_2.h index d107ebfaa3f2..b008e807c7c4 100644 --- a/Stream_lines_2/include/CGAL/Regular_grid_2.h +++ b/Stream_lines_2/include/CGAL/Regular_grid_2.h @@ -24,7 +24,7 @@ #include #include "streamlines_assertions.h" -CGAL_BEGIN_NAMESPACE +namespace CGAL { // The class Regular_grid_2 provides a rectangular visualization // domain, with a vector field defined on a regular grid, and also a @@ -221,6 +221,6 @@ Regular_grid_2::get_integration_step() const return 1.0; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Stream_lines_2/include/CGAL/Runge_kutta_integrator_2.h b/Stream_lines_2/include/CGAL/Runge_kutta_integrator_2.h index b860fdf3de3e..8151f3a6f142 100644 --- a/Stream_lines_2/include/CGAL/Runge_kutta_integrator_2.h +++ b/Stream_lines_2/include/CGAL/Runge_kutta_integrator_2.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // The class Runge_kutta_integrator_2 is a model of the concept Integrator template @@ -135,6 +135,6 @@ typename Runge_kutta_integrator_2::Point_2 Runge_kutta_integrator return runge_kutta_integrator_2(p, vector_field_2, default_integration_step, v, index); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Stream_lines_2/include/CGAL/Stream_lines_2.h b/Stream_lines_2/include/CGAL/Stream_lines_2.h index 336250205a26..cd5b5d33a415 100644 --- a/Stream_lines_2/include/CGAL/Stream_lines_2.h +++ b/Stream_lines_2/include/CGAL/Stream_lines_2.h @@ -36,7 +36,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Stream_lines_2 @@ -906,6 +906,6 @@ Stream_lines_2::get_pq() return _list; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Stream_lines_2/include/CGAL/Triangular_field_2.h b/Stream_lines_2/include/CGAL/Triangular_field_2.h index 0dec69acb947..85f3649e8625 100644 --- a/Stream_lines_2/include/CGAL/Triangular_field_2.h +++ b/Stream_lines_2/include/CGAL/Triangular_field_2.h @@ -34,7 +34,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Triangular_field_2 @@ -222,6 +222,6 @@ Triangular_field_2::get_integration_step() const return 1.0; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Stream_support/include/CGAL/IO/File_header_OFF.h b/Stream_support/include/CGAL/IO/File_header_OFF.h index d822f19e0aa5..fe58139d2903 100644 --- a/Stream_support/include/CGAL/IO/File_header_OFF.h +++ b/Stream_support/include/CGAL/IO/File_header_OFF.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Info structure for OFF file headers // =================================== @@ -114,6 +114,6 @@ std::ostream& operator<<( std::ostream& out, const File_header_OFF& h); // Scan header. Marks streams badbit if not in SKEL format nor in OFF. std::istream& operator>>( std::istream& in, File_header_OFF& h); -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_FILE_HEADER_OFF_H // // EOF // diff --git a/Stream_support/include/CGAL/IO/File_header_extended_OFF.h b/Stream_support/include/CGAL/IO/File_header_extended_OFF.h index 63b4e21f8775..693cc7764f0d 100644 --- a/Stream_support/include/CGAL/IO/File_header_extended_OFF.h +++ b/Stream_support/include/CGAL/IO/File_header_extended_OFF.h @@ -30,7 +30,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class File_header_extended_OFF { bool m_verbose; // Print error messages if true. @@ -122,6 +122,6 @@ inline std::istream& skip_comment_OFF( std::istream& in) { return in; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_FILE_HEADER_EXTENDED_OFF_H // // EOF // diff --git a/Stream_support/include/CGAL/IO/File_header_gocad.h b/Stream_support/include/CGAL/IO/File_header_gocad.h index a8da241ab1a1..8969adeffa8c 100644 --- a/Stream_support/include/CGAL/IO/File_header_gocad.h +++ b/Stream_support/include/CGAL/IO/File_header_gocad.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class File_header_gocad { private: @@ -57,5 +57,5 @@ inline std::ostream& operator<<( std::ostream& out, const File_header_gocad& h){ "TFACE\n"; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_FILE_HEADER_GOCAD_H diff --git a/Stream_support/include/CGAL/IO/File_scanner_OFF.h b/Stream_support/include/CGAL/IO/File_scanner_OFF.h index d942d94a8994..9982942aa3e1 100644 --- a/Stream_support/include/CGAL/IO/File_scanner_OFF.h +++ b/Stream_support/include/CGAL/IO/File_scanner_OFF.h @@ -34,7 +34,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class File_scanner_OFF : public File_header_OFF { std::istream& m_in; @@ -450,7 +450,7 @@ file_scan_normal( File_scanner_OFF& scanner, Vector& v) { return v; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_FILE_SCANNER_OFF_H // // EOF // diff --git a/Stream_support/include/CGAL/IO/File_writer_OFF.h b/Stream_support/include/CGAL/IO/File_writer_OFF.h index 41330b5f7ec7..ee0dcb282687 100644 --- a/Stream_support/include/CGAL/IO/File_writer_OFF.h +++ b/Stream_support/include/CGAL/IO/File_writer_OFF.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class File_writer_OFF { std::ostream* m_out; @@ -102,6 +102,6 @@ class File_writer_OFF { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_FILE_WRITER_OFF_H // // EOF // diff --git a/Stream_support/include/CGAL/IO/File_writer_VRML_2.h b/Stream_support/include/CGAL/IO/File_writer_VRML_2.h index 9c64451cfa3b..ef4344e7768d 100644 --- a/Stream_support/include/CGAL/IO/File_writer_VRML_2.h +++ b/Stream_support/include/CGAL/IO/File_writer_VRML_2.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class File_writer_VRML_2 { std::ostream* m_out; @@ -53,6 +53,6 @@ class File_writer_VRML_2 { void write_facet_end() { out() << "-1,\n"; } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_FILE_WRITER_VRML_2_H // // EOF // diff --git a/Stream_support/include/CGAL/IO/File_writer_gocad.h b/Stream_support/include/CGAL/IO/File_writer_gocad.h index 9c64d9d57155..4b979d5dff57 100644 --- a/Stream_support/include/CGAL/IO/File_writer_gocad.h +++ b/Stream_support/include/CGAL/IO/File_writer_gocad.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class File_writer_gocad { int m_vertex_index; @@ -77,6 +77,6 @@ class File_writer_gocad { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_FILE_WRITER_GOCAD_H // // EOF // diff --git a/Stream_support/include/CGAL/IO/File_writer_inventor.h b/Stream_support/include/CGAL/IO/File_writer_inventor.h index bbe29473f55a..c15e33d43c66 100644 --- a/Stream_support/include/CGAL/IO/File_writer_inventor.h +++ b/Stream_support/include/CGAL/IO/File_writer_inventor.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class File_writer_inventor { std::ostream* m_out; @@ -50,6 +50,6 @@ class File_writer_inventor { void write_facet_end() { out() << "-1,\n"; } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_FILE_WRITER_INVENTOR_H // // EOF // diff --git a/Stream_support/include/CGAL/IO/File_writer_wavefront.h b/Stream_support/include/CGAL/IO/File_writer_wavefront.h index 77b1cd5cde83..a42aa2f49fa9 100644 --- a/Stream_support/include/CGAL/IO/File_writer_wavefront.h +++ b/Stream_support/include/CGAL/IO/File_writer_wavefront.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class File_writer_wavefront { std::ostream* m_out; @@ -54,6 +54,6 @@ class File_writer_wavefront { void write_facet_end() { out() << '\n'; } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_FILE_WRITER_WAVEFRONT_H // // EOF // diff --git a/Stream_support/include/CGAL/IO/Generic_writer.h b/Stream_support/include/CGAL/IO/Generic_writer.h index bfa88559fe16..4e6ea100146b 100644 --- a/Stream_support/include/CGAL/IO/Generic_writer.h +++ b/Stream_support/include/CGAL/IO/Generic_writer.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class I_Generic_writer_vertex_proxy { @@ -163,6 +163,6 @@ class Generic_writer { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_GENERIC_WRITER_H // // EOF // diff --git a/Stream_support/include/CGAL/IO/Istream_iterator.h b/Stream_support/include/CGAL/IO/Istream_iterator.h index 85d3ae641970..9daa8927c425 100644 --- a/Stream_support/include/CGAL/IO/Istream_iterator.h +++ b/Stream_support/include/CGAL/IO/Istream_iterator.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Istream_iterator { @@ -78,6 +78,6 @@ class Istream_iterator { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_ISTREAM_ITERATOR_H diff --git a/Stream_support/include/CGAL/IO/Ostream_iterator.h b/Stream_support/include/CGAL/IO/Ostream_iterator.h index 1aa0b8bd3a00..858a4d210eac 100644 --- a/Stream_support/include/CGAL/IO/Ostream_iterator.h +++ b/Stream_support/include/CGAL/IO/Ostream_iterator.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // This proxy is for the Ostream_iterator. template @@ -60,6 +60,6 @@ class Ostream_iterator { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_OSTREAM_ITERATOR_H diff --git a/Stream_support/include/CGAL/IO/Scanner_OFF.h b/Stream_support/include/CGAL/IO/Scanner_OFF.h index e9c4beea1041..6fb6e2ddf6f7 100644 --- a/Stream_support/include/CGAL/IO/Scanner_OFF.h +++ b/Stream_support/include/CGAL/IO/Scanner_OFF.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // The Facet_iterator's value type is vector // that contains the vertex indices. @@ -298,6 +298,6 @@ class Scanner_OFF { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_SCANNER_OFF_H // // EOF // diff --git a/Stream_support/include/CGAL/IO/Verbose_ostream.h b/Stream_support/include/CGAL/IO/Verbose_ostream.h index eb51a6b3977e..0484aac66ff4 100644 --- a/Stream_support/include/CGAL/IO/Verbose_ostream.h +++ b/Stream_support/include/CGAL/IO/Verbose_ostream.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { #define CGAL__VERB(x) if (b) *o << x; return *this @@ -73,6 +73,6 @@ class Verbose_ostream { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_VERBOSE_OSTREAM_H diff --git a/Stream_support/include/CGAL/IO/Writer_OFF.h b/Stream_support/include/CGAL/IO/Writer_OFF.h index e1a79cd917ec..18de1f655208 100644 --- a/Stream_support/include/CGAL/IO/Writer_OFF.h +++ b/Stream_support/include/CGAL/IO/Writer_OFF.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Pt > class Writer_OFF : public Generic_writer { @@ -49,6 +49,6 @@ class Writer_OFF : public Generic_writer { ) {} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_WRITER_OFF_H // // EOF // diff --git a/Stream_support/include/CGAL/IO/binary_file_io.h b/Stream_support/include/CGAL/IO/binary_file_io.h index 98ca7baf4352..1c58844f4519 100644 --- a/Stream_support/include/CGAL/IO/binary_file_io.h +++ b/Stream_support/include/CGAL/IO/binary_file_io.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { inline void I_Binary_write_integer32(std::ostream& out, Integer32 i) { @@ -109,6 +109,6 @@ I_Binary_read_big_endian_float32(std::istream& in, float& f) { I_swap_to_big_endian( f); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_BINARY_FILE_IO_H diff --git a/Stream_support/include/CGAL/IO/generic_copy_OFF.h b/Stream_support/include/CGAL/IO/generic_copy_OFF.h index f9c61fb045f6..0b26e297c47d 100644 --- a/Stream_support/include/CGAL/IO/generic_copy_OFF.h +++ b/Stream_support/include/CGAL/IO/generic_copy_OFF.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void @@ -96,6 +96,6 @@ generic_copy_OFF( std::istream& in, std::ostream& out, Writer& writer, generic_copy_OFF( scanner, out, writer); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_GENERIC_COPY_OFF_H // // EOF // diff --git a/Stream_support/src/CGAL/File_header_OFF.cpp b/Stream_support/src/CGAL/File_header_OFF.cpp index 7338e1100e0b..b5658aae48d9 100644 --- a/Stream_support/src/CGAL/File_header_OFF.cpp +++ b/Stream_support/src/CGAL/File_header_OFF.cpp @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { File_header_OFF::File_header_OFF( bool verbose) : File_header_extended_OFF( verbose), @@ -370,5 +370,5 @@ std::istream& operator>>( std::istream& in, File_header_OFF& h) { return in; } -CGAL_END_NAMESPACE +} //namespace CGAL // EOF // diff --git a/Stream_support/src/CGAL/File_header_extended_OFF.cpp b/Stream_support/src/CGAL/File_header_extended_OFF.cpp index 117ac0ea8928..7e82dfcbd17a 100644 --- a/Stream_support/src/CGAL/File_header_extended_OFF.cpp +++ b/Stream_support/src/CGAL/File_header_extended_OFF.cpp @@ -32,7 +32,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { bool File_header_extended_OFF:: is_POL() const { @@ -191,5 +191,5 @@ std::istream& operator>>( std::istream& in, File_header_extended_OFF& h) { #undef CGAL_IN #undef CGAL_INBOOL -CGAL_END_NAMESPACE +} //namespace CGAL // EOF // diff --git a/Stream_support/src/CGAL/File_scanner_OFF.cpp b/Stream_support/src/CGAL/File_scanner_OFF.cpp index 9ed9864f029f..9fb7011db802 100644 --- a/Stream_support/src/CGAL/File_scanner_OFF.cpp +++ b/Stream_support/src/CGAL/File_scanner_OFF.cpp @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { void File_scanner_OFF:: @@ -120,5 +120,5 @@ skip_to_next_facet( int current_facet) { } } -CGAL_END_NAMESPACE +} //namespace CGAL // EOF // diff --git a/Stream_support/src/CGAL/File_writer_OFF.cpp b/Stream_support/src/CGAL/File_writer_OFF.cpp index bbcde2b465c3..95214bb5264c 100644 --- a/Stream_support/src/CGAL/File_writer_OFF.cpp +++ b/Stream_support/src/CGAL/File_writer_OFF.cpp @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { void File_writer_OFF:: @@ -44,5 +44,5 @@ write_header( std::ostream& o, // Print header. out() << m_header; } -CGAL_END_NAMESPACE +} //namespace CGAL // EOF // diff --git a/Stream_support/src/CGAL/File_writer_VRML_2.cpp b/Stream_support/src/CGAL/File_writer_VRML_2.cpp index 4308cb05bbc7..4c4536d2d0ef 100644 --- a/Stream_support/src/CGAL/File_writer_VRML_2.cpp +++ b/Stream_support/src/CGAL/File_writer_VRML_2.cpp @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { void File_writer_VRML_2:: @@ -70,5 +70,5 @@ write_footer() const { " } #Group" << std::endl; } -CGAL_END_NAMESPACE +} //namespace CGAL // EOF // diff --git a/Stream_support/src/CGAL/File_writer_inventor.cpp b/Stream_support/src/CGAL/File_writer_inventor.cpp index 1f2002fa1fe6..8d0774154afa 100644 --- a/Stream_support/src/CGAL/File_writer_inventor.cpp +++ b/Stream_support/src/CGAL/File_writer_inventor.cpp @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { void File_writer_inventor:: @@ -59,5 +59,5 @@ write_footer() const { "} #Separator" << std::endl; } -CGAL_END_NAMESPACE +} //namespace CGAL // EOF // diff --git a/Stream_support/src/CGAL/File_writer_wavefront.cpp b/Stream_support/src/CGAL/File_writer_wavefront.cpp index cefbac932fc6..73a96fd451d5 100644 --- a/Stream_support/src/CGAL/File_writer_wavefront.cpp +++ b/Stream_support/src/CGAL/File_writer_wavefront.cpp @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { void File_writer_wavefront:: @@ -45,5 +45,5 @@ write_header( std::ostream& o, out() << "# ------------------------------------------\n\n"; } -CGAL_END_NAMESPACE +} //namespace CGAL // EOF // diff --git a/Subdivision_method_3/include/CGAL/Polyhedron_decorator_3.h b/Subdivision_method_3/include/CGAL/Polyhedron_decorator_3.h index 77d200bcaea7..e743fcc7331e 100644 --- a/Subdivision_method_3/include/CGAL/Polyhedron_decorator_3.h +++ b/Subdivision_method_3/include/CGAL/Polyhedron_decorator_3.h @@ -26,7 +26,7 @@ #ifndef CGAL_POLYHEDRON_DECORATOR_H_01282002 #define CGAL_POLYHEDRON_DECORATOR_H_01282002 -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Polyhedron_decorator_3 { @@ -204,6 +204,6 @@ Polyhedron_decorator_3::insert_edge(Polyhedron& p, return Halfedge_handle(NULL); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_POLYHEDRON_DECORATOR_H_01282002 diff --git a/Subdivision_method_3/include/CGAL/Subdivision_mask_3.h b/Subdivision_method_3/include/CGAL/Subdivision_mask_3.h index fee2c7afffde..c78e403888a7 100644 --- a/Subdivision_method_3/include/CGAL/Subdivision_mask_3.h +++ b/Subdivision_method_3/include/CGAL/Subdivision_mask_3.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ====================================================================== /// The stencil of the Primal-Quadrilateral-Quadrisection @@ -374,6 +374,6 @@ class Sqrt3_mask_3 : public Linear_mask_3 { //void border_node(Halfedge_handle edge, Point& ept, Point& vpt) {} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_POLYHEDRON_SUBDIVISION_STENCILS_H_01292002 diff --git a/Subdivision_method_3/include/CGAL/Subdivision_method_3.h b/Subdivision_method_3/include/CGAL/Subdivision_method_3.h index 91b8980e458f..083dcd4bc628 100644 --- a/Subdivision_method_3/include/CGAL/Subdivision_method_3.h +++ b/Subdivision_method_3/include/CGAL/Subdivision_method_3.h @@ -35,7 +35,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ====================================================================== namespace Subdivision_method_3 { @@ -82,6 +82,6 @@ namespace Subdivision_method_3 { } } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_POLYHEDRON_SUBDIVISION_H_01292002 diff --git a/Subdivision_method_3/include/CGAL/Subdivision_method_impl_3.h b/Subdivision_method_3/include/CGAL/Subdivision_method_impl_3.h index f9d862d6aa96..27c2403e3d3a 100644 --- a/Subdivision_method_3/include/CGAL/Subdivision_method_impl_3.h +++ b/Subdivision_method_3/include/CGAL/Subdivision_method_impl_3.h @@ -33,7 +33,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ====================================================================== namespace Subdivision_method_3 { @@ -564,6 +564,6 @@ namespace Subdivision_method_3 { } } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_POLYHEDRON_SUBDIVISION_H_01292002 diff --git a/Surface_mesh_parameterization/include/CGAL/Barycentric_mapping_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Barycentric_mapping_parameterizer_3.h index 18da808d2893..52dc98f54120 100644 --- a/Surface_mesh_parameterization/include/CGAL/Barycentric_mapping_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Barycentric_mapping_parameterizer_3.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// The class Barycentric_mapping_parameterizer_3 implements Tutte Barycentric Mapping algorithm [Tut63]. @@ -166,6 +166,6 @@ class Barycentric_mapping_parameterizer_3 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_BARYCENTRIC_MAPPING_PARAMETERIZER_3_H diff --git a/Surface_mesh_parameterization/include/CGAL/Circular_border_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Circular_border_parameterizer_3.h index d07de7cd5915..9aefd2ea2500 100644 --- a/Surface_mesh_parameterization/include/CGAL/Circular_border_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Circular_border_parameterizer_3.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // @@ -362,6 +362,6 @@ class Circular_border_arc_length_parameterizer_3 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_CIRCULARBORDERPARAMETERIZER_3_H diff --git a/Surface_mesh_parameterization/include/CGAL/Convertible_circulator_project.h b/Surface_mesh_parameterization/include/CGAL/Convertible_circulator_project.h index d9a801850592..04b20ae6173b 100644 --- a/Surface_mesh_parameterization/include/CGAL/Convertible_circulator_project.h +++ b/Surface_mesh_parameterization/include/CGAL/Convertible_circulator_project.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// This class inherits from Circulator_project<> + @@ -79,6 +79,6 @@ class Convertible_circulator_project }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_CONVERTIBLE_CIRCULATOR_PROJECT_H diff --git a/Surface_mesh_parameterization/include/CGAL/Convertible_filter_iterator.h b/Surface_mesh_parameterization/include/CGAL/Convertible_filter_iterator.h index 52945d4bec7d..daf2709183e2 100644 --- a/Surface_mesh_parameterization/include/CGAL/Convertible_filter_iterator.h +++ b/Surface_mesh_parameterization/include/CGAL/Convertible_filter_iterator.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// This class inherits from Filter_iterator<> + @@ -82,6 +82,6 @@ class Convertible_filter_iterator }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_CONVERTIBLE_FILTER_ITERATOR_H diff --git a/Surface_mesh_parameterization/include/CGAL/Convertible_iterator_project.h b/Surface_mesh_parameterization/include/CGAL/Convertible_iterator_project.h index ab4455834f97..6966aa1da5ae 100644 --- a/Surface_mesh_parameterization/include/CGAL/Convertible_iterator_project.h +++ b/Surface_mesh_parameterization/include/CGAL/Convertible_iterator_project.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// This class inherits from Iterator_project<> + @@ -77,6 +77,6 @@ class Convertible_iterator_project }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_CONVERTIBLE_ITERATOR_PROJECT_H diff --git a/Surface_mesh_parameterization/include/CGAL/Discrete_authalic_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Discrete_authalic_parameterizer_3.h index 79cbab10bb31..6d45fe0837ea 100644 --- a/Surface_mesh_parameterization/include/CGAL/Discrete_authalic_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Discrete_authalic_parameterizer_3.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// The class Discrete_authalic_parameterizer_3 @@ -175,6 +175,6 @@ class Discrete_authalic_parameterizer_3 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_DISCRETE_AUTHALIC_PARAMETERIZER_3_H diff --git a/Surface_mesh_parameterization/include/CGAL/Discrete_conformal_map_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Discrete_conformal_map_parameterizer_3.h index f7a911b477ec..1cc5c6d28f4a 100644 --- a/Surface_mesh_parameterization/include/CGAL/Discrete_conformal_map_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Discrete_conformal_map_parameterizer_3.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// The class Discrete_conformal_map_parameterizer_3 @@ -173,6 +173,6 @@ class Discrete_conformal_map_parameterizer_3 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_DISCRETE_CONFORMAL_MAP_PARAMETERIZER_3_H diff --git a/Surface_mesh_parameterization/include/CGAL/Fixed_border_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Fixed_border_parameterizer_3.h index fd438dc97081..635ca566cf0e 100644 --- a/Surface_mesh_parameterization/include/CGAL/Fixed_border_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Fixed_border_parameterizer_3.h @@ -32,7 +32,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ------------------------------------------------------------------------------------ @@ -622,6 +622,6 @@ is_one_to_one_mapping(const Adaptor& mesh, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_FIXED_BORDER_PARAMETERIZER_3_H diff --git a/Surface_mesh_parameterization/include/CGAL/LSCM_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/LSCM_parameterizer_3.h index 2737cebb7717..1aaf0178147f 100644 --- a/Surface_mesh_parameterization/include/CGAL/LSCM_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/LSCM_parameterizer_3.h @@ -31,7 +31,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // ------------------------------------------------------------------------------------ @@ -659,6 +659,6 @@ is_one_to_one_mapping(const Adaptor& mesh, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_LSCM_PARAMETERIZER_3_H diff --git a/Surface_mesh_parameterization/include/CGAL/Mean_value_coordinates_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Mean_value_coordinates_parameterizer_3.h index 7b34debc6c37..f0cd9345409e 100644 --- a/Surface_mesh_parameterization/include/CGAL/Mean_value_coordinates_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Mean_value_coordinates_parameterizer_3.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// The class Mean_value_coordinates_parameterizer_3 @@ -190,6 +190,6 @@ class Mean_value_coordinates_parameterizer_3 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_MEAN_VALUE_COORDINATES_PARAMETERIZER_3_H diff --git a/Surface_mesh_parameterization/include/CGAL/Param_mesh_patch_circulators.h b/Surface_mesh_parameterization/include/CGAL/Param_mesh_patch_circulators.h index 6cd624c2a1af..d75943b8ed37 100644 --- a/Surface_mesh_parameterization/include/CGAL/Param_mesh_patch_circulators.h +++ b/Surface_mesh_parameterization/include/CGAL/Param_mesh_patch_circulators.h @@ -31,7 +31,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// Class Mesh_patch_vertex_around_vertex_cir @@ -611,6 +611,6 @@ class Mesh_patch_vertex_around_facet_cir }; // Mesh_patch_vertex_around_facet_cir -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_PARAM_MESH_PATCH_CIRCULATORS_H diff --git a/Surface_mesh_parameterization/include/CGAL/Param_mesh_patch_iterators.h b/Surface_mesh_parameterization/include/CGAL/Param_mesh_patch_iterators.h index c8e7e9b88fca..8849d5fa592d 100644 --- a/Surface_mesh_parameterization/include/CGAL/Param_mesh_patch_iterators.h +++ b/Surface_mesh_parameterization/include/CGAL/Param_mesh_patch_iterators.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// The class Param_mesh_patch_vertex_list is the type of @@ -159,6 +159,6 @@ class Param_mesh_patch_vertex_list_const_iterator }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_PARAM_MESH_PATCH_ITERATORS_H diff --git a/Surface_mesh_parameterization/include/CGAL/Param_mesh_patch_vertex.h b/Surface_mesh_parameterization/include/CGAL/Param_mesh_patch_vertex.h index 90587650a193..22bb5f8da27a 100644 --- a/Surface_mesh_parameterization/include/CGAL/Param_mesh_patch_vertex.h +++ b/Surface_mesh_parameterization/include/CGAL/Param_mesh_patch_vertex.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Forward reference @@ -433,6 +433,6 @@ class Param_mesh_patch_vertex_const_handle }; // Param_mesh_patch_vertex_const_handle -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_PARAM_MESH_PATCH_VERTEX_H diff --git a/Surface_mesh_parameterization/include/CGAL/Parameterization_mesh_feature_extractor.h b/Surface_mesh_parameterization/include/CGAL/Parameterization_mesh_feature_extractor.h index 9edbeebbef76..434af772c901 100644 --- a/Surface_mesh_parameterization/include/CGAL/Parameterization_mesh_feature_extractor.h +++ b/Surface_mesh_parameterization/include/CGAL/Parameterization_mesh_feature_extractor.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// The class Parameterization_mesh_feature_extractor @@ -380,6 +380,6 @@ class Parameterization_mesh_feature_extractor }; // Parameterization_mesh_feature_extractor -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SURFACE_MESH_PARAMETERIZATION_MESH_FEATURE_EXTRACTOR_H diff --git a/Surface_mesh_parameterization/include/CGAL/Parameterization_mesh_patch_3.h b/Surface_mesh_parameterization/include/CGAL/Parameterization_mesh_patch_3.h index 48bc335f9e22..0c978cdfe266 100644 --- a/Surface_mesh_parameterization/include/CGAL/Parameterization_mesh_patch_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Parameterization_mesh_patch_3.h @@ -32,7 +32,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// Parameterization_mesh_patch_3 is a Decorator class to "virtually" cut a patch @@ -1078,6 +1078,6 @@ class Parameterization_mesh_patch_3 }; // Parameterization_mesh_patch_3 -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SURFACE_MESH_PARAMETERIZATION_MESH_PATCH_3_H diff --git a/Surface_mesh_parameterization/include/CGAL/Parameterization_polyhedron_adaptor_3.h b/Surface_mesh_parameterization/include/CGAL/Parameterization_polyhedron_adaptor_3.h index de5ea1cc6824..82ab4008d1be 100644 --- a/Surface_mesh_parameterization/include/CGAL/Parameterization_polyhedron_adaptor_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Parameterization_polyhedron_adaptor_3.h @@ -31,7 +31,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// Parameterization_polyhedron_adaptor_3 is an adaptor class to access to a Polyhedron @@ -1116,6 +1116,6 @@ class Parameterization_polyhedron_adaptor_3 }; // Parameterization_polyhedron_adaptor_3 -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SURFACE_MESH_PARAMETERIZATION_POLYHEDRON_ADAPTOR3_H diff --git a/Surface_mesh_parameterization/include/CGAL/Parameterizer_traits_3.h b/Surface_mesh_parameterization/include/CGAL/Parameterizer_traits_3.h index 30a57a3dd26e..822002007eb4 100644 --- a/Surface_mesh_parameterization/include/CGAL/Parameterizer_traits_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Parameterizer_traits_3.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// The class Parameterizer_traits_3 @@ -229,6 +229,6 @@ class Parameterizer_traits_3 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_PARAMETERIZER_3_H diff --git a/Surface_mesh_parameterization/include/CGAL/Square_border_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Square_border_parameterizer_3.h index 1ed0b9bc1f11..759b6e08e905 100644 --- a/Surface_mesh_parameterization/include/CGAL/Square_border_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Square_border_parameterizer_3.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // @@ -441,6 +441,6 @@ class Square_border_arc_length_parameterizer_3 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_SQUAREBORDERPARAMETERIZER_3_H diff --git a/Surface_mesh_parameterization/include/CGAL/Taucs_matrix.h b/Surface_mesh_parameterization/include/CGAL/Taucs_matrix.h index 59cd491b5d92..ed017871a276 100644 --- a/Surface_mesh_parameterization/include/CGAL/Taucs_matrix.h +++ b/Surface_mesh_parameterization/include/CGAL/Taucs_matrix.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Forward declaration @@ -459,6 +459,6 @@ template<> struct Taucs_traits { }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TAUCS_MATRIX_H diff --git a/Surface_mesh_parameterization/include/CGAL/Taucs_solver_traits.h b/Surface_mesh_parameterization/include/CGAL/Taucs_solver_traits.h index 18d8424fc887..46cf6200436b 100644 --- a/Surface_mesh_parameterization/include/CGAL/Taucs_solver_traits.h +++ b/Surface_mesh_parameterization/include/CGAL/Taucs_solver_traits.h @@ -41,7 +41,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// The class Taucs_symmetric_solver_traits @@ -329,6 +329,6 @@ class Taucs_solver_traits }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TAUCS_SOLVER_TRAITS_H diff --git a/Surface_mesh_parameterization/include/CGAL/Taucs_vector.h b/Surface_mesh_parameterization/include/CGAL/Taucs_vector.h index 09ba0154e670..4c87863784fe 100644 --- a/Surface_mesh_parameterization/include/CGAL/Taucs_vector.h +++ b/Surface_mesh_parameterization/include/CGAL/Taucs_vector.h @@ -21,7 +21,7 @@ #ifndef CGAL_TAUCS_VECTOR #define CGAL_TAUCS_VECTOR -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// The class Taucs_vector @@ -114,6 +114,6 @@ class Taucs_vector }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TAUCS_VECTOR diff --git a/Surface_mesh_parameterization/include/CGAL/Two_vertices_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Two_vertices_parameterizer_3.h index ad7c41ad0037..096725d3f7cc 100644 --- a/Surface_mesh_parameterization/include/CGAL/Two_vertices_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Two_vertices_parameterizer_3.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // @@ -262,6 +262,6 @@ Two_vertices_parameterizer_3::parameterize_border(Adaptor& mesh) } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_TWO_VERTICES_PARAMETERIZER_3_H_INCLUDED diff --git a/Surface_mesh_parameterization/include/CGAL/Win32_exception.h b/Surface_mesh_parameterization/include/CGAL/Win32_exception.h index 4379b13c202a..fcee62fc9ed5 100644 --- a/Surface_mesh_parameterization/include/CGAL/Win32_exception.h +++ b/Surface_mesh_parameterization/include/CGAL/Win32_exception.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// C++ class wrapping a Win32 structured exception. class Win32_exception @@ -121,6 +121,6 @@ class Win32_exception_handler }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_WIN32_EXCEPTION_H diff --git a/Surface_mesh_parameterization/include/CGAL/parameterize.h b/Surface_mesh_parameterization/include/CGAL/parameterize.h index 381ce91ca32c..f70c6dfcf95c 100644 --- a/Surface_mesh_parameterization/include/CGAL/parameterize.h +++ b/Surface_mesh_parameterization/include/CGAL/parameterize.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// Compute a one-to-one mapping from a 3D triangle surface 'mesh' to a @@ -68,6 +68,6 @@ parameterize(ParameterizationMesh_3& mesh, ///< 3D mesh, model of Param } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_PARAMETERIZE_H diff --git a/Surface_mesh_simplification/include/CGAL/Cartesian/MatrixC33.h b/Surface_mesh_simplification/include/CGAL/Cartesian/MatrixC33.h index b76bf0f1cb80..6acdb05d9e66 100644 --- a/Surface_mesh_simplification/include/CGAL/Cartesian/MatrixC33.h +++ b/Surface_mesh_simplification/include/CGAL/Cartesian/MatrixC33.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class MatrixC33 @@ -250,7 +250,7 @@ boost::optional< MatrixC33 > inverse_matrix ( MatrixC33 const& m ) return rInverse ; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CARTESIAN_MATRIXC33_H // // EOF // diff --git a/Surface_mesh_simplification/include/CGAL/Modifiable_priority_queue.h b/Surface_mesh_simplification/include/CGAL/Modifiable_priority_queue.h index eb58dd23bd73..5bf6fe0fda45 100644 --- a/Surface_mesh_simplification/include/CGAL/Modifiable_priority_queue.h +++ b/Surface_mesh_simplification/include/CGAL/Modifiable_priority_queue.h @@ -21,7 +21,7 @@ #include // Neeeded by the following Boost header for CHAR_BIT. #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -82,7 +82,7 @@ class Modifiable_priority_queue } ; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Surface_mesh_simplification/include/CGAL/Null_matrix.h b/Surface_mesh_simplification/include/CGAL/Null_matrix.h index 8275ef56e329..fc8b5132b5e8 100644 --- a/Surface_mesh_simplification/include/CGAL/Null_matrix.h +++ b/Surface_mesh_simplification/include/CGAL/Null_matrix.h @@ -18,13 +18,13 @@ #ifndef CGAL_NULL_MATRIX_H #define CGAL_NULL_MATRIX_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Null_matrix {}; static const Null_matrix NULL_MATRIX = Null_matrix() ; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_NULL_MATRIX_H // diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Common.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Common.h index cb17b9ca637f..e9542cffdaa0 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Common.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Common.h @@ -41,7 +41,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Surface_mesh_simplification { @@ -108,7 +108,7 @@ inline std::string optional_to_string( boost::optional const& o ) } -CGAL_END_NAMESPACE +} //namespace CGAL #if defined(CGAL_SURFACE_SIMPLIFICATION_ENABLE_TRACE) \ || defined(CGAL_SURFACE_SIMPLIFICATION_ENABLE_LT_TRACE) diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse.h index 614a8f3b372c..c9b3c3092cee 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse.h @@ -21,7 +21,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Surface_mesh_simplification { @@ -350,7 +350,7 @@ class EdgeCollapse } // namespace Surface_mesh_simplification -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse_impl.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse_impl.h index 8d4eee162071..762a3a273fcc 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse_impl.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse_impl.h @@ -18,7 +18,7 @@ #ifndef CGAL_SURFACE_MESH_SIMPLIFICATION_DETAIL_EDGE_COLLAPSE_IMPL_H #define CGAL_SURFACE_MESH_SIMPLIFICATION_DETAIL_EDGE_COLLAPSE_IMPL_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Surface_mesh_simplification { @@ -806,7 +806,7 @@ void EdgeCollapse::Update_neighbors( vertex_descriptor } // namespace Surface_mesh_simplification -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SURFACE_MESH_SIMPLIFICATION_DETAIL_EDGE_COLLAPSE_IMPL_H // // EOF // diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Edge_collapse_visitor_base.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Edge_collapse_visitor_base.h index c8565c01f93b..2f239a480519 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Edge_collapse_visitor_base.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Edge_collapse_visitor_base.h @@ -21,7 +21,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Surface_mesh_simplification { @@ -61,7 +61,7 @@ struct Edge_collapse_visitor_base } // namespace Surface_mesh_simplification -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SURFACE_MESH_SIMPLIFICATION_EDGE_COLLAPSE_VISITOR_BASE_H // // EOF // diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Count_ratio_stop_predicate.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Count_ratio_stop_predicate.h index 8de98d6eb00a..c048b5a3ca5b 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Count_ratio_stop_predicate.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Count_ratio_stop_predicate.h @@ -21,7 +21,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Surface_mesh_simplification { @@ -73,7 +73,7 @@ public : } // namespace Surface_mesh_simplification -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_EDGE_COLLAPSE_COUNT_RATIO_STOP_PREDICATE_H // // EOF // diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Count_stop_predicate.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Count_stop_predicate.h index a7a5f3d0bb9f..fcf382c41a56 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Count_stop_predicate.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Count_stop_predicate.h @@ -21,7 +21,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Surface_mesh_simplification { @@ -78,7 +78,7 @@ public : } // namespace Surface_mesh_simplification -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_EDGE_COLLAPSE_COUNT_STOP_PREDICATE_H // // EOF // diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Detail/Lindstrom_Turk_core.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Detail/Lindstrom_Turk_core.h index c21343745959..4059ba9472f6 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Detail/Lindstrom_Turk_core.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Detail/Lindstrom_Turk_core.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // // This should be in @@ -188,7 +188,7 @@ private : } // namespace Surface_mesh_simplification -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Detail/Lindstrom_Turk_core_impl.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Detail/Lindstrom_Turk_core_impl.h index 07f21b8e076c..33332035c879 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Detail/Lindstrom_Turk_core_impl.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Detail/Lindstrom_Turk_core_impl.h @@ -18,7 +18,7 @@ #ifndef CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_EDGE_COLLAPSE_DETAIL_LINDSTROM_TURK_CORE_IMPL_H #define CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_EDGE_COLLAPSE_DETAIL_LINDSTROM_TURK_CORE_IMPL_H 1 -CGAL_BEGIN_NAMESPACE +namespace CGAL { // @@ -606,7 +606,7 @@ void LindstromTurkCore::Add_constraint_from_gradient ( Matrix const& H, V } // namespace Surface_mesh_simplification -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_EDGE_COLLAPSE_DETAIL_LINDSTROMTURK_CORE_IMPL_H // // EOF // diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_length_cost.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_length_cost.h index 9e86941c917c..7aa1e089119b 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_length_cost.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_length_cost.h @@ -21,7 +21,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Surface_mesh_simplification { @@ -62,7 +62,7 @@ class Edge_length_cost } // namespace Surface_mesh_simplification -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_EDGE_COLLAPSE_EDGE_LENGHT_COST_H // EOF // diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_profile.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_profile.h index 88ec8facf0a6..c92eddf3770d 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_profile.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_profile.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Surface_mesh_simplification { @@ -185,7 +185,7 @@ public : } // namespace Surface_mesh_simplification -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_profile_impl.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_profile_impl.h index a2dda1e91a40..8163af44dc20 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_profile_impl.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_profile_impl.h @@ -18,7 +18,7 @@ #ifndef CGAL_SURFACE_MESH_SIMPLIFICATION_DETAIL_EDGE_PROFILE_IMPL_H #define CGAL_SURFACE_MESH_SIMPLIFICATION_DETAIL_EDGE_PROFILE_IMPL_H 1 -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Surface_mesh_simplification { @@ -243,7 +243,7 @@ void Edge_profile::Extract_triangles_and_link( VertexIdxMap const& verte } // namespace Surface_mesh_simplification -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SURFACE_MESH_SIMPLIFICATION_DETAIL_EDGE_PROFILE_IMPL_H // EOF // diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/LindstromTurk_cost.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/LindstromTurk_cost.h index 9d695d8e8859..18fbd4fbac8d 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/LindstromTurk_cost.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/LindstromTurk_cost.h @@ -21,7 +21,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Surface_mesh_simplification { @@ -57,7 +57,7 @@ class LindstromTurk_cost } // namespace Surface_mesh_simplification -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_EDGE_COLLAPSE_LINDSTROMTURK_COST_H // // EOF // diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/LindstromTurk_params.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/LindstromTurk_params.h index f59e41050d81..e0e51b48a39d 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/LindstromTurk_params.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/LindstromTurk_params.h @@ -18,7 +18,7 @@ #ifndef CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_EDGE_COLLAPSE_LINDSTROMTURK_PARAMS_H #define CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_EDGE_COLLAPSE_LINDSTROMTURK_PARAMS_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Surface_mesh_simplification { @@ -46,7 +46,7 @@ struct LindstromTurk_params } // namespace Surface_mesh_simplification -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_EDGE_COLLAPSE_LINDSTROMTURK_PARAMS_H // EOF // diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/LindstromTurk_placement.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/LindstromTurk_placement.h index 0c026d05223f..66e395ef10db 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/LindstromTurk_placement.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/LindstromTurk_placement.h @@ -21,7 +21,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Surface_mesh_simplification { @@ -57,7 +57,7 @@ class LindstromTurk_placement } // namespace Surface_mesh_simplification -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_EDGE_COLLAPSE_LINDSTROMTURK_PLACEMENT_H // // EOF // diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Midpoint_placement.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Midpoint_placement.h index 01249e35744a..8f409a45b859 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Midpoint_placement.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Midpoint_placement.h @@ -21,7 +21,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Surface_mesh_simplification { @@ -52,7 +52,7 @@ class Midpoint_placement } // namespace Surface_mesh_simplification -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_EDGE_COLLAPSE_MIDPOINT_PLACEMENT_H // // EOF // diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/edge_collapse.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/edge_collapse.h index b1fcebb56b5f..670a46ac4519 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/edge_collapse.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/edge_collapse.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Surface_mesh_simplification { @@ -124,7 +124,7 @@ int edge_collapse ( ECM& aSurface, ShouldStop const& aShould_stop ) } // namespace Surface_mesh_simplification -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SURFACE_MESH_SIMPLIFICATION_EDGE_COLLAPSE_H // // EOF // diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/halfedge_collapse_Polyhedron_3.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/halfedge_collapse_Polyhedron_3.h index 61076a392738..f77cf187d113 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/halfedge_collapse_Polyhedron_3.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/halfedge_collapse_Polyhedron_3.h @@ -27,7 +27,7 @@ # define CGAL_HDS_PARAM_ class HDS #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace Surface_mesh_simplification { @@ -121,7 +121,7 @@ halfedge_collapse( typename boost::graph_traits< Polyhedron_3 >::edg } // namespace Surface_mesh_simplification -CGAL_END_NAMESPACE +} //namespace CGAL #undef CGAL_HDS_ diff --git a/Surface_mesher/include/CGAL/IO/output_surface_facets_to_polyhedron.h b/Surface_mesher/include/CGAL/IO/output_surface_facets_to_polyhedron.h index ebb32846d89f..a150c3427109 100644 --- a/Surface_mesher/include/CGAL/IO/output_surface_facets_to_polyhedron.h +++ b/Surface_mesher/include/CGAL/IO/output_surface_facets_to_polyhedron.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// Gets reconstructed surface out of a SurfaceMeshComplex_2InTriangulation_3 object. @@ -54,6 +54,6 @@ output_surface_facets_to_polyhedron( } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_OUTPUT_SURFACE_FACETS_TO_POLYHEDRON_H diff --git a/Surface_mesher/include/CGAL/Robust_circumcenter_traits_3.h b/Surface_mesher/include/CGAL/Robust_circumcenter_traits_3.h index 68b384f120e7..8dc00bd3fead 100644 --- a/Surface_mesher/include/CGAL/Robust_circumcenter_traits_3.h +++ b/Surface_mesher/include/CGAL/Robust_circumcenter_traits_3.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename K > class Robust_construct_weighted_circumcenter_3 @@ -141,6 +141,6 @@ class Robust_weighted_circumcenter_traits_3 { return Compute_squared_radius_3(); } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_ROBUST_CIRCUMCENTER_TRAITS_3_H diff --git a/Surface_mesher/include/CGAL/builder.h b/Surface_mesher/include/CGAL/builder.h index 5690874eade2..9167c1080f01 100644 --- a/Surface_mesher/include/CGAL/builder.h +++ b/Surface_mesher/include/CGAL/builder.h @@ -30,7 +30,7 @@ Enriched incremental builder for CGAL Polyhedral Surfaces. #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class HalfedgeDS_> class Enriched_polyhedron_incremental_builder_3 { @@ -816,7 +816,7 @@ remove_unconnected_vertices( Tag_true) { return true; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_USE_POLYHEDRON_DESIGN_ONE // #endif // CGAL_Enriched_polyhedron_incremental_builder_3_H // diff --git a/Surface_reconstruction_points_3/include/CGAL/IO/output_surface_facets_to_triangle_soup.h b/Surface_reconstruction_points_3/include/CGAL/IO/output_surface_facets_to_triangle_soup.h index e0341fbbdbf5..0bae0302243f 100644 --- a/Surface_reconstruction_points_3/include/CGAL/IO/output_surface_facets_to_triangle_soup.h +++ b/Surface_reconstruction_points_3/include/CGAL/IO/output_surface_facets_to_triangle_soup.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// Gets reconstructed surface out of a SurfaceMeshComplex_2InTriangulation_3 object. @@ -70,6 +70,6 @@ output_surface_facets_to_triangle_soup( } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_OUTPUT_SURFACE_FACETS_TO_TRIANGLE_SOUP_H diff --git a/Surface_reconstruction_points_3/include/CGAL/Lightweight_vector_3.h b/Surface_reconstruction_points_3/include/CGAL/Lightweight_vector_3.h index 31711a3625bb..671a0a9bb653 100644 --- a/Surface_reconstruction_points_3/include/CGAL/Lightweight_vector_3.h +++ b/Surface_reconstruction_points_3/include/CGAL/Lightweight_vector_3.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// The Lightweight_vector_3 class represents a 3D vector (oriented). @@ -212,6 +212,6 @@ class Lightweight_vector_3 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_LIGHTWEIGHT_VECTOR_3_H diff --git a/Surface_reconstruction_points_3/include/CGAL/Peak_memory_sizer.h b/Surface_reconstruction_points_3/include/CGAL/Peak_memory_sizer.h index d0209d9a13a8..6dd3b7ce7edb 100644 --- a/Surface_reconstruction_points_3/include/CGAL/Peak_memory_sizer.h +++ b/Surface_reconstruction_points_3/include/CGAL/Peak_memory_sizer.h @@ -31,7 +31,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// Peak_memory_sizer extends Memory_sizer with new memory statistics. @@ -187,6 +187,6 @@ struct Peak_memory_sizer : public Memory_sizer }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_PEAK_MEMORY_SIZER_H diff --git a/Surface_reconstruction_points_3/include/CGAL/Poisson_reconstruction_function.h b/Surface_reconstruction_points_3/include/CGAL/Poisson_reconstruction_function.h index 441cfd148439..a0b27d42e23b 100644 --- a/Surface_reconstruction_points_3/include/CGAL/Poisson_reconstruction_function.h +++ b/Surface_reconstruction_points_3/include/CGAL/Poisson_reconstruction_function.h @@ -38,7 +38,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// Given a set of 3D points with oriented normals sampled on the boundary of a 3D solid, @@ -777,6 +777,6 @@ class Poisson_reconstruction_function }; // end of Poisson_reconstruction_function -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POISSON_RECONSTRUCTION_FUNCTION_H diff --git a/Surface_reconstruction_points_3/include/CGAL/Reconstruction_triangulation_3.h b/Surface_reconstruction_points_3/include/CGAL/Reconstruction_triangulation_3.h index 57fc751e368e..66aaa0de8ff3 100644 --- a/Surface_reconstruction_points_3/include/CGAL/Reconstruction_triangulation_3.h +++ b/Surface_reconstruction_points_3/include/CGAL/Reconstruction_triangulation_3.h @@ -33,7 +33,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// The Reconstruction_vertex_base_3 class is the default @@ -462,6 +462,6 @@ class Reconstruction_triangulation_3 : public Delaunay_triangulation_3 }; // end of Reconstruction_triangulation_3 -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IMPLICIT_FCT_DELAUNAY_TRIANGULATION_H diff --git a/Surface_reconstruction_points_3/include/CGAL/k_nearest_neighbor.h b/Surface_reconstruction_points_3/include/CGAL/k_nearest_neighbor.h index 6732c49b19dd..dd9f63fde870 100644 --- a/Surface_reconstruction_points_3/include/CGAL/k_nearest_neighbor.h +++ b/Surface_reconstruction_points_3/include/CGAL/k_nearest_neighbor.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// Wrapper around Orthogonal_k_neighbor_search for Triangulation_3 Vertex_handles. @@ -92,6 +92,6 @@ class K_nearest_neighbor }; // K_nearest_neighbor -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_K_NEIGHBOR_NEIGHBOR_H diff --git a/Surface_reconstruction_points_3/include/CGAL/poisson_refine_triangulation.h b/Surface_reconstruction_points_3/include/CGAL/poisson_refine_triangulation.h index 99cbf21a9466..04845fdde549 100644 --- a/Surface_reconstruction_points_3/include/CGAL/poisson_refine_triangulation.h +++ b/Surface_reconstruction_points_3/include/CGAL/poisson_refine_triangulation.h @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { /// Utility class for poisson_refine_triangulation(): @@ -251,6 +251,6 @@ unsigned int poisson_refine_triangulation( } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_POISSON_REFINE_TRIANGULATION_H diff --git a/Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h b/Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h index eb67025cff03..964482f9f462 100644 --- a/Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h +++ b/Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { struct No_intersection_tag{}; struct Exact_intersections_tag{}; // to be used with an exact number type @@ -1233,6 +1233,6 @@ limit_intersection(const Gt& gt, return i; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_CONSTRAINED_TRIANGULATION_2_H diff --git a/Triangulation_2/include/CGAL/Constrained_triangulation_face_base_2.h b/Triangulation_2/include/CGAL/Constrained_triangulation_face_base_2.h index 3c2314f1e097..5d352e9250f6 100644 --- a/Triangulation_2/include/CGAL/Constrained_triangulation_face_base_2.h +++ b/Triangulation_2/include/CGAL/Constrained_triangulation_face_base_2.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template > class Constrained_triangulation_face_base_2 @@ -152,6 +152,6 @@ cw_permute() set_constraints(C[1],C[2],C[0]); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_CONSTRAINED_TRIANGULATION_FACE_BASE_2_H diff --git a/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h b/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h index 2ea27dd3c0b6..b19d07dfc73c 100644 --- a/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h +++ b/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Tr the base triangulation class // Tr has to be Constrained or Constrained_Delaunay @@ -649,6 +649,6 @@ vertices_in_constraint_end(Vertex_handle va, Vertex_handle vb) return hierarchy.vertices_in_constraint_end(va,vb); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_CONSTRAINED_TRIANGULATION_PLUS_2_H diff --git a/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h b/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h index 3dce318afac1..80481a122cb4 100644 --- a/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h +++ b/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // T is expected to be Vertex_handle // Data is intended to store info on a Vertex @@ -754,5 +754,5 @@ print() const } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CONSTRAINT_HIERARCHY_2_H diff --git a/Triangulation_2/include/CGAL/Delaunay_triangulation_2.h b/Triangulation_2/include/CGAL/Delaunay_triangulation_2.h index 7bec2fc5876c..791d4cd70730 100644 --- a/Triangulation_2/include/CGAL/Delaunay_triangulation_2.h +++ b/Triangulation_2/include/CGAL/Delaunay_triangulation_2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Gt, class Tds = Triangulation_data_structure_2 < @@ -2583,6 +2583,6 @@ move_if_no_collision_and_give_new_faces(Vertex_handle v, return v; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_DELAUNAY_TRIANGULATION_2_H diff --git a/Triangulation_2/include/CGAL/Distance_2.h b/Triangulation_2/include/CGAL/Distance_2.h index b6cf2b426d2d..9e9b2a37bc29 100644 --- a/Triangulation_2/include/CGAL/Distance_2.h +++ b/Triangulation_2/include/CGAL/Distance_2.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Distance_2 @@ -96,6 +96,6 @@ struct Distance_xy_3 : public Distance_2 } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_DISTANCE_2_H diff --git a/Triangulation_2/include/CGAL/Dummy_tds_2.h b/Triangulation_2/include/CGAL/Dummy_tds_2.h index 9db908deff2b..440017d3aa25 100644 --- a/Triangulation_2/include/CGAL/Dummy_tds_2.h +++ b/Triangulation_2/include/CGAL/Dummy_tds_2.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Dummy TDS which provides all types that a vertex_base or cell_base can use. struct Dummy_tds_2 { @@ -45,6 +45,6 @@ struct Dummy_tds_2 { typedef std::size_t size_type; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_DUMMY_TDS_2_H diff --git a/Triangulation_2/include/CGAL/IO/Triangulation_geomview_ostream_2.h b/Triangulation_2/include/CGAL/IO/Triangulation_geomview_ostream_2.h index 92453946fac9..34525cf76c84 100644 --- a/Triangulation_2/include/CGAL/IO/Triangulation_geomview_ostream_2.h +++ b/Triangulation_2/include/CGAL/IO/Triangulation_geomview_ostream_2.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // There are 2 drawing functions for triangulations : depending on the wired // mode of the Geomview_stream, we draw either the edges or the faces. @@ -113,6 +113,6 @@ operator<<( Geomview_stream &gv, const Triangulation_2 &T) return gv; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_TRIANGULATION_GEOMVIEW_OSTREAM_2_H diff --git a/Triangulation_2/include/CGAL/IO/Triangulation_ps_stream.h b/Triangulation_2/include/CGAL/IO/Triangulation_ps_stream.h index 61e79c01136e..9ced24709fbc 100644 --- a/Triangulation_2/include/CGAL/IO/Triangulation_ps_stream.h +++ b/Triangulation_2/include/CGAL/IO/Triangulation_ps_stream.h @@ -23,7 +23,7 @@ #ifdef CGAL_TRIANGULATION_2_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template PS_Stream& operator << (PS_Stream& ps, const Triangulation_2 &t) @@ -31,12 +31,12 @@ PS_Stream& operator << (PS_Stream& ps, const Triangulation_2 &t) t.draw_triangulation(ps); return ps; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_2_H #ifdef CGAL_DELAUNAY_TRIANGULATION_2_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Gt, class Tds > PS_Stream& operator << (PS_Stream& ps, const Delaunay_triangulation_2 &t) @@ -44,11 +44,11 @@ PS_Stream& operator << (PS_Stream& ps, t.draw_triangulation(ps); return ps; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_DELAUNAY_TRIANGULATION_2_H #ifdef CGAL_CONSTRAINED_TRIANGULATION_2_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Gt, class Tds> PS_Stream& operator<<(PS_Stream& ps, const Constrained_triangulation_2 &t) @@ -57,12 +57,12 @@ PS_Stream& operator<<(PS_Stream& ps, t.draw_triangulation(ps); return ps; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_CONSTRAINED_TRIANGULATION_2_H #ifdef CGAL_REGULAR_TRIANGULATION_2_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Gt, class Tds > PS_Stream& operator << (PS_Stream& ps, Regular_triangulation_2 &t) @@ -70,7 +70,7 @@ PS_Stream& operator << (PS_Stream& ps, t.draw_triangulation(ps); return ps; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_REGULAR_TRIANGULATION_2_H #endif //CGAL_TRIANGULATION_PS_STREAM diff --git a/Triangulation_2/include/CGAL/Regular_triangulation_2.h b/Triangulation_2/include/CGAL/Regular_triangulation_2.h index b969715ed89e..9912d661e879 100644 --- a/Triangulation_2/include/CGAL/Regular_triangulation_2.h +++ b/Triangulation_2/include/CGAL/Regular_triangulation_2.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename K_ > struct Weighted_point_mapper_2 @@ -2125,6 +2125,6 @@ nearest_power_vertex(const Bare_point& p) const } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_REGULAR_TRIANGULATION_2_H diff --git a/Triangulation_2/include/CGAL/Regular_triangulation_euclidean_traits_2.h b/Triangulation_2/include/CGAL/Regular_triangulation_euclidean_traits_2.h index 2dc39ef15e9a..59d9b3a875c0 100644 --- a/Triangulation_2/include/CGAL/Regular_triangulation_euclidean_traits_2.h +++ b/Triangulation_2/include/CGAL/Regular_triangulation_euclidean_traits_2.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // constructions for DUALITY: weighted_circumcenter and radical // axis @@ -405,14 +405,14 @@ class Regular_triangulation_euclidean_traits_2 : public Regular_triangulation_euclidean_traits_base_2 {}; -CGAL_END_NAMESPACE +} //namespace CGAL // Now specialize for Filtered_kernel, to get // the filtered traits automatically. #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // This declaration is needed to break the cyclic dependency. template < typename K > @@ -427,6 +427,6 @@ class Regular_triangulation_euclidean_traits_2 < Filtered_kernel > typedef Filtered_kernel Kernel; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_REGULAR_TRIANGULATION_EUCLIDEAN_TRAITS_2_H diff --git a/Triangulation_2/include/CGAL/Regular_triangulation_face_base_2.h b/Triangulation_2/include/CGAL/Regular_triangulation_face_base_2.h index 40140030af78..e33e26695386 100644 --- a/Triangulation_2/include/CGAL/Regular_triangulation_face_base_2.h +++ b/Triangulation_2/include/CGAL/Regular_triangulation_face_base_2.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template > @@ -84,6 +84,6 @@ class Regular_triangulation_face_base_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_REGULAR_TRIANGULATION_FACE_BASE_2_H diff --git a/Triangulation_2/include/CGAL/Regular_triangulation_filtered_traits_2.h b/Triangulation_2/include/CGAL/Regular_triangulation_filtered_traits_2.h index 220352385866..23f6ee2c40b9 100644 --- a/Triangulation_2/include/CGAL/Regular_triangulation_filtered_traits_2.h +++ b/Triangulation_2/include/CGAL/Regular_triangulation_filtered_traits_2.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // The Weighted_converter is parametrized by a usual kernel converter, // and adds the conversions for the Weighted_point. @@ -91,6 +91,6 @@ class Regular_triangulation_filtered_traits_2 // Construct_radical_axis_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_REGULAR_TRIANGULATION_FILTERED_TRAITS_2_H diff --git a/Triangulation_2/include/CGAL/Regular_triangulation_vertex_base_2.h b/Triangulation_2/include/CGAL/Regular_triangulation_vertex_base_2.h index cd50c29edeb9..c6d127af3b4f 100644 --- a/Triangulation_2/include/CGAL/Regular_triangulation_vertex_base_2.h +++ b/Triangulation_2/include/CGAL/Regular_triangulation_vertex_base_2.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class GT, class Vb = Triangulation_ds_vertex_base_2<> > @@ -88,7 +88,7 @@ operator<<(std::ostream &os, return os << static_cast(v) << v.point(); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_REGULAR_TRIANGULATION_VERTEX_BASE_2_H diff --git a/Triangulation_2/include/CGAL/Triangulation_2.h b/Triangulation_2/include/CGAL/Triangulation_2.h index 853c002e52bc..5e347c295f4b 100644 --- a/Triangulation_2/include/CGAL/Triangulation_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_2.h @@ -44,7 +44,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Gt, class Tds > class Triangulation_2; template < class Gt, class Tds > std::istream& operator>> (std::istream& is, Triangulation_2 &tr); @@ -3424,7 +3424,7 @@ operator>>(std::istream& is, Triangulation_2 &tr) return is; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_TRIANGULATION_2_H diff --git a/Triangulation_2/include/CGAL/Triangulation_2_traits_3.h b/Triangulation_2/include/CGAL/Triangulation_2_traits_3.h index 4481b31c8f4b..aa4e8f88dd1a 100644 --- a/Triangulation_2/include/CGAL/Triangulation_2_traits_3.h +++ b/Triangulation_2/include/CGAL/Triangulation_2_traits_3.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Compare_yz_3 @@ -115,5 +115,5 @@ class Triangulation_2_traits_3 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_2_TRAITS_3_H diff --git a/Triangulation_2/include/CGAL/Triangulation_data_structure_2.h b/Triangulation_2/include/CGAL/Triangulation_data_structure_2.h index 489ff2dae259..6da6b6716c50 100644 --- a/Triangulation_2/include/CGAL/Triangulation_data_structure_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_data_structure_2.h @@ -43,7 +43,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Vb = Triangulation_ds_vertex_base_2<>, class Fb = Triangulation_ds_face_base_2<> > @@ -2174,6 +2174,6 @@ operator<<(std::ostream& os, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_TRIANGULATION_DATA_STRUCTURE_2_H diff --git a/Triangulation_2/include/CGAL/Triangulation_ds_circulators_2.h b/Triangulation_2/include/CGAL/Triangulation_ds_circulators_2.h index 83bb95188c45..830dee51288c 100644 --- a/Triangulation_2/include/CGAL/Triangulation_ds_circulators_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_ds_circulators_2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Tds> class Triangulation_ds_face_circulator_2 @@ -614,6 +614,6 @@ operator!=(Nullptr_t CGAL_triangulation_assertion_code(n)) const } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_TRIANGULATION_DS_CIRCULATORS_2_H diff --git a/Triangulation_2/include/CGAL/Triangulation_ds_face_2.h b/Triangulation_2/include/CGAL/Triangulation_ds_face_2.h index 8c545c6fc3b9..87f4b76b4116 100644 --- a/Triangulation_2/include/CGAL/Triangulation_ds_face_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_ds_face_2.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Fb > class Triangulation_ds_face_2 @@ -124,6 +124,6 @@ is_valid(bool verbose, int level) const } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_TRIANGULATION_DS_FACE_2_H diff --git a/Triangulation_2/include/CGAL/Triangulation_ds_face_base_2.h b/Triangulation_2/include/CGAL/Triangulation_ds_face_base_2.h index 6ea4b1f80a30..aa0a7a4338a3 100644 --- a/Triangulation_2/include/CGAL/Triangulation_ds_face_base_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_ds_face_base_2.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename TDS = void> class Triangulation_ds_face_base_2 @@ -353,6 +353,6 @@ class Triangulation_ds_face_base_2 -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_DS_TRIANGULATION_FACE_BASE_2_H diff --git a/Triangulation_2/include/CGAL/Triangulation_ds_iterators_2.h b/Triangulation_2/include/CGAL/Triangulation_ds_iterators_2.h index 604934bd756b..f6252a6309a6 100644 --- a/Triangulation_2/include/CGAL/Triangulation_ds_iterators_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_ds_iterators_2.h @@ -24,7 +24,7 @@ #include //#include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Triangulation_ds_edge_iterator_2 @@ -212,6 +212,6 @@ operator*() const edge.first = pos; return edge; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_TRIANGULATION_DS_ITERATORS_2_H diff --git a/Triangulation_2/include/CGAL/Triangulation_ds_vertex_2.h b/Triangulation_2/include/CGAL/Triangulation_ds_vertex_2.h index 8448a94d8181..0c0495b2dcea 100644 --- a/Triangulation_2/include/CGAL/Triangulation_ds_vertex_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_ds_vertex_2.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Triangulation_ds_vertex_2 @@ -118,6 +118,6 @@ is_valid(bool verbose, int level) return result; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_TRIANGULATION_DS_VERTEX_2_H diff --git a/Triangulation_2/include/CGAL/Triangulation_ds_vertex_base_2.h b/Triangulation_2/include/CGAL/Triangulation_ds_vertex_base_2.h index 8091b08601b1..019dce4264ee 100644 --- a/Triangulation_2/include/CGAL/Triangulation_ds_vertex_base_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_ds_vertex_base_2.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class TDS = void > class Triangulation_ds_vertex_base_2 @@ -88,6 +88,6 @@ operator<<(std::ostream &os, const Triangulation_ds_vertex_base_2 &) { return os; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_TRIANGULATION_DS_VERTEX_BASE_2_H diff --git a/Triangulation_2/include/CGAL/Triangulation_euclidean_traits_2.h b/Triangulation_2/include/CGAL/Triangulation_euclidean_traits_2.h index 4a30d2783e7f..192e7950b042 100644 --- a/Triangulation_2/include/CGAL/Triangulation_euclidean_traits_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_euclidean_traits_2.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class R > class Triangulation_euclidean_traits_2 { @@ -121,6 +121,6 @@ class Triangulation_euclidean_traits_2 { }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_EUCLIDEAN_TRAITS_2_H diff --git a/Triangulation_2/include/CGAL/Triangulation_euclidean_traits_xy_3.h b/Triangulation_2/include/CGAL/Triangulation_euclidean_traits_xy_3.h index 97534da8125a..3339d5ef95de 100644 --- a/Triangulation_2/include/CGAL/Triangulation_euclidean_traits_xy_3.h +++ b/Triangulation_2/include/CGAL/Triangulation_euclidean_traits_xy_3.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Orientation_xy_3 @@ -131,6 +131,6 @@ class Triangulation_euclidean_traits_xy_3 { }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_EUCLIDEAN_TRAITS_XY_3_H diff --git a/Triangulation_2/include/CGAL/Triangulation_euclidean_traits_xz_3.h b/Triangulation_2/include/CGAL/Triangulation_euclidean_traits_xz_3.h index a1ab7b89d59a..b1d4bf509e2a 100644 --- a/Triangulation_2/include/CGAL/Triangulation_euclidean_traits_xz_3.h +++ b/Triangulation_2/include/CGAL/Triangulation_euclidean_traits_xz_3.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Orientation_xz_3 @@ -128,7 +128,7 @@ class Triangulation_euclidean_traits_xz_3 { {return Construct_triangle_2();} }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_EUCLIDEAN_TRAITS_XZ_3_H diff --git a/Triangulation_2/include/CGAL/Triangulation_euclidean_traits_yz_3.h b/Triangulation_2/include/CGAL/Triangulation_euclidean_traits_yz_3.h index b5eccfcf4ba0..240353c96331 100644 --- a/Triangulation_2/include/CGAL/Triangulation_euclidean_traits_yz_3.h +++ b/Triangulation_2/include/CGAL/Triangulation_euclidean_traits_yz_3.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Orientation_yz_3 @@ -131,7 +131,7 @@ class Triangulation_euclidean_traits_yz_3 { }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_EUCLIDEAN_TRAITS_YZ_3_H diff --git a/Triangulation_2/include/CGAL/Triangulation_face_base_2.h b/Triangulation_2/include/CGAL/Triangulation_face_base_2.h index 98ed6190a079..75767674db82 100644 --- a/Triangulation_2/include/CGAL/Triangulation_face_base_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_face_base_2.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename Gt, typename Fb = Triangulation_ds_face_base_2<> > class Triangulation_face_base_2 @@ -96,6 +96,6 @@ mirror_index(int i) const } #endif -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_TRIANGULATION_FACE_BASE_2_H diff --git a/Triangulation_2/include/CGAL/Triangulation_face_base_with_info_2.h b/Triangulation_2/include/CGAL/Triangulation_face_base_with_info_2.h index d5575793aa65..8dcdeb308d6a 100644 --- a/Triangulation_2/include/CGAL/Triangulation_face_base_with_info_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_face_base_with_info_2.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename Info_, typename GT, typename Fb = Triangulation_face_base_2 > @@ -63,6 +63,6 @@ class Triangulation_face_base_with_info_2 Info& info() { return _info; } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_FACE_BASE_WITH_INFO_2_H diff --git a/Triangulation_2/include/CGAL/Triangulation_hierarchy_2.h b/Triangulation_2/include/CGAL/Triangulation_hierarchy_2.h index 01c87d09981d..2535558d445a 100644 --- a/Triangulation_2/include/CGAL/Triangulation_hierarchy_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_hierarchy_2.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // parameterization of the hierarchy //const float Triangulation_hierarchy_2__ratio = 30.0; @@ -738,6 +738,6 @@ random_level() } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_HIERARCHY_2_H diff --git a/Triangulation_2/include/CGAL/Triangulation_hierarchy_vertex_base_2.h b/Triangulation_2/include/CGAL/Triangulation_hierarchy_vertex_base_2.h index 0638bf8038a0..7c8a3d5e16c7 100644 --- a/Triangulation_2/include/CGAL/Triangulation_hierarchy_vertex_base_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_hierarchy_vertex_base_2.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Vbb> class Triangulation_hierarchy_vertex_base_2 @@ -65,6 +65,6 @@ class Triangulation_hierarchy_vertex_base_2 Vertex_handle _down; // same vertex one level below }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_HIERARCHY_VERTEX_BASE_2_H diff --git a/Triangulation_2/include/CGAL/Triangulation_iterator_adaptator.h b/Triangulation_2/include/CGAL/Triangulation_iterator_adaptator.h index 439e8f8f412f..bafc41a8225d 100644 --- a/Triangulation_2/include/CGAL/Triangulation_iterator_adaptator.h +++ b/Triangulation_2/include/CGAL/Triangulation_iterator_adaptator.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Triangulation_iterator_handle_adaptor @@ -50,6 +50,6 @@ struct Triangulation_iterator_handle_adaptor -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_TRIANGULATION_ITERATOR_ADAPTATOR_H diff --git a/Triangulation_2/include/CGAL/Triangulation_line_face_circulator_2.h b/Triangulation_2/include/CGAL/Triangulation_line_face_circulator_2.h index 9eb1d4c4fa54..2f1fdb09fac6 100644 --- a/Triangulation_2/include/CGAL/Triangulation_line_face_circulator_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_line_face_circulator_2.h @@ -28,7 +28,7 @@ // #include // #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template // < class Gt, class Tds > @@ -696,5 +696,5 @@ collinear_outside() const _tr->is_infinite(fh->neighbor(ccw(i)))); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_TRIANGULATION_LINE_FACE_CIRCULATOR_2_H diff --git a/Triangulation_2/include/CGAL/Triangulation_utils_2.h b/Triangulation_2/include/CGAL/Triangulation_utils_2.h index c988b0315f8f..b83b97338e34 100644 --- a/Triangulation_2/include/CGAL/Triangulation_utils_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_utils_2.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class T = void > struct Triangulation_cw_ccw_static_2 { @@ -54,6 +54,6 @@ class Triangulation_cw_ccw_2 } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_TRIANGULATION_UTILS_2_H diff --git a/Triangulation_2/include/CGAL/Triangulation_vertex_base_2.h b/Triangulation_2/include/CGAL/Triangulation_vertex_base_2.h index 8dc8ad12207c..c76cbae58009 100644 --- a/Triangulation_2/include/CGAL/Triangulation_vertex_base_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_vertex_base_2.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename GT, typename Vb = Triangulation_ds_vertex_base_2<> > @@ -143,6 +143,6 @@ handle() return Vertex_handle(); } #endif -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_TRIANGULATION_VERTEX_BASE_2_H diff --git a/Triangulation_2/include/CGAL/Triangulation_vertex_base_with_info_2.h b/Triangulation_2/include/CGAL/Triangulation_vertex_base_with_info_2.h index d93e25b2ed5c..a1a7e934bd0a 100644 --- a/Triangulation_2/include/CGAL/Triangulation_vertex_base_with_info_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_vertex_base_with_info_2.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename Info_, typename GT, typename Vb = Triangulation_vertex_base_2 > @@ -58,6 +58,6 @@ class Triangulation_vertex_base_with_info_2 Info& info() { return _info; } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_VERTEX_BASE_WITH_INFO_2_H diff --git a/Triangulation_2/include/CGAL/Trivial_iterator.h b/Triangulation_2/include/CGAL/Trivial_iterator.h index fcdae44ed91c..71d706ae0d38 100644 --- a/Triangulation_2/include/CGAL/Trivial_iterator.h +++ b/Triangulation_2/include/CGAL/Trivial_iterator.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // TODO : // - comparison operators should be global, but it causes problems... @@ -132,6 +132,6 @@ class Trivial_comparable_iterator # define CGAL_TRIVIAL_COMPARABLE_ITERATOR_CHECKER(X) X #endif -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIVIAL_ITERATOR_H diff --git a/Triangulation_2/include/CGAL/constructions_on_weighted_points_cartesian_2.h b/Triangulation_2/include/CGAL/constructions_on_weighted_points_cartesian_2.h index 622895244044..ebc84976b962 100644 --- a/Triangulation_2/include/CGAL/constructions_on_weighted_points_cartesian_2.h +++ b/Triangulation_2/include/CGAL/constructions_on_weighted_points_cartesian_2.h @@ -22,7 +22,7 @@ //#include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class RT > @@ -84,5 +84,5 @@ radical_axisC2(const RT &px, const RT &py, const We &pw, -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_CONSTRUCTIONS_ON_WEIGHTED_POINTS_CARTESIAN_2_H diff --git a/Triangulation_2/include/CGAL/constructions_on_weighted_points_homogeneous_2.h b/Triangulation_2/include/CGAL/constructions_on_weighted_points_homogeneous_2.h index 2d91fb19d0d4..09fd4860e58b 100644 --- a/Triangulation_2/include/CGAL/constructions_on_weighted_points_homogeneous_2.h +++ b/Triangulation_2/include/CGAL/constructions_on_weighted_points_homogeneous_2.h @@ -21,7 +21,7 @@ #ifndef CGAL_CONSTRUCTIONS_ON_WEIGHTED_POINTS_HOMOGENEOUS_2_H #define CGAL_CONSTRUCTIONS_ON_WEIGHTED_POINTS_HOMOGENEOUS_2_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class RT, class We> void @@ -83,5 +83,5 @@ radical_axisH2(const RT &phx, const RT &phy, const RT &phw, const We &pwt, -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_CONSTRUCTIONS_ON_WEIGHTED_POINTS_HOMOGENEOUS_2_H diff --git a/Triangulation_2/include/CGAL/predicates/Regular_triangulation_ftC2.h b/Triangulation_2/include/CGAL/predicates/Regular_triangulation_ftC2.h index 6c7a7a8c11ca..bea5ac2f604a 100644 --- a/Triangulation_2/include/CGAL/predicates/Regular_triangulation_ftC2.h +++ b/Triangulation_2/include/CGAL/predicates/Regular_triangulation_ftC2.h @@ -24,7 +24,7 @@ // This file contains the low level cartesian predicates // used by the 2D regular triangulation. -CGAL_BEGIN_NAMESPACE +namespace CGAL { template Comparison_result @@ -89,6 +89,6 @@ power_testC2( const FT &px, const FT &py, const FT &pwt, return cmpy * sign_of_determinant(dpy, dpz, dqy, dqz); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_REGULAR_TRIANGULATION_FTC2_H diff --git a/Triangulation_2/include/CGAL/predicates/Regular_triangulation_rtH2.h b/Triangulation_2/include/CGAL/predicates/Regular_triangulation_rtH2.h index cf115a4aa9b9..2a46f7d1cb74 100644 --- a/Triangulation_2/include/CGAL/predicates/Regular_triangulation_rtH2.h +++ b/Triangulation_2/include/CGAL/predicates/Regular_triangulation_rtH2.h @@ -24,7 +24,7 @@ // This file contains the low level homogeneous predicates // used by the 2D regular triangulation. -CGAL_BEGIN_NAMESPACE +namespace CGAL { template Comparison_result @@ -120,6 +120,6 @@ power_testH2( const RT &phx, const RT &phy, const RT &phw, const RT &pwt, ta, dtz, dthw); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_REGULAR_TRIANGULATION_RTH2_H diff --git a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_tds_face.h b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_tds_face.h index 4d56eb013f8d..dcb563e684d6 100644 --- a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_tds_face.h +++ b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_tds_face.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void @@ -191,4 +191,4 @@ _test_cls_tds_face( const Tds ) return; } -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_tds_vertex.h b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_tds_vertex.h index f293667fefc4..b52ff307f25d 100644 --- a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_tds_vertex.h +++ b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_tds_vertex.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void @@ -54,4 +54,4 @@ _test_cls_tds_vertex( const Tds&) // They are tested in _test_tds__2.h } -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_traits.h b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_traits.h index 1f53367ed590..6c4dd31c6425 100644 --- a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_traits.h +++ b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_traits.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // Create a mininal traits class class Triangulation_test_point { @@ -484,4 +484,4 @@ std::ostream &operator<<(std::ostream &os, const Triangulation_test_point &p) } -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h b/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h index e37ffe729b8b..ef1dc31fc5a3 100644 --- a/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h +++ b/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h @@ -35,7 +35,7 @@ # error "The old remove() code has been removed. Please report any issue you may have with the current one." #endif -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Gt, class Tds_ = Default, @@ -1461,7 +1461,7 @@ is_valid(Cell_handle c, bool verbose, int level) const return true; } -CGAL_END_NAMESPACE +} //namespace CGAL #include diff --git a/Triangulation_3/include/CGAL/IO/Triangulation_geomview_ostream_3.h b/Triangulation_3/include/CGAL/IO/Triangulation_geomview_ostream_3.h index 7c0347b7002d..4b4eb25f4849 100644 --- a/Triangulation_3/include/CGAL/IO/Triangulation_geomview_ostream_3.h +++ b/Triangulation_3/include/CGAL/IO/Triangulation_geomview_ostream_3.h @@ -28,7 +28,7 @@ // - Use the stream color instead of built-in constant/random. // - If interfaces were more similar, we could think of sharing 2d and 3d ? -CGAL_BEGIN_NAMESPACE +namespace CGAL { // This one is to show the edges of a 3D triangulation. template < class GT, class TDS > @@ -92,6 +92,6 @@ operator<<( Geomview_stream &gv, const Triangulation_3 &T) return gv; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_TRIANGULATION_GEOMVIEW_OSTREAM_3_H diff --git a/Triangulation_3/include/CGAL/Regular_triangulation_3.h b/Triangulation_3/include/CGAL/Regular_triangulation_3.h index d4101b1344b9..7c7bb9abc65e 100644 --- a/Triangulation_3/include/CGAL/Regular_triangulation_3.h +++ b/Triangulation_3/include/CGAL/Regular_triangulation_3.h @@ -36,7 +36,7 @@ # pragma warning(disable:4355) // complaint about using 'this' to #endif // initialize a member -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Gt, class Tds_ = Default > class Regular_triangulation_3 @@ -1446,7 +1446,7 @@ is_valid(bool verbose, int level) const return true; } -CGAL_END_NAMESPACE +} //namespace CGAL #if defined(BOOST_MSVC) # pragma warning(pop) diff --git a/Triangulation_3/include/CGAL/Regular_triangulation_cell_base_3.h b/Triangulation_3/include/CGAL/Regular_triangulation_cell_base_3.h index a6ea600d103c..fe6759275e27 100644 --- a/Triangulation_3/include/CGAL/Regular_triangulation_cell_base_3.h +++ b/Triangulation_3/include/CGAL/Regular_triangulation_cell_base_3.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename GT, typename Cb = Triangulation_cell_base_3, @@ -83,6 +83,6 @@ class Regular_triangulation_cell_base_3 Point_container _hidden; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_REGULAR_TRIANGULATION_CELL_BASE_3_H diff --git a/Triangulation_3/include/CGAL/Regular_triangulation_euclidean_traits_3.h b/Triangulation_3/include/CGAL/Regular_triangulation_euclidean_traits_3.h index 2d11dea7e8b7..0c31dd52680d 100644 --- a/Triangulation_3/include/CGAL/Regular_triangulation_euclidean_traits_3.h +++ b/Triangulation_3/include/CGAL/Regular_triangulation_euclidean_traits_3.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // returns minus the sign of the determinant of the lifted points // associated with p,q,r,s,t [P,Q,R,S,T] @@ -745,14 +745,14 @@ compare_power_distance_3 (const Point &p, return compare_power_distance_3(p,q,r, Tag()); } -CGAL_END_NAMESPACE +} //namespace CGAL // Partial specialization for Filtered_kernel. #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal{ // This declaration is needed to break the cyclic dependency. @@ -769,6 +769,6 @@ class Regular_triangulation_euclidean_traits_3 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_REGULAR_TRIANGULATION_EUCLIDEAN_TRAITS_3_H diff --git a/Triangulation_3/include/CGAL/Triangulation_3.h b/Triangulation_3/include/CGAL/Triangulation_3.h index 5a49f3b7510c..75d9192e908d 100644 --- a/Triangulation_3/include/CGAL/Triangulation_3.h +++ b/Triangulation_3/include/CGAL/Triangulation_3.h @@ -49,7 +49,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class GT, class Tds = Default > class Triangulation_3; @@ -4998,6 +4998,6 @@ operator!=(const Triangulation_3 &t1, return ! (t1 == t2); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_3_H diff --git a/Triangulation_3/include/CGAL/Triangulation_cell_base_3.h b/Triangulation_3/include/CGAL/Triangulation_cell_base_3.h index 70b326aa5e05..ff4dec079032 100644 --- a/Triangulation_3/include/CGAL/Triangulation_cell_base_3.h +++ b/Triangulation_3/include/CGAL/Triangulation_cell_base_3.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename GT, typename Cb = Triangulation_ds_cell_base_3<> > class Triangulation_cell_base_3 @@ -98,6 +98,6 @@ operator<<(std::ostream &os, const Triangulation_cell_base_3 &c) } #endif -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_CELL_BASE_3_H diff --git a/Triangulation_3/include/CGAL/Triangulation_cell_base_with_circumcenter_3.h b/Triangulation_3/include/CGAL/Triangulation_cell_base_with_circumcenter_3.h index a4f74df0d3fe..a0ef35940e20 100644 --- a/Triangulation_3/include/CGAL/Triangulation_cell_base_with_circumcenter_3.h +++ b/Triangulation_3/include/CGAL/Triangulation_cell_base_with_circumcenter_3.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename GT, typename Cb = Triangulation_ds_cell_base_3<> > class Triangulation_cell_base_with_circumcenter_3 @@ -126,6 +126,6 @@ class Triangulation_cell_base_with_circumcenter_3 } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_CELL_BASE_WITH_CIRCUMCENTER_3_H diff --git a/Triangulation_3/include/CGAL/Triangulation_cell_base_with_info_3.h b/Triangulation_3/include/CGAL/Triangulation_cell_base_with_info_3.h index 39afc8dbbb3f..68d344f65074 100644 --- a/Triangulation_3/include/CGAL/Triangulation_cell_base_with_info_3.h +++ b/Triangulation_3/include/CGAL/Triangulation_cell_base_with_info_3.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename Info_, typename GT, typename Cb = Triangulation_cell_base_3 > @@ -60,6 +60,6 @@ class Triangulation_cell_base_with_info_3 Info& info() { return _info; } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_CELL_BASE_WITH_INFO_3_H diff --git a/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h b/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h index e940480265d7..9a2d31a5a636 100644 --- a/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h +++ b/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h @@ -47,7 +47,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // TODO : noms : Vb != Vertex_base : clarifier. @@ -3335,6 +3335,6 @@ count_cells(size_type & i, bool verbose, int level) const return true; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_DATA_STRUCTURE_3_H diff --git a/Triangulation_3/include/CGAL/Triangulation_ds_cell_base_3.h b/Triangulation_3/include/CGAL/Triangulation_ds_cell_base_3.h index f0b2e4d6eed9..ce91f52da81b 100644 --- a/Triangulation_3/include/CGAL/Triangulation_ds_cell_base_3.h +++ b/Triangulation_3/include/CGAL/Triangulation_ds_cell_base_3.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename TDS = void > class Triangulation_ds_cell_base_3 @@ -238,6 +238,6 @@ class Triangulation_ds_cell_base_3 struct Rebind_TDS { typedef Triangulation_ds_cell_base_3 Other; }; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_DS_CELL_BASE_3_H diff --git a/Triangulation_3/include/CGAL/Triangulation_ds_vertex_base_3.h b/Triangulation_3/include/CGAL/Triangulation_ds_vertex_base_3.h index d02f1ce9fa26..79efe1687728 100644 --- a/Triangulation_3/include/CGAL/Triangulation_ds_vertex_base_3.h +++ b/Triangulation_3/include/CGAL/Triangulation_ds_vertex_base_3.h @@ -22,7 +22,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename TDS = void > class Triangulation_ds_vertex_base_3 @@ -95,6 +95,6 @@ class Triangulation_ds_vertex_base_3 struct Rebind_TDS { typedef Triangulation_ds_vertex_base_3 Other; }; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_DS_VERTEX_BASE_3_H diff --git a/Triangulation_3/include/CGAL/Triangulation_geom_traits_3.h b/Triangulation_3/include/CGAL/Triangulation_geom_traits_3.h index f5524c52d84f..54ea53c1bdf7 100644 --- a/Triangulation_3/include/CGAL/Triangulation_geom_traits_3.h +++ b/Triangulation_3/include/CGAL/Triangulation_geom_traits_3.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Repres > class Triangulation_geom_traits_3 : public Repres @@ -74,6 +74,6 @@ class Triangulation_geom_traits_3 : public Repres typedef typename Rep::Compare_distance_3 Compare_distance_3; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_GEOM_TRAITS_3_H diff --git a/Triangulation_3/include/CGAL/Triangulation_hierarchy_3.h b/Triangulation_3/include/CGAL/Triangulation_hierarchy_3.h index ec3c137753ed..91d707b6157c 100644 --- a/Triangulation_3/include/CGAL/Triangulation_hierarchy_3.h +++ b/Triangulation_3/include/CGAL/Triangulation_hierarchy_3.h @@ -29,7 +29,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // This class is deprecated, but must be kept for backward compatibility. // @@ -705,6 +705,6 @@ random_level() return (std::min)(die(), (int)maxlevel)-1; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_HIERARCHY_3_H diff --git a/Triangulation_3/include/CGAL/Triangulation_hierarchy_vertex_base_3.h b/Triangulation_3/include/CGAL/Triangulation_hierarchy_vertex_base_3.h index 689cbd267cf5..8803067afe28 100644 --- a/Triangulation_3/include/CGAL/Triangulation_hierarchy_vertex_base_3.h +++ b/Triangulation_3/include/CGAL/Triangulation_hierarchy_vertex_base_3.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class Vbb > class Triangulation_hierarchy_vertex_base_3 @@ -60,6 +60,6 @@ class Triangulation_hierarchy_vertex_base_3 Vertex_handle _down; // same vertex one level below }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_HIERARCHY_VERTEX_BASE_3_H diff --git a/Triangulation_3/include/CGAL/Triangulation_simplex_3.h b/Triangulation_3/include/CGAL/Triangulation_simplex_3.h index 28cdb9f9b5cd..cd26ac81d5c8 100644 --- a/Triangulation_3/include/CGAL/Triangulation_simplex_3.h +++ b/Triangulation_3/include/CGAL/Triangulation_simplex_3.h @@ -21,7 +21,7 @@ #ifndef CGAL_TRIANGULATION_SIMPLEX_3_H #define CGAL_TRIANGULATION_SIMPLEX_3_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class TriangulationDataStructure_3 > class Triangulation_simplex_3 { @@ -279,6 +279,6 @@ operator<< (std::ostream& os, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_SIMPLEX_3_H diff --git a/Triangulation_3/include/CGAL/Triangulation_utils_3.h b/Triangulation_3/include/CGAL/Triangulation_utils_3.h index 503007898837..ebee5f81a2c4 100644 --- a/Triangulation_3/include/CGAL/Triangulation_utils_3.h +++ b/Triangulation_3/include/CGAL/Triangulation_utils_3.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { // We use the following template class in order to avoid having a static data // member of a non-template class which would require src/Triangulation_3.C . @@ -79,6 +79,6 @@ struct Triangulation_utils_3 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_UTILS_3_H diff --git a/Triangulation_3/include/CGAL/Triangulation_vertex_base_3.h b/Triangulation_3/include/CGAL/Triangulation_vertex_base_3.h index 20329828d541..b4f4e94467c2 100644 --- a/Triangulation_3/include/CGAL/Triangulation_vertex_base_3.h +++ b/Triangulation_3/include/CGAL/Triangulation_vertex_base_3.h @@ -22,7 +22,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename GT, typename DSVb = Triangulation_ds_vertex_base_3<> > class Triangulation_vertex_base_3 @@ -81,6 +81,6 @@ operator<<(std::ostream &os, const Triangulation_vertex_base_3 &v) return os << static_cast(v) << v.point(); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_VERTEX_BASE_3_H diff --git a/Triangulation_3/include/CGAL/Triangulation_vertex_base_with_info_3.h b/Triangulation_3/include/CGAL/Triangulation_vertex_base_with_info_3.h index 61545387a668..04cd5517e988 100644 --- a/Triangulation_3/include/CGAL/Triangulation_vertex_base_with_info_3.h +++ b/Triangulation_3/include/CGAL/Triangulation_vertex_base_with_info_3.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < typename Info_, typename GT, typename Vb = Triangulation_vertex_base_3 > @@ -58,6 +58,6 @@ class Triangulation_vertex_base_with_info_3 Info& info() { return _info; } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_TRIANGULATION_VERTEX_BASE_WITH_INFO_3_H diff --git a/Triangulation_3/include/CGAL/constructions/constructions_on_weighted_points_cartesian_3.h b/Triangulation_3/include/CGAL/constructions/constructions_on_weighted_points_cartesian_3.h index 641c852598d5..3abdd5110392 100644 --- a/Triangulation_3/include/CGAL/constructions/constructions_on_weighted_points_cartesian_3.h +++ b/Triangulation_3/include/CGAL/constructions/constructions_on_weighted_points_cartesian_3.h @@ -20,7 +20,7 @@ #ifndef CGAL_CONSTRUCTIONS_ON_WEIGHTED_POINTS_CARTESIAN_3_H #define CGAL_CONSTRUCTIONS_ON_WEIGHTED_POINTS_CARTESIAN_3_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { template void @@ -494,5 +494,5 @@ critical_squared_radiusC3( -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_CONSTRUCTIONS_ON_WEIGHTED_POINTS_CARTESIAN_3_H diff --git a/Triangulation_3/include/CGAL/predicates/Regular_triangulation_ftC3.h b/Triangulation_3/include/CGAL/predicates/Regular_triangulation_ftC3.h index 2386f87ba8de..2eeecc20abe6 100644 --- a/Triangulation_3/include/CGAL/predicates/Regular_triangulation_ftC3.h +++ b/Triangulation_3/include/CGAL/predicates/Regular_triangulation_ftC3.h @@ -23,7 +23,7 @@ // This file contains the low level cartesian predicates // used by the 3D regular triangulation. -CGAL_BEGIN_NAMESPACE +namespace CGAL { // return minus the sign of the 5x5 determinant [P,Q,R,S,T] // where column [P] = transpose[px,py,pz,p^2 -wp,1] @@ -155,6 +155,6 @@ power_testC3(const FT &pwt, const FT &qwt) return CGAL_NTS compare(qwt, pwt); } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_REGULAR_TRIANGULATION_FTC3_H diff --git a/Triangulation_3/include/CGAL/predicates/Regular_triangulation_rtH3.h b/Triangulation_3/include/CGAL/predicates/Regular_triangulation_rtH3.h index 5173a1e8298b..70d780a70f3b 100644 --- a/Triangulation_3/include/CGAL/predicates/Regular_triangulation_rtH3.h +++ b/Triangulation_3/include/CGAL/predicates/Regular_triangulation_rtH3.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template Oriented_side @@ -81,6 +81,6 @@ power_testH3( // The 2 degenerate are not speed critical, and they are quite boring and error // prone to write, so we use the Cartesian version, using FT. -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_REGULAR_TRIANGULATION_RTH3_H diff --git a/Triangulation_3/include/CGAL/predicates/predicates_on_weighted_points_cartesian_3.h b/Triangulation_3/include/CGAL/predicates/predicates_on_weighted_points_cartesian_3.h index 1fa70fb82fd5..22eeefeeebc0 100644 --- a/Triangulation_3/include/CGAL/predicates/predicates_on_weighted_points_cartesian_3.h +++ b/Triangulation_3/include/CGAL/predicates/predicates_on_weighted_points_cartesian_3.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template < class FT > Comparison_result @@ -277,7 +277,7 @@ does_simplex_intersect_weighted_dual_supportC3( } //------------------------------------------------------------------- -CGAL_END_NAMESPACE +} //namespace CGAL //------------------------------------------------------------------- #endif //CGAL_PREDICATES_ON_WEIGHTED_POINTS_CARTESIAN_3 diff --git a/Union_find/include/CGAL/Union_find.h b/Union_find/include/CGAL/Union_find.h index 5860e03c6b6b..e0aeef1ba389 100644 --- a/Union_find/include/CGAL/Union_find.h +++ b/Union_find/include/CGAL/Union_find.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { namespace internal { @@ -249,6 +249,6 @@ void Union_find::unify_sets( handle p, handle q) { --sets; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_UNION_FIND_H diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_Apollonius_diagram_halfedge_2.h b/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_Apollonius_diagram_halfedge_2.h index 1f3a98adb9bf..80759dc9124e 100644 --- a/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_Apollonius_diagram_halfedge_2.h +++ b/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_Apollonius_diagram_halfedge_2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Apollonius_diagram_halfedge_2 @@ -185,7 +185,7 @@ Qt_widget& operator<<(Qt_widget& qt_w, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_QT_WIDGET_APOLLONIUS_DIAGRAM_HALFEDGE_2_H diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_Voronoi_diagram_halfedge_2.h b/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_Voronoi_diagram_halfedge_2.h index 5a5432ca3e65..62db0e93e677 100644 --- a/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_Voronoi_diagram_halfedge_2.h +++ b/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_Voronoi_diagram_halfedge_2.h @@ -23,7 +23,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Voronoi_diagram_halfedge_2 @@ -129,7 +129,7 @@ Qt_widget& operator<<(Qt_widget& qt_w, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_QT_WIDGET_VORONOI_DIAGRAM_HALFEDGE_2_H diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_power_diagram_halfedge_2.h b/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_power_diagram_halfedge_2.h index 49e70bd781c7..64ad90c176d2 100644 --- a/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_power_diagram_halfedge_2.h +++ b/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/CGAL/IO/Qt_widget_power_diagram_halfedge_2.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Power_diagram_halfedge_2 @@ -132,7 +132,7 @@ Qt_widget& operator<<(Qt_widget& qt_w, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_QT_WIDGET_POWER_DIAGRAM_HALFEDGE_2_H diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/Virtual_Voronoi_diagram_2.h b/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/Virtual_Voronoi_diagram_2.h index fa103ad56512..60311f39346e 100644 --- a/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/Virtual_Voronoi_diagram_2.h +++ b/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/Virtual_Voronoi_diagram_2.h @@ -30,7 +30,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { struct Virtual_Voronoi_diagram_2 @@ -506,7 +506,7 @@ class Concrete_Apollonius_diagram_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VIRTUAL_VORONOI_DIAGRAM_2_H diff --git a/Voronoi_diagram_2/include/CGAL/Apollonius_graph_adaptation_policies_2.h b/Voronoi_diagram_2/include/CGAL/Apollonius_graph_adaptation_policies_2.h index ac21bcadbafe..273f64941292 100644 --- a/Voronoi_diagram_2/include/CGAL/Apollonius_graph_adaptation_policies_2.h +++ b/Voronoi_diagram_2/include/CGAL/Apollonius_graph_adaptation_policies_2.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //========================================================================= //========================================================================= @@ -65,6 +65,6 @@ struct Apollonius_graph_caching_degeneracy_removal_policy_2 //========================================================================= //========================================================================= -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_ADAPTATION_POLICIES_2_H diff --git a/Voronoi_diagram_2/include/CGAL/Apollonius_graph_adaptation_traits_2.h b/Voronoi_diagram_2/include/CGAL/Apollonius_graph_adaptation_traits_2.h index a1c7203e61f5..9ac4e3258459 100644 --- a/Voronoi_diagram_2/include/CGAL/Apollonius_graph_adaptation_traits_2.h +++ b/Voronoi_diagram_2/include/CGAL/Apollonius_graph_adaptation_traits_2.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Apollonius_graph_adaptation_traits_2 @@ -43,6 +43,6 @@ struct Apollonius_graph_adaptation_traits_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_APOLLONIUS_GRAPH_ADAPTATION_TRAITS_2_H diff --git a/Voronoi_diagram_2/include/CGAL/Delaunay_triangulation_adaptation_policies_2.h b/Voronoi_diagram_2/include/CGAL/Delaunay_triangulation_adaptation_policies_2.h index b46426dc81e5..6f6b89de42f0 100644 --- a/Voronoi_diagram_2/include/CGAL/Delaunay_triangulation_adaptation_policies_2.h +++ b/Voronoi_diagram_2/include/CGAL/Delaunay_triangulation_adaptation_policies_2.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //========================================================================= //========================================================================= @@ -67,6 +67,6 @@ struct Delaunay_triangulation_caching_degeneracy_removal_policy_2 //========================================================================= //========================================================================= -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_DELAUNAY_TRIANGULATION_ADAPTATION_POLICIES_2_H diff --git a/Voronoi_diagram_2/include/CGAL/Delaunay_triangulation_adaptation_traits_2.h b/Voronoi_diagram_2/include/CGAL/Delaunay_triangulation_adaptation_traits_2.h index 1cab083dec56..f1fe9a900abf 100644 --- a/Voronoi_diagram_2/include/CGAL/Delaunay_triangulation_adaptation_traits_2.h +++ b/Voronoi_diagram_2/include/CGAL/Delaunay_triangulation_adaptation_traits_2.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Delaunay_triangulation_adaptation_traits_2 @@ -44,6 +44,6 @@ struct Delaunay_triangulation_adaptation_traits_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_DELAUNAY_TRIANGULATION_ADAPTATION_TRAITS_2_H diff --git a/Voronoi_diagram_2/include/CGAL/Identity_policy_2.h b/Voronoi_diagram_2/include/CGAL/Identity_policy_2.h index 5832598fd486..8b6cad129133 100644 --- a/Voronoi_diagram_2/include/CGAL/Identity_policy_2.h +++ b/Voronoi_diagram_2/include/CGAL/Identity_policy_2.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -42,7 +42,7 @@ struct Identity_policy_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IDENTITY_POLICY_2_H diff --git a/Voronoi_diagram_2/include/CGAL/Regular_triangulation_adaptation_policies_2.h b/Voronoi_diagram_2/include/CGAL/Regular_triangulation_adaptation_policies_2.h index 6cca15c38c56..0588f07358ac 100644 --- a/Voronoi_diagram_2/include/CGAL/Regular_triangulation_adaptation_policies_2.h +++ b/Voronoi_diagram_2/include/CGAL/Regular_triangulation_adaptation_policies_2.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //========================================================================= //========================================================================= @@ -67,6 +67,6 @@ struct Regular_triangulation_caching_degeneracy_removal_policy_2 //========================================================================= //========================================================================= -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_REGULAR_TRIANGULATION_ADAPTATION_POLICIES_2_H diff --git a/Voronoi_diagram_2/include/CGAL/Regular_triangulation_adaptation_traits_2.h b/Voronoi_diagram_2/include/CGAL/Regular_triangulation_adaptation_traits_2.h index 4899c5342113..e3c32bb2651f 100644 --- a/Voronoi_diagram_2/include/CGAL/Regular_triangulation_adaptation_traits_2.h +++ b/Voronoi_diagram_2/include/CGAL/Regular_triangulation_adaptation_traits_2.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Regular_triangulation_adaptation_traits_2 @@ -43,6 +43,6 @@ struct Regular_triangulation_adaptation_traits_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_REGULAR_TRIANGULATION_ADAPTATION_TRAITS_2_H diff --git a/Voronoi_diagram_2/include/CGAL/Segment_Delaunay_graph_adaptation_policies_2.h b/Voronoi_diagram_2/include/CGAL/Segment_Delaunay_graph_adaptation_policies_2.h index ce0ebb4b933b..310d197957a9 100644 --- a/Voronoi_diagram_2/include/CGAL/Segment_Delaunay_graph_adaptation_policies_2.h +++ b/Voronoi_diagram_2/include/CGAL/Segment_Delaunay_graph_adaptation_policies_2.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //========================================================================= //========================================================================= @@ -67,6 +67,6 @@ struct Segment_Delaunay_graph_caching_degeneracy_removal_policy_2 //========================================================================= //========================================================================= -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_ADAPTATION_POLICIES_2_H diff --git a/Voronoi_diagram_2/include/CGAL/Segment_Delaunay_graph_adaptation_traits_2.h b/Voronoi_diagram_2/include/CGAL/Segment_Delaunay_graph_adaptation_traits_2.h index 94fb2a927a66..627ed220e349 100644 --- a/Voronoi_diagram_2/include/CGAL/Segment_Delaunay_graph_adaptation_traits_2.h +++ b/Voronoi_diagram_2/include/CGAL/Segment_Delaunay_graph_adaptation_traits_2.h @@ -28,7 +28,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template struct Segment_Delaunay_graph_adaptation_traits_2 @@ -46,6 +46,6 @@ struct Segment_Delaunay_graph_adaptation_traits_2 }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_SEGMENT_DELAUNAY_GRAPH_ADAPTATION_TRAITS_2_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2.h index e1d5136dfd93..ce34dcb24129 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2.h @@ -46,7 +46,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //========================================================================= //========================================================================= @@ -821,6 +821,6 @@ std::istream& operator>>(std::istream& is, } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Accessor.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Accessor.h index 9df2767d4a9c..67f5e48d2ec9 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Accessor.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Accessor.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -63,7 +63,7 @@ class Accessor CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_ACCESSOR_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_base_2.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_base_2.h index e84fdd410418..00c928fa13f1 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_base_2.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_base_2.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -69,7 +69,7 @@ class Adaptation_traits_base_2 CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_ADAPTATION_TRAITS_BASE_2_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_functors.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_functors.h index db559b70b4d4..2ddd54c18242 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_functors.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_functors.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -63,7 +63,7 @@ struct Functor_exists< Default_caching_site_inserter > CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_ADAPTATION_TRAITS_FUNCTORS_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Apollonius_graph_degeneracy_testers.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Apollonius_graph_degeneracy_testers.h index 57881dd9db40..afdfcdc424f3 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Apollonius_graph_degeneracy_testers.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Apollonius_graph_degeneracy_testers.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -108,6 +108,6 @@ class Apollonius_graph_edge_tester_2 CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_APOLLONIUS_GRAPH_DEGENERACY_TESTERS_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Apollonius_graph_nearest_site_2.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Apollonius_graph_nearest_site_2.h index 1e5216d60d4a..a12b21466b74 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Apollonius_graph_nearest_site_2.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Apollonius_graph_nearest_site_2.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -227,6 +227,6 @@ class Apollonius_graph_nearest_site_2 CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_APOLLONIUS_GRAPH_NEAREST_SITE_2_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Cached_degeneracy_testers.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Cached_degeneracy_testers.h index 5166bc04bf17..a5d46aa26ed7 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Cached_degeneracy_testers.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Cached_degeneracy_testers.h @@ -29,7 +29,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -464,6 +464,6 @@ class Cached_face_rejector,Tag_true> CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_CACHED_DEGENERACY_TESTERS_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Circulator_adaptors.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Circulator_adaptors.h index 48f3c15b9d44..f282735ce5c4 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Circulator_adaptors.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Circulator_adaptors.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -156,7 +156,7 @@ class Ccb_halfedge_circulator_adaptor CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_CIRCULATOR_ADAPTORS_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Connected_components.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Connected_components.h index acd475bdad93..6ada8d1adca7 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Connected_components.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Connected_components.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -130,6 +130,6 @@ class Connected_components CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_CONNECTED_COMPONENTS diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Construct_dual_points.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Construct_dual_points.h index c0cce7a50b8c..722639a3d3db 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Construct_dual_points.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Construct_dual_points.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -117,6 +117,6 @@ class Segment_Delaunay_graph_Voronoi_point_2 CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_CONSTRUCT_DUAL_POINTS_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_inserters.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_inserters.h index fa0436e63742..8f042cd682ac 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_inserters.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_inserters.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -178,6 +178,6 @@ class Default_aggregate_site_inserter CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_DEFAULT_SITE_INSERTERS_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_removers.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_removers.h index 75390aa75869..0226c76adb26 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_removers.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_removers.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -112,6 +112,6 @@ class Default_caching_site_remover CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_SITE_REMOVERS_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Degeneracy_tester_binders.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Degeneracy_tester_binders.h index 13bc47eababf..d392a08a8d24 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Degeneracy_tester_binders.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Degeneracy_tester_binders.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -76,6 +76,6 @@ class Face_rejector_binder CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_DEGENERACY_TESTER_BINDERS_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Delaunay_triangulation_degeneracy_testers.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Delaunay_triangulation_degeneracy_testers.h index cd223fef2c71..aed6dfd4f87c 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Delaunay_triangulation_degeneracy_testers.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Delaunay_triangulation_degeneracy_testers.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -103,6 +103,6 @@ class Delaunay_triangulation_edge_tester_2 CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_DELAUNAY_TRIANGULATION_DEGENERACY_TESTERS_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Delaunay_triangulation_nearest_site_2.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Delaunay_triangulation_nearest_site_2.h index 6f25454ed43f..48db318b411a 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Delaunay_triangulation_nearest_site_2.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Delaunay_triangulation_nearest_site_2.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -173,6 +173,6 @@ class Delaunay_triangulation_nearest_site_2 CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_DELAUNAY_TRIANGULATION_NEAREST_SITE_2_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Dummy_iterator.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Dummy_iterator.h index 2f19c5f8c1ad..c1580827e76b 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Dummy_iterator.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Dummy_iterator.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -80,7 +80,7 @@ class Dummy_iterator : public Emptyset_iterator CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_DUMMY_ITERATOR_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Edge_less.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Edge_less.h index 7afdfe20e922..bb6455e70162 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Edge_less.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Edge_less.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -41,6 +41,6 @@ struct Edge_less CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_EDGE_LESS_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Face.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Face.h index 36af3a20a7a8..0ad40779667a 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Face.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Face.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -192,7 +192,7 @@ class Face CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_FACE_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Finder_classes.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Finder_classes.h index a0ba95c70691..b2bfa047a8ed 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Finder_classes.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Finder_classes.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -134,6 +134,6 @@ class Find_valid_vertex CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_FINDER_CLASSES_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Halfedge.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Halfedge.h index f52e2423b5f3..6667549efa1e 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Halfedge.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Halfedge.h @@ -24,7 +24,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -342,7 +342,7 @@ class Halfedge CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL //========================================================================= //========================================================================= diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Handle_adaptor.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Handle_adaptor.h index 03be3309cee0..78235eb87814 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Handle_adaptor.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Handle_adaptor.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -66,6 +66,6 @@ class Handle_adaptor CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_HANDLE_ADAPTOR_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Identity_rejectors.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Identity_rejectors.h index 7c332e58444c..f57e905be878 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Identity_rejectors.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Identity_rejectors.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -100,7 +100,7 @@ struct Identity_face_rejector CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_IDENTITY_REJECTORS_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Iterator_adaptors.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Iterator_adaptors.h index c376bde7b163..5c08c957de08 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Iterator_adaptors.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Iterator_adaptors.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -401,7 +401,7 @@ class Vertex_iterator_adaptor : CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_ITERATOR_ADAPTORS_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Policy_base.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Policy_base.h index caa5cd9745c0..44aca7d50763 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Policy_base.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Policy_base.h @@ -26,7 +26,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -165,7 +165,7 @@ class Caching_policy_base CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_POLICY_BASE_2_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Regular_triangulation_degeneracy_testers.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Regular_triangulation_degeneracy_testers.h index 0c101571ef0b..639ddc4f1bd1 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Regular_triangulation_degeneracy_testers.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Regular_triangulation_degeneracy_testers.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -105,6 +105,6 @@ class Regular_triangulation_edge_tester_2 CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_REGULAR_TRIANGULATION_DEGENERACY_TESTERS_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Regular_triangulation_nearest_site_2.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Regular_triangulation_nearest_site_2.h index 8826edfdc576..c6be2784280e 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Regular_triangulation_nearest_site_2.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Regular_triangulation_nearest_site_2.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -176,6 +176,6 @@ class Regular_triangulation_nearest_site_2 CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_REGULAR_TRIANGULATION_NEAREST_SITE_2_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Segment_Delaunay_graph_degeneracy_testers.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Segment_Delaunay_graph_degeneracy_testers.h index e11be925e282..5e93fa83b955 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Segment_Delaunay_graph_degeneracy_testers.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Segment_Delaunay_graph_degeneracy_testers.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -254,6 +254,6 @@ class Segment_Delaunay_graph_face_tester_2 CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_SEGMENT_DELAUNAY_GRAPH_DEGENERACY_TESTERS_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Segment_Delaunay_graph_nearest_site_2.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Segment_Delaunay_graph_nearest_site_2.h index 609cb601ad5f..64b9946137b2 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Segment_Delaunay_graph_nearest_site_2.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Segment_Delaunay_graph_nearest_site_2.h @@ -25,7 +25,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -294,6 +294,6 @@ class Segment_Delaunay_graph_nearest_site_2 CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_SEGMENT_DELAUNAY_GRAPH_NEAREST_SITE_2_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Site_accessors.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Site_accessors.h index dd9f0fcae640..228361847279 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Site_accessors.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Site_accessors.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -79,6 +79,6 @@ struct Point_accessor CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_SITE_ACCESSORS_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Unbounded_edges.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Unbounded_edges.h index 8145d698a135..a7e66259e506 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Unbounded_edges.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Unbounded_edges.h @@ -23,7 +23,7 @@ #include //#include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -93,6 +93,6 @@ class Unbounded_edge_tester CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_UNBOUNDED_EDGES_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Unbounded_faces.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Unbounded_faces.h index 8d233f868fb1..f7eaae37da31 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Unbounded_faces.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Unbounded_faces.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -102,6 +102,6 @@ class Unbounded_face_tester CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_UNBOUNDED_FACES_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Validity_testers.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Validity_testers.h index 5008eedac9f5..8646f4003e52 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Validity_testers.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Validity_testers.h @@ -26,7 +26,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -106,6 +106,6 @@ class Vertex_validity_tester CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_VALIDITY_TESTERS_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Vertex.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Vertex.h index e1376908db6a..0d16d350f4ec 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Vertex.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Vertex.h @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -237,7 +237,7 @@ class Vertex CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_VERTEX_H diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/tags.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/tags.h index d8d2f8beb5ca..efabb07eb331 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/tags.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/tags.h @@ -23,7 +23,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //CGAL_VORONOI_DIAGRAM_2_BEGIN_NAMESPACE @@ -162,6 +162,6 @@ struct Tag_converter //CGAL_VORONOI_DIAGRAM_2_END_NAMESPACE -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_VORONOI_DIAGRAM_2_TAGS_H diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_policy_concept.h b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_policy_concept.h index d4331f003684..1e91b21c5f5e 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_policy_concept.h +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_policy_concept.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //========================================================================= @@ -42,7 +42,7 @@ struct Adaptation_policy_concept }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ADAPTATION_POLICY_CONCEPT_H diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_traits_concept.h b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_traits_concept.h index 988eb44b88fc..16d39221101b 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_traits_concept.h +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Adaptation_traits_concept.h @@ -25,7 +25,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { //========================================================================= @@ -86,7 +86,7 @@ class Adaptation_traits_concept }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_ADAPTATION_TRAITS_CONCEPT_H diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Delaunay_graph_concept.h b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Delaunay_graph_concept.h index 5fb896df36d3..5f287173fc2f 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Delaunay_graph_concept.h +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/Delaunay_graph_concept.h @@ -27,7 +27,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template @@ -358,7 +358,7 @@ operator<<(std::ostream& os, return os; } -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_DELAUNAY_GRAPH_CONCEPT_H diff --git a/Width_3/include/CGAL/Width_3.h b/Width_3/include/CGAL/Width_3.h index 2cb9c67be95c..f139630b243e 100644 --- a/Width_3/include/CGAL/Width_3.h +++ b/Width_3/include/CGAL/Width_3.h @@ -32,7 +32,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Width_3 { @@ -1596,6 +1596,6 @@ class Width_3 { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Width_3/include/CGAL/Width_default_traits_3.h b/Width_3/include/CGAL/Width_default_traits_3.h index 34eed81e4b9d..f0ca5c975845 100644 --- a/Width_3/include/CGAL/Width_default_traits_3.h +++ b/Width_3/include/CGAL/Width_default_traits_3.h @@ -22,7 +22,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { template class Width_default_traits_3 { @@ -70,6 +70,6 @@ class Width_default_traits_3 { } }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_WIDTH_DEFAULT_TRAITS_3_H diff --git a/Width_3/include/CGAL/Width_polyhedron_3.h b/Width_3/include/CGAL/Width_polyhedron_3.h index 9789f9d59e8c..672abb70b7cb 100644 --- a/Width_3/include/CGAL/Width_polyhedron_3.h +++ b/Width_3/include/CGAL/Width_polyhedron_3.h @@ -27,7 +27,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { @@ -214,6 +214,6 @@ class Data_access { } // namespace Width_3_internal -CGAL_END_NAMESPACE +} //namespace CGAL #endif //WIDTH_POLYHEDRON_3_H diff --git a/iostream/include/CGAL/IO/Color.h b/iostream/include/CGAL/IO/Color.h index d3af66baf2ac..ff4bc3929e18 100644 --- a/iostream/include/CGAL/IO/Color.h +++ b/iostream/include/CGAL/IO/Color.h @@ -26,7 +26,7 @@ #ifndef CGAL_COLOR_H #define CGAL_COLOR_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Color { public: @@ -92,6 +92,6 @@ extern const Color ORANGE ; extern const Color YELLOW ; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_COLOR_H diff --git a/iostream/include/CGAL/IO/io.h b/iostream/include/CGAL/IO/io.h index f3f63a507727..eb1e72bbb594 100644 --- a/iostream/include/CGAL/IO/io.h +++ b/iostream/include/CGAL/IO/io.h @@ -31,7 +31,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { class IO { public: @@ -278,6 +278,6 @@ void swallow(std::istream &is, const std::string& s ); -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_H diff --git a/iostream/include/CGAL/IO/io_tags.h b/iostream/include/CGAL/IO/io_tags.h index 191b1c435762..6cf167226aad 100644 --- a/iostream/include/CGAL/IO/io_tags.h +++ b/iostream/include/CGAL/IO/io_tags.h @@ -25,7 +25,7 @@ #ifndef CGAL_IO_TAGS_H #define CGAL_IO_TAGS_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { struct io_Read_write{}; struct io_Extract_insert{}; @@ -49,6 +49,6 @@ template<> struct Io_traits { typedef io_Read_write Io_tag; }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_IO_TAGS_H diff --git a/iostream/src/CGAL/Color.cpp b/iostream/src/CGAL/Color.cpp index dc2ba98b4248..6585b0cc4025 100644 --- a/iostream/src/CGAL/Color.cpp +++ b/iostream/src/CGAL/Color.cpp @@ -24,7 +24,7 @@ #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { const Color BLACK = Color(0, 0, 0); const Color WHITE = Color(255, 255, 255); @@ -41,5 +41,5 @@ const Color RED = Color(255, 0, 0); const Color ORANGE = Color(235, 150, 0); const Color YELLOW = Color(255, 255, 0); -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/iostream/src/CGAL/io.cpp b/iostream/src/CGAL/io.cpp index 83eeae97e2fd..d962801abfc8 100644 --- a/iostream/src/CGAL/io.cpp +++ b/iostream/src/CGAL/io.cpp @@ -28,7 +28,7 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { int IO::mode = std::ios::xalloc(); @@ -121,4 +121,4 @@ swallow(std::istream &is, const std::string& s ) { } } -CGAL_END_NAMESPACE +} //namespace CGAL diff --git a/kdtree/include/CGAL/kdtree_d.h b/kdtree/include/CGAL/kdtree_d.h index b1cf6cb7ce29..b71ed95ed09f 100644 --- a/kdtree/include/CGAL/kdtree_d.h +++ b/kdtree/include/CGAL/kdtree_d.h @@ -27,7 +27,7 @@ #include using std::list; // to avoid compiler crash on MSVC++ -CGAL_BEGIN_NAMESPACE +namespace CGAL { /*======================================================================= * Kdtree_interface - @@ -1054,6 +1054,6 @@ class Kdtree_d }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif /* CGAL_KDTREE_D_H */