From d53e01f1a10c9c1b1df69511307c54e85148da74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 9 Jun 2010 08:45:58 +0000 Subject: [PATCH] remove package namespace macro --- .../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 +-- .../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 +-- .../include/CGAL/Apollonius_graph_2/basic.h | 5 ---- .../Apollonius_graph_2/comparator_profiler.h | 4 +-- .../Apollonius_graph_2/compare_quadratic.h | 4 +-- .../Apollonius_graph_2/predicate_profiler.h | 4 +-- .../Arrangement_on_surface_2/Double.hpp | 4 +-- Core/include/CGAL/CORE/BigFloat.h | 4 +-- Core/include/CGAL/CORE/BigFloatRep.h | 4 +-- Core/include/CGAL/CORE/BigInt.h | 4 +-- Core/include/CGAL/CORE/BigRat.h | 4 +-- Core/include/CGAL/CORE/CoreAux.h | 4 +-- Core/include/CGAL/CORE/CoreDefs.h | 4 +-- Core/include/CGAL/CORE/Expr.h | 4 +-- Core/include/CGAL/CORE/ExprRep.h | 4 +-- Core/include/CGAL/CORE/Filter.h | 4 +-- Core/include/CGAL/CORE/Gmp.h | 4 +-- Core/include/CGAL/CORE/Impl.h | 4 --- Core/include/CGAL/CORE/MemoryPool.h | 4 +-- Core/include/CGAL/CORE/Promote.h | 4 +-- Core/include/CGAL/CORE/Real.h | 4 +-- Core/include/CGAL/CORE/RealRep.h | 4 +-- Core/include/CGAL/CORE/RefCount.h | 4 +-- Core/include/CGAL/CORE/Timer.h | 4 +-- Core/include/CGAL/CORE/extLong.h | 4 +-- Core/include/CGAL/CORE/poly/Curves.h | 4 +-- Core/include/CGAL/CORE/poly/Poly.h | 4 +-- Core/include/CGAL/CORE/poly/Sturm.h | 4 +-- Core/src/CGALCore/BigFloat.cpp | 4 +-- Core/src/CGALCore/CoreAux.cpp | 4 +-- Core/src/CGALCore/CoreDefs.cpp | 4 +-- Core/src/CGALCore/CoreIO.cpp | 4 +-- Core/src/CGALCore/Expr.cpp | 4 +-- Core/src/CGALCore/GmpIO.cpp | 4 +-- Core/src/CGALCore/Real.cpp | 4 +-- Core/src/CGALCore/extLong.cpp | 4 +-- .../doc_tex/Developers_manual/namespaces.tex | 5 +--- Kernel_d/noweb/Aff_transformationHd.lw | 8 +++--- Kernel_d/noweb/function_objectsCd.lw | 4 +-- Kernel_d/noweb/function_objectsHd.lw | 4 +-- Kernel_d/noweb/intersection_objects_d.lw | 12 ++++---- .../include/Qt_Delaunay_stable_subset_2.h | 4 +-- .../include/SoQt_moving_points_3.h | 4 +-- .../include/SoQt_moving_weighted_points_3.h | 4 +-- .../include/SoQt_triangulation_3.h | 4 +-- .../include/SoQt_widget_3.h | 4 +-- .../include/CGAL/Kinetic/Active_objects_set.h | 4 +-- .../CGAL/Kinetic/Exact_simulation_traits_1.h | 4 +-- .../CGAL/Kinetic/Exact_simulation_traits_2.h | 4 +-- .../CGAL/Kinetic/Exact_simulation_traits_3.h | 4 +-- .../Kinetic/Inexact_simulation_traits_1.h | 4 +-- .../Kinetic/Inexact_simulation_traits_2.h | 4 +-- .../Kinetic/Inexact_simulation_traits_3.h | 4 +-- .../CGAL/Kinetic/Interval_simulator_traits.h | 8 +++--- .../include/CGAL/Kinetic/Simulation_traits.h | 4 +-- .../Polynomial/Default_filtering_traits.h | 4 +-- .../include/CGAL/Polynomial/Filtered_kernel.h | 4 +-- .../Polynomial/Lazy_upper_bound_root_stack.h | 8 +++--- .../CGAL/Polynomial/Upper_bound_root_stack.h | 4 +-- .../Upper_bound_root_stack_Descartes_traits.h | 4 +-- ...und_root_stack_filtered_Descartes_traits.h | 4 +-- .../CGAL/Kinetic/Active_objects_vector.h | 4 +-- .../CORE_Expr_exact_simulation_traits.h | 4 +-- .../include/CGAL/Kinetic/Cartesian.h | 4 +-- .../CGAL/Kinetic/Certificate_generator.h | 4 +-- .../Kinetic/Default_instantaneous_kernel.h | 4 +-- .../include/CGAL/Kinetic/Default_simulator.h | 4 +-- .../CGAL/Kinetic/Delaunay_triangulation_2.h | 4 +-- .../CGAL/Kinetic/Delaunay_triangulation_3.h | 8 +++--- .../Delaunay_triangulation_cell_base_3.h | 4 +-- .../Delaunay_triangulation_default_traits_2.h | 4 +-- ...launay_triangulation_event_log_visitor_2.h | 4 +-- ...launay_triangulation_event_log_visitor_3.h | 4 +-- .../Delaunay_triangulation_face_base_2.h | 4 +-- ...nay_triangulation_recent_edges_visitor_2.h | 4 +-- .../Delaunay_triangulation_vertex_base_2.h | 4 +-- .../Delaunay_triangulation_visitor_base_2.h | 4 +-- .../Delaunay_triangulation_visitor_base_3.h | 4 +-- .../Derivitive_filter_function_kernel.h | 4 +-- .../include/CGAL/Kinetic/Enclosing_box_2.h | 4 +-- .../include/CGAL/Kinetic/Enclosing_box_3.h | 4 +-- .../include/CGAL/Kinetic/Erase_event.h | 4 +-- .../include/CGAL/Kinetic/Event_base.h | 4 +-- .../CGAL/Kinetic/Exact_simulation_traits.h | 4 +-- .../include/CGAL/Kinetic/Free_event_base.h | 4 +-- .../Handle_degeneracy_function_kernel.h | 4 +-- .../CGAL/Kinetic/Heap_pointer_event_queue.h | 8 +++--- .../CGAL/Kinetic/IO/Qt_moving_points_2.h | 4 +-- .../CGAL/Kinetic/IO/Qt_triangulation_2.h | 4 +-- .../include/CGAL/Kinetic/IO/Qt_widget_2.h | 4 +-- .../CGAL/Kinetic/IO/internal/GUI_base.h | 4 +-- .../CGAL/Kinetic/Inexact_simulation_traits.h | 4 +-- .../include/CGAL/Kinetic/Insert_event.h | 4 +-- .../include/CGAL/Kinetic/Listener.h | 4 +-- .../include/CGAL/Kinetic/Multi_listener.h | 4 +-- .../include/CGAL/Kinetic/Ref_counted.h | 8 +++--- .../CGAL/Kinetic/Regular_triangulation_3.h | 8 +++--- ...iangulation_CORE_exact_simulation_traits.h | 4 +-- .../Regular_triangulation_cell_base_3.h | 4 +-- ...egular_triangulation_event_log_visitor_3.h | 4 +-- ...ar_triangulation_exact_simulation_traits.h | 4 +-- ..._triangulation_inexact_simulation_traits.h | 4 +-- ...gular_triangulation_instantaneous_kernel.h | 4 +-- .../Regular_triangulation_vertex_base_3.h | 4 +-- .../Regular_triangulation_visitor_base_3.h | 4 +-- .../CGAL/Kinetic/Simulator_objects_listener.h | 4 +-- .../include/CGAL/Kinetic/Sort.h | 4 +-- .../CGAL/Kinetic/Sort_event_log_visitor.h | 4 +-- .../include/CGAL/Kinetic/Sort_visitor_base.h | 4 +-- .../include/CGAL/Kinetic/Triangulation_2.h | 4 +-- .../Kinetic/Two_list_pointer_event_queue.h | 8 +++--- .../include/CGAL/Kinetic/basic.h | 28 ++++--------------- .../internal/Delaunay_triangulation_base_3.h | 4 +-- .../Kinetic/internal/Instantaneous_adaptor.h | 4 +-- .../Kernel/Cartesian_kinetic_kernel_base.h | 4 +-- .../Kernel/Cartesian_moving_lifted_point_3.h | 4 +-- .../Kernel/Cartesian_moving_orthosphere_3.h | 4 +-- .../Kernel/Cartesian_moving_point_1.h | 8 +++--- .../Kernel/Cartesian_moving_point_2.h | 8 +++--- .../Kernel/Cartesian_moving_point_3.h | 8 +++--- .../Cartesian_moving_weighted_point_3.h | 8 +++--- .../CGAL/Kinetic/internal/Kernel/Center.h | 4 +-- .../Kinetic/internal/Kernel/Certificate.h | 4 +-- .../internal/Kernel/Delaunay_lifted_lifting.h | 4 +-- .../internal/Kernel/Delaunay_lifting.h | 4 +-- .../Kinetic/internal/Kernel/Reverse_time.h | 4 +-- .../internal/Kernel/cartesian_predicates_2.h | 4 +-- .../internal/Kernel/cartesian_predicates_3.h | 4 +-- .../include/CGAL/Kinetic/internal/To_static.h | 4 +-- .../Kinetic/internal/Triangulation_helper_3.h | 4 +-- .../CGAL/Kinetic/internal/debug_counters.h | 4 +-- .../CGAL/Kinetic/internal/infinity_or_max.h | 4 +-- .../CGAL/Kinetic/internal/tds_2_helpers.h | 4 +-- .../internal/triangulation_helpers_3.h | 4 +-- .../include/CGAL/Kinetic/listeners.h | 4 +-- .../CGAL/Polynomial/CORE_Expr_root_stack.h | 4 +-- .../include/CGAL/Polynomial/CORE_kernel.h | 4 +-- .../CGAL/Polynomial/Fixed_polynomial.h | 4 +-- .../CGAL/Polynomial/Interval_polynomial.h | 4 +-- .../include/CGAL/Polynomial/Kernel.h | 4 +-- .../CGAL/Polynomial/Numeric_root_stack.h | 8 +++--- .../include/CGAL/Polynomial/Polynomial.h | 4 +-- .../Polynomial/Root_stack_default_traits.h | 4 +-- .../CGAL/Polynomial/Sturm_root_stack.h | 4 +-- .../CGAL/Polynomial/Sturm_root_stack_traits.h | 4 +-- .../include/CGAL/Polynomial/basic.h | 24 ++++++++-------- .../Polynomial/internal/Alternation_counter.h | 4 +-- .../Polynomial/internal/CORE_polynomial.h | 4 +-- .../internal/Descartes_root_count.h | 4 +-- .../internal/Double_with_infinity.h | 4 +-- .../Polynomial/internal/Filtered_function.h | 4 +-- .../Polynomial/internal/Filtered_kernel.h | 4 +-- .../Filtered_Descartes_has_root.h | 4 +-- .../Filtered_Descartes_root_counter.h | 4 +-- .../Filtered_kernel/Filtered_are_negations.h | 4 +-- .../Filtered_polynomial_rational_kernel.h | 4 +-- .../Filtered_root_bound_evaluator.h | 4 +-- .../Filtered_root_multiplicity.h | 4 +-- .../Filtered_kernel/Filtered_sign_at.h | 4 +-- .../Polynomial/internal/Filtered_number.h | 4 +-- .../Construct_filtered_function.h | 4 +-- .../Filtered_Descartes_has_root.h | 4 +-- .../Filtered_Descartes_root_counter.h | 4 +-- .../Filtered_Sturm_sequence.h | 4 +-- .../Filtered_are_negations.h | 4 +-- .../Filtered_rational_multiplicity.h | 4 +-- .../Filtered_rational_sign_above_rational.h | 4 +-- .../Filtered_rational_traits.h | 4 +-- .../Filtered_root_bound_evaluator.h | 4 +-- .../Filtered_sign_Sturm_sequence.h | 4 +-- .../Filtered_sign_at_rational.h | 4 +-- .../Filtered_standard_sequence.h | 4 +-- .../internal/Fixed_polynomial_impl.h | 4 +-- .../Polynomial/internal/GSL_numeric_solver.h | 4 +-- .../Polynomial/internal/Isolating_interval.h | 4 +-- .../internal/Kernel/Is_even_multiplicity.h | 4 +-- .../Polynomial/internal/Kernel/Is_rational.h | 4 +-- .../internal/Kernel/Isolating_interval.h | 4 +-- .../internal/Kernel/Lower_bound_root.h | 4 +-- .../Polynomial/internal/Kernel/Multiplicity.h | 4 +-- .../internal/Kernel/Rational_between_roots.h | 4 +-- .../internal/Kernel/Root_container.h | 4 +-- .../Polynomial/internal/Kernel/Sign_above.h | 4 +-- .../CGAL/Polynomial/internal/Kernel/Sign_at.h | 4 +-- .../Polynomial/internal/Kernel/Sign_below.h | 4 +-- .../internal/Kernel/Sign_between_roots.h | 4 +-- .../Polynomial/internal/Kernel/To_rational.h | 4 +-- .../internal/Kernel/predicate_template.h | 4 +-- .../Polynomial/internal/Polynomial_impl.h | 4 +-- .../internal/Rational/Are_negations.h | 4 +-- .../internal/Rational/Bezier_root_counter.h | 4 +-- .../Compare_isolated_roots_in_interval.h | 4 +-- .../internal/Rational/Construct_function.h | 4 +-- .../Polynomial/internal/Rational/Derivative.h | 4 +-- .../internal/Rational/Descartes_has_root.h | 4 +-- .../Rational/Descartes_root_counter.h | 4 +-- .../Rational/Euclidean_Sturm_sequence.h | 4 +-- .../internal/Rational/Evaluate_polynomial.h | 4 +-- .../internal/Rational/Invert_variable.h | 4 +-- .../Map_rational_interval_to_positive.h | 4 +-- .../internal/Rational/Monic_Sturm_sequence.h | 4 +-- .../internal/Rational/Negate_variable.h | 4 +-- .../Rational/Primitive_part_Sturm_sequence.h | 4 +-- .../internal/Rational/Pseudo_quotient.h | 4 +-- .../internal/Rational/Pseudo_remainder.h | 4 +-- .../Polynomial/internal/Rational/Quotient.h | 4 +-- .../internal/Rational/Quotient_remainder.h | 4 +-- .../internal/Rational/Rational_multiplicity.h | 4 +-- .../internal/Rational/Rational_traits_base.h | 4 +-- .../Rational/Rational_translate_zero.h | 4 +-- .../Rational/Reduced_Sturm_sequence.h | 4 +-- .../Polynomial/internal/Rational/Remainder.h | 4 +-- .../internal/Rational/Root_bound_evaluator.h | 4 +-- .../internal/Rational/Shift_power.h | 4 +-- .../internal/Rational/Sign_Sturm_sequence.h | 4 +-- .../internal/Rational/Sign_above_rational.h | 4 +-- .../internal/Rational/Sign_at_rational.h | 4 +-- .../internal/Rational/Sign_below_rational.h | 4 +-- .../internal/Rational/Standard_sequence.h | 4 +-- .../internal/Rational/Sturm_root_counter.h | 4 +-- .../internal/Rational/Sturm_sequence.h | 4 +-- .../internal/Rational/Sturm_sequence_base.h | 4 +-- .../Rational/Subresultant_Sturm_sequence.h | 4 +-- .../internal/Root_stack_traits_base.h | 4 +-- .../internal/Sign_variations_counter.h | 4 +-- .../internal/Simple_interval_root.h | 4 +-- .../internal/Sturm_isolating_interval.h | 4 +-- .../CGAL/Polynomial/internal/Sturm_root_rep.h | 4 +-- .../internal/filtered_function_leaf_nodes.h | 4 +-- .../internal/filtered_function_node_bases.h | 4 +-- .../filtered_function_operation_nodes.h | 4 +-- .../Polynomial/internal/interval_arithmetic.h | 8 +++--- .../include/CGAL/Polynomial/internal/macros.h | 19 ------------- .../CGAL/Polynomial/internal/nt_converters.h | 8 +++--- .../Polynomial/internal/numeric_solvers.h | 4 +-- .../internal/numeric_solvers_support.h | 4 +-- .../internal/polynomial_generators.h | 4 +-- .../CGAL/Polynomial/polynomial_converters.h | 4 +-- .../src/CGAL/JAMA_numeric_solver.cpp | 4 +-- Kinetic_data_structures/src/CGAL/KDS_Log.cpp | 4 +-- .../src/CGAL/Turkowski_numeric_solver.cpp | 4 +-- .../src/CGAL/numeric_solvers_support.cpp | 4 +-- .../src/CGALQt/Kinetic_Qt_core.cpp | 4 +-- .../src/CGALQt/Kinetic_Qt_timer.cpp | 4 +-- .../src/CGALQt/Kinetic_Qt_widget_2_core.cpp | 4 +-- .../src/CGALQt/Kinetic_Qt_window_2.cpp | 4 +-- .../src/CGALQt/Kinetic_pixmaps.cpp | 4 +-- .../generate_reference_manual_Doxyfile | 5 ++-- Manual_tools/scripts/tex2doxy | 1 - Mesh_2/Doxyfile | 3 +- Mesh_3/Doxyfile | 2 -- Min_sphere_d/web/Doc_Min_sphere_d.aw | 16 +++++------ Nef_2/noweb/Constrained_triang.lw | 12 ++++---- Nef_2/noweb/Filtered_extended_kernel.lw | 4 +-- Nef_2/noweb/Nef_polyhedron_2.lw | 12 ++++---- Nef_2/noweb/PM_decorator_simple.lw | 4 +-- Nef_2/noweb/PM_overlayer.lw | 4 +-- Nef_2/noweb/PM_point_locator.lw | 4 +-- Nef_2/noweb/PM_transformer.lw | 4 +-- Nef_2/noweb/Polynomial.lw | 4 +-- Nef_2/noweb/Segment_overlay.lw | 4 +-- Nef_2/noweb/Simple_extended_kernel.lw | 12 ++++---- Nef_3/SNC_walker/SNC_walking.nw | 4 +-- Nef_S2/noweb/SM_overlayer.lw | 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_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 +-- .../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/basic.h | 5 ---- ...ent_Delaunay_graph_simple_storage_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 +-- Skin_surface_3/Doxyfile | 4 +-- Surface_mesher/Doxyfile | 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/basic.h | 7 ----- .../include/CGAL/Voronoi_diagram_2/tags.h | 4 +-- 355 files changed, 758 insertions(+), 826 deletions(-) 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 2b0a9a67b9f..4f91fe57643 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 @@ -28,7 +28,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { //-------------------------------------------------------------------- @@ -95,7 +95,7 @@ public: //-------------------------------------------------------------------- -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 6a1c366dd46..a3ed45a77a6 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 @@ -28,7 +28,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { template class Compare_weight_2 @@ -49,7 +49,7 @@ public: //-------------------------------------------------------------------- -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 b0b24c3f2ba..ebe2429f03d 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 @@ -28,7 +28,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { template class Compare_x_2 @@ -49,7 +49,7 @@ public: //-------------------------------------------------------------------- -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 fdaac1d743a..26965d5eb14 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 @@ -28,7 +28,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { template class Compare_y_2 @@ -49,7 +49,7 @@ public: //-------------------------------------------------------------------- -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 90758f15a42..e1700376ced 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 @@ -36,7 +36,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { //*********************************************************************** //*********************************************************************** @@ -427,7 +427,7 @@ public: }; -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 5991f1f6c5a..0791248fd85 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 @@ -27,7 +27,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { template < class FT > inline @@ -179,7 +179,7 @@ ad_left_bitangent_lineC2(const FT &x1, const FT &y1, const FT &w1, -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 9d427015d4e..d96eca823c8 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 @@ -27,7 +27,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { //----------------------------------------------------------------------- // Conflict Base @@ -181,7 +181,7 @@ protected: }; -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 fc9346cdab3..60bbe4c25d3 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 @@ -27,7 +27,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { //----------------------------------------------------------------------- // Edge Conflict Base @@ -104,7 +104,7 @@ protected: } }; -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 dc84beb0c4b..a8b445f35f0 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 @@ -26,7 +26,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { //----------------------------------------------------------------------- // Finite edge interior conflict @@ -83,7 +83,7 @@ public: } }; -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 309a39dcdf6..639dd51cd84 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 @@ -27,7 +27,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { //----------------------------------------------------------------------- // Infinite edge interior conflict @@ -62,7 +62,7 @@ public: }; -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 9953e7480b2..6445c6aebcc 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 @@ -27,7 +27,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { template @@ -92,7 +92,7 @@ public: } }; -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 3b3a3c73ebe..db7dfb0d80b 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 @@ -28,7 +28,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { //----------------------------------------------------------------------- // Vertex conflict @@ -320,7 +320,7 @@ public: } }; -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 87a5bab48ed..e91542ce247 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 @@ -28,7 +28,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { //-------------------------------------------------------------------- //-------------------------------------------------------------------- @@ -749,7 +749,7 @@ public: //-------------------------------------------------------------------- -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 af548523543..c5736ac4e8c 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 @@ -31,7 +31,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { //-------------------------------------------------------------------- @@ -629,7 +629,7 @@ public: //-------------------------------------------------------------------- -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 f4341d1e06f..f7d57da1457 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 @@ -27,7 +27,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { //-------------------------------------------------------------------- @@ -127,7 +127,7 @@ public: //-------------------------------------------------------------------- -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 1e413c74fd5..918b11c2dc7 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 @@ -31,7 +31,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { //-------------------------------------------------------------------- @@ -239,7 +239,7 @@ public: //-------------------------------------------------------------------- -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 cdc60a8931e..38700409fc5 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 @@ -29,7 +29,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { //-------------------------------------------------------------------- @@ -312,7 +312,7 @@ public: //-------------------------------------------------------------------- -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 dcfaf1a9a1b..37fbd5e78a7 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 @@ -31,7 +31,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { //-------------------------------------------------------------------- @@ -92,7 +92,7 @@ public: //-------------------------------------------------------------------- -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 524532cdb3a..57350931520 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 @@ -27,7 +27,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { //-------------------------------------------------------------------- @@ -81,7 +81,7 @@ public: //-------------------------------------------------------------------- -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 e510bab0470..bbf5d0875ab 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 @@ -29,7 +29,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { template class Apollonius_graph_kernel_wrapper_2 : public Kernel_base_2 @@ -78,7 +78,7 @@ public: }; -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 7e02e8a5cb0..21f1b99ccb6 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 @@ -27,7 +27,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { template class Orientation8_C2 @@ -315,7 +315,7 @@ public: //-------------------------------------------------------------------- -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 96bdeef73a2..35f257cd661 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 @@ -30,7 +30,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { template class Orientation_2 @@ -106,7 +106,7 @@ public: //-------------------------------------------------------------------- -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 4fdab5b5a13..8e838e134aa 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 @@ -27,7 +27,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { //-------------------------------------------------------------------- @@ -121,7 +121,7 @@ public: //-------------------------------------------------------------------- -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 43aad5cfdbb..b3e087255cd 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 @@ -26,7 +26,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { template< class K > class Inverted_weighted_point_2 @@ -355,7 +355,7 @@ public: } }; -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 8bb61db2e27..d0d946cbe77 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 @@ -29,7 +29,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { template @@ -46,7 +46,7 @@ public: }; -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/basic.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/basic.h index deca306fdcc..b4a6ff0471d 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/basic.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/basic.h @@ -25,10 +25,5 @@ #define CGAL_APOLLONIUS_GRAPH_2_NS CGAL::ApolloniusGraph_2 -#define CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE \ - namespace ApolloniusGraph_2 { - -#define CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE } - #endif // CGAL_APOLLONIUS_GRAPH_2_BASIC_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 c0356606690..898961721cc 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 @@ -26,7 +26,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { class comparator_profiler { @@ -158,7 +158,7 @@ unsigned long comparator_profiler::counter_rr_e = 0; unsigned long comparator_profiler::counter_rr_r0 = 0; //unsigned long comparator_profiler::counter_rr_jneg = 0; -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 b48b6bca884..81325a3011a 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 @@ -27,7 +27,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { #ifdef COMPARATOR_PROFILER #include @@ -983,7 +983,7 @@ ke_compare_r1_r2_filtered(const CT& a1, const CT& b1, const CT& c1, //-------------------------------------------------------------------- //-------------------------------------------------------------------- -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL 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 ca9ed14019e..057db54b6b7 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 @@ -28,7 +28,7 @@ namespace CGAL { -CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE +namespace ApolloniusGraph_2 { class ag2_predicate_profiler { @@ -71,7 +71,7 @@ unsigned long ag2_predicate_profiler::shadow_region_type_counter = 0; unsigned long ag2_predicate_profiler::incircle_counter = 0; unsigned long ag2_predicate_profiler::order_on_bisector_counter = 0; -CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE +} //namespace ApolloniusGraph_2 } //namespace CGAL diff --git a/Arrangement_on_surface_2/benchmarks/Arrangement_on_surface_2/Double.hpp b/Arrangement_on_surface_2/benchmarks/Arrangement_on_surface_2/Double.hpp index a188485d1d9..ca24fe03c7d 100644 --- a/Arrangement_on_surface_2/benchmarks/Arrangement_on_surface_2/Double.hpp +++ b/Arrangement_on_surface_2/benchmarks/Arrangement_on_surface_2/Double.hpp @@ -7,7 +7,7 @@ #define ZERO_EPSILON 0.000001 #define ERR_EPSILON 0.001 -CGAL_BEGIN_NAMESPACE +namespace CGAL { class Double { public: @@ -262,6 +262,6 @@ public: #endif }; -CGAL_END_NAMESPACE +} //namespace CGAL #endif diff --git a/Core/include/CGAL/CORE/BigFloat.h b/Core/include/CGAL/CORE/BigFloat.h index 93e4aa40aff..ff76b12805c 100644 --- a/Core/include/CGAL/CORE/BigFloat.h +++ b/Core/include/CGAL/CORE/BigFloat.h @@ -36,7 +36,7 @@ #include -CORE_BEGIN_NAMESPACE +namespace CORE { class Expr; @@ -616,5 +616,5 @@ inline BigFloat gcd(const BigFloat& a, const BigFloat& b) { inline BigRat::BigRat(const BigFloat& f) : RCBigRat(new BigRatRep()){ *this = f.BigRatValue(); } -CORE_END_NAMESPACE +} //namespace CORE #endif // _CORE_BIGFLOAT_H_ diff --git a/Core/include/CGAL/CORE/BigFloatRep.h b/Core/include/CGAL/CORE/BigFloatRep.h index 96c88336c5f..095f85c5c1e 100644 --- a/Core/include/CGAL/CORE/BigFloatRep.h +++ b/Core/include/CGAL/CORE/BigFloatRep.h @@ -39,7 +39,7 @@ #include #include -CORE_BEGIN_NAMESPACE +namespace CORE { // forward reference class BigFloat; @@ -442,5 +442,5 @@ inline void BigFloatRep::dump() const { std::cout << " -- End of BFRep " << this << " -- " << std::endl; } -CORE_END_NAMESPACE +} //namespace CORE #endif // _CORE_BIGFLOATREP_H_ diff --git a/Core/include/CGAL/CORE/BigInt.h b/Core/include/CGAL/CORE/BigInt.h index 38c0a9726fd..3e06a164d8b 100644 --- a/Core/include/CGAL/CORE/BigInt.h +++ b/Core/include/CGAL/CORE/BigInt.h @@ -38,7 +38,7 @@ #include #include -CORE_BEGIN_NAMESPACE +namespace CORE { class BigIntRep : public RCRepImpl { @@ -557,5 +557,5 @@ inline BigInt randomize(const BigInt& a) { } //@} -CORE_END_NAMESPACE +} //namespace CORE #endif // _CORE_BIGINT_H_ diff --git a/Core/include/CGAL/CORE/BigRat.h b/Core/include/CGAL/CORE/BigRat.h index 66df3189636..ea12c0b926e 100644 --- a/Core/include/CGAL/CORE/BigRat.h +++ b/Core/include/CGAL/CORE/BigRat.h @@ -36,7 +36,7 @@ #include -CORE_BEGIN_NAMESPACE +namespace CORE { class BigRatRep : public RCRepImpl { public: @@ -484,5 +484,5 @@ inline BigInt BigIntValue(const BigRat& a) { return a.BigIntValue(); } -CORE_END_NAMESPACE +} //namespace CORE #endif // _CORE_BIGRAT_H_ diff --git a/Core/include/CGAL/CORE/CoreAux.h b/Core/include/CGAL/CORE/CoreAux.h index dcc53cd5a47..d4e57297446 100644 --- a/Core/include/CGAL/CORE/CoreAux.h +++ b/Core/include/CGAL/CORE/CoreAux.h @@ -38,7 +38,7 @@ #include #include "CGAL/CORE/Impl.h" -CORE_BEGIN_NAMESPACE +namespace CORE { #ifndef LONG_BIT // such as in Linux #define LONG_BIT (sizeof(long) * 8) @@ -178,5 +178,5 @@ inline void core_debug(std::string msg){ } -CORE_END_NAMESPACE +} //namespace CORE #endif // _CORE_COREAUX_H_ diff --git a/Core/include/CGAL/CORE/CoreDefs.h b/Core/include/CGAL/CORE/CoreDefs.h index 04f0e8f427d..df43c9a7d5b 100644 --- a/Core/include/CGAL/CORE/CoreDefs.h +++ b/Core/include/CGAL/CORE/CoreDefs.h @@ -39,7 +39,7 @@ #include -CORE_BEGIN_NAMESPACE +namespace CORE { ////////////////////////////////////////////////////////////// // defined constants @@ -249,5 +249,5 @@ inline void setPositionalFormat(std::ostream& o = std::cout) { o.setf(std::ios::fixed, std::ios::floatfield); } -CORE_END_NAMESPACE +} //namespace CORE #endif // _CORE_COREDEFS_H_ diff --git a/Core/include/CGAL/CORE/Expr.h b/Core/include/CGAL/CORE/Expr.h index 75b25ae9cc4..d10dbe13292 100644 --- a/Core/include/CGAL/CORE/Expr.h +++ b/Core/include/CGAL/CORE/Expr.h @@ -40,7 +40,7 @@ #include -CORE_BEGIN_NAMESPACE +namespace CORE { /// \class Expr Expr.h /// \brief Expr is a class of Expression in Level 3 @@ -544,5 +544,5 @@ inline Expr radical(const NT& n, int m) { // because otherwise VC++.net2003 can't compile Expr.cpp #include -CORE_END_NAMESPACE +} //namespace CORE #endif // _CORE_EXPR_H_ diff --git a/Core/include/CGAL/CORE/ExprRep.h b/Core/include/CGAL/CORE/ExprRep.h index d75d63e354f..49219da1223 100644 --- a/Core/include/CGAL/CORE/ExprRep.h +++ b/Core/include/CGAL/CORE/ExprRep.h @@ -42,7 +42,7 @@ #include #include -CORE_BEGIN_NAMESPACE +namespace CORE { #ifdef CORE_DEBUG_BOUND // These counters are incremented each time each bound is recognized as equal @@ -1309,5 +1309,5 @@ inline BigFloat ExprRep::BigFloatValue() { return getAppValue().BigFloatValue(); } -CORE_END_NAMESPACE +} //namespace CORE #endif // _CORE_EXPRREP_H_ diff --git a/Core/include/CGAL/CORE/Filter.h b/Core/include/CGAL/CORE/Filter.h index f84e6d56056..d0142504e6a 100644 --- a/Core/include/CGAL/CORE/Filter.h +++ b/Core/include/CGAL/CORE/Filter.h @@ -52,7 +52,7 @@ #include #endif -CORE_BEGIN_NAMESPACE +namespace CORE { const int POWTWO_26 = (1 << 26); ///< constant 2^26 @@ -187,5 +187,5 @@ inline std::ostream & operator<< (std::ostream & os, const filteredFp& fp) { return os; } -CORE_END_NAMESPACE +} //namespace CORE #endif // _CORE_FILTER_H_ diff --git a/Core/include/CGAL/CORE/Gmp.h b/Core/include/CGAL/CORE/Gmp.h index f4bfec0d203..e9b46196e58 100644 --- a/Core/include/CGAL/CORE/Gmp.h +++ b/Core/include/CGAL/CORE/Gmp.h @@ -5,7 +5,7 @@ #include #include -CORE_BEGIN_NAMESPACE +namespace CORE { std::ostream& io_write (std::ostream &, mpz_srcptr); std::ostream& io_write (std::ostream &, mpq_srcptr); @@ -16,5 +16,5 @@ std::istream& io_read (std::istream &, mpq_ptr); //std::istream& operator>> (std::istream &, mpz_ptr); //std::istream& operator>> (std::istream &, mpq_ptr); -CORE_END_NAMESPACE +} //namespace CORE #endif // _CORE_GMP_H_ diff --git a/Core/include/CGAL/CORE/Impl.h b/Core/include/CGAL/CORE/Impl.h index c4c914cb7bd..863a9b98faa 100644 --- a/Core/include/CGAL/CORE/Impl.h +++ b/Core/include/CGAL/CORE/Impl.h @@ -11,10 +11,6 @@ #pragma warning(disable: 4244) #endif -// macros for defining namespace -#define CORE_BEGIN_NAMESPACE namespace CORE { -#define CORE_END_NAMESPACE } - // condition preprocessor for inline function #ifndef CORE_DISABLE_INLINE #define CORE_INLINE inline diff --git a/Core/include/CGAL/CORE/MemoryPool.h b/Core/include/CGAL/CORE/MemoryPool.h index 5992e00a86e..52bffcf0c7c 100644 --- a/Core/include/CGAL/CORE/MemoryPool.h +++ b/Core/include/CGAL/CORE/MemoryPool.h @@ -36,7 +36,7 @@ #include // for placement new #include -CORE_BEGIN_NAMESPACE +namespace CORE { #define CORE_EXPANSION_SIZE 1024 template< class T, int nObjects = CORE_EXPANSION_SIZE > @@ -103,6 +103,6 @@ void MemoryPool< T, nObjects >::free(void* t) { head = reinterpret_cast(t); } -CORE_END_NAMESPACE +} //namespace CORE #endif // _CORE_MEMORYPOOL_H_ diff --git a/Core/include/CGAL/CORE/Promote.h b/Core/include/CGAL/CORE/Promote.h index 9415be61882..d33a076917c 100644 --- a/Core/include/CGAL/CORE/Promote.h +++ b/Core/include/CGAL/CORE/Promote.h @@ -40,7 +40,7 @@ #include -CORE_BEGIN_NAMESPACE +namespace CORE { /// hasExactDivision() /// CHECKING if NT has exact division @@ -152,6 +152,6 @@ DEFINE_MAX_TYPE(BigFloat, Expr, Expr) DEFINE_MAX_TYPE(BigRat, Expr, Expr) -CORE_END_NAMESPACE +} //namespace CORE #endif //__PROMOTE_H__ diff --git a/Core/include/CGAL/CORE/Real.h b/Core/include/CGAL/CORE/Real.h index 787bd91a4a0..75102a1254e 100644 --- a/Core/include/CGAL/CORE/Real.h +++ b/Core/include/CGAL/CORE/Real.h @@ -38,7 +38,7 @@ #define _CORE_REAL_H_ #include "RealRep.h" -CORE_BEGIN_NAMESPACE +namespace CORE { // class Real typedef RCImpl RCReal; class Real : public RCReal { @@ -490,5 +490,5 @@ inline Real RealLong::operator-() const { return ker < -LONG_MAX ? -BigInt(ker) : -ker; } -CORE_END_NAMESPACE +} //namespace CORE #endif // _CORE_REAL_H_ diff --git a/Core/include/CGAL/CORE/RealRep.h b/Core/include/CGAL/CORE/RealRep.h index 18ae5ad7caa..21abb705a81 100644 --- a/Core/include/CGAL/CORE/RealRep.h +++ b/Core/include/CGAL/CORE/RealRep.h @@ -36,7 +36,7 @@ #define _CORE_REALREP_H_ #include "BigFloat.h" -CORE_BEGIN_NAMESPACE +namespace CORE { class Real; @@ -509,5 +509,5 @@ inline std::string RealBigFloat::toString(long prec, bool sci) const { return ker.toString(prec, sci); } -CORE_END_NAMESPACE +} //namespace CORE #endif // _CORE_REALREP_H_ diff --git a/Core/include/CGAL/CORE/RefCount.h b/Core/include/CGAL/CORE/RefCount.h index 76aff5a49fa..df87a0756b0 100644 --- a/Core/include/CGAL/CORE/RefCount.h +++ b/Core/include/CGAL/CORE/RefCount.h @@ -56,7 +56,7 @@ #ifndef _CORE_REFCOUNT_H_ #define _CORE_REFCOUNT_H_ -CORE_BEGIN_NAMESPACE +namespace CORE { template class RCRepImpl { @@ -110,5 +110,5 @@ public: #endif }; -CORE_END_NAMESPACE +} //namespace CORE #endif // _CORE_REFCOUNT_H_ diff --git a/Core/include/CGAL/CORE/Timer.h b/Core/include/CGAL/CORE/Timer.h index 2363937450e..2287a3487ea 100644 --- a/Core/include/CGAL/CORE/Timer.h +++ b/Core/include/CGAL/CORE/Timer.h @@ -46,7 +46,7 @@ #include #include -CORE_BEGIN_NAMESPACE +namespace CORE { class Timer { private: @@ -73,5 +73,5 @@ public: } }; -CORE_END_NAMESPACE +} //namespace CORE #endif // _CORE_TIMER_H_ diff --git a/Core/include/CGAL/CORE/extLong.h b/Core/include/CGAL/CORE/extLong.h index 5e81397bb93..2423f1295b2 100644 --- a/Core/include/CGAL/CORE/extLong.h +++ b/Core/include/CGAL/CORE/extLong.h @@ -40,7 +40,7 @@ #include #include -CORE_BEGIN_NAMESPACE +namespace CORE { #ifndef LONG_MAX #error "haven't define LONG_MAX" @@ -290,5 +290,5 @@ inline bool extLong::isNaN() const { return (flag == 2); } -CORE_END_NAMESPACE +} //namespace CORE #endif // _CORE_EXTLONG_H_ diff --git a/Core/include/CGAL/CORE/poly/Curves.h b/Core/include/CGAL/CORE/poly/Curves.h index ea43882458d..ffe66a9ca88 100644 --- a/Core/include/CGAL/CORE/poly/Curves.h +++ b/Core/include/CGAL/CORE/poly/Curves.h @@ -74,7 +74,7 @@ #include #include "CGAL/CORE/poly/Poly.h" -CORE_BEGIN_NAMESPACE +namespace CORE { // ================================================== // Curve Class @@ -519,7 +519,7 @@ void showIntervals(char* s, BFVecInterval &vI); #include -CORE_END_NAMESPACE +} //namespace CORE #endif /*************************************************************************** */ // END diff --git a/Core/include/CGAL/CORE/poly/Poly.h b/Core/include/CGAL/CORE/poly/Poly.h index 1b21a453884..0c5bea8dd96 100644 --- a/Core/include/CGAL/CORE/poly/Poly.h +++ b/Core/include/CGAL/CORE/poly/Poly.h @@ -60,7 +60,7 @@ #include #include -CORE_BEGIN_NAMESPACE +namespace CORE { using namespace std; class Expr; // ================================================== @@ -430,5 +430,5 @@ bool Polynomial::setCoeff(int i, const NT & cc) { // We include this file from CORE/Expr.h, AFTER the definition // of class Expr, because otherwise VC++.net2003 can'y compile Expr.cpp -CORE_END_NAMESPACE +} //namespace CORE #endif diff --git a/Core/include/CGAL/CORE/poly/Sturm.h b/Core/include/CGAL/CORE/poly/Sturm.h index 023909bca1c..74995c6a435 100644 --- a/Core/include/CGAL/CORE/poly/Sturm.h +++ b/Core/include/CGAL/CORE/poly/Sturm.h @@ -62,7 +62,7 @@ #include "CGAL/CORE/Expr.h" #include "CGAL/CORE/poly/Poly.h" -CORE_BEGIN_NAMESPACE +namespace CORE { // ================================================== // Sturm Class @@ -1143,6 +1143,6 @@ CORE_INLINE void testNewtonSturm(const Polynomial&P, int prec, int n = -1) { } }// testNewtonSturm -CORE_END_NAMESPACE +} //namespace CORE #endif diff --git a/Core/src/CGALCore/BigFloat.cpp b/Core/src/CGALCore/BigFloat.cpp index f4613388eba..99ad583d2f9 100644 --- a/Core/src/CGALCore/BigFloat.cpp +++ b/Core/src/CGALCore/BigFloat.cpp @@ -44,7 +44,7 @@ #include #include -CORE_BEGIN_NAMESPACE +namespace CORE { //////////////////////////////////////////////////////////// @@ -1283,4 +1283,4 @@ BigFloat root(const BigFloat& x, unsigned long k, } }//root -CORE_END_NAMESPACE +} //namespace CORE diff --git a/Core/src/CGALCore/CoreAux.cpp b/Core/src/CGALCore/CoreAux.cpp index 0949b6115cc..7f3685d280a 100644 --- a/Core/src/CGALCore/CoreAux.cpp +++ b/Core/src/CGALCore/CoreAux.cpp @@ -35,7 +35,7 @@ #include "CGAL/CORE/CoreAux.h" #include -CORE_BEGIN_NAMESPACE +namespace CORE { //////////////////////////////////////////////////////////// // More useful functions to implement: @@ -209,4 +209,4 @@ void core_error(std::string msg, std::string file, int lineno, bool err) { } -CORE_END_NAMESPACE +} //namespace CORE diff --git a/Core/src/CGALCore/CoreDefs.cpp b/Core/src/CGALCore/CoreDefs.cpp index 1fc39fb5eed..2a9d39a501e 100644 --- a/Core/src/CGALCore/CoreDefs.cpp +++ b/Core/src/CGALCore/CoreDefs.cpp @@ -33,7 +33,7 @@ #include "CGAL/CORE/CoreDefs.h" -CORE_BEGIN_NAMESPACE +namespace CORE { // Default Values @@ -150,5 +150,5 @@ long defInitialProgressivePrec = 64; * true = turn on rational reduction */ bool rationalReduceFlag = false; -CORE_END_NAMESPACE +} //namespace CORE diff --git a/Core/src/CGALCore/CoreIO.cpp b/Core/src/CGALCore/CoreIO.cpp index 9a6d482dd10..e8cbf9e1e48 100644 --- a/Core/src/CGALCore/CoreIO.cpp +++ b/Core/src/CGALCore/CoreIO.cpp @@ -31,7 +31,7 @@ #include #include -CORE_BEGIN_NAMESPACE +namespace CORE { void core_io_error_handler(const char *f, const char *m) { std::cout << "\n error_handler"; @@ -453,5 +453,5 @@ void BigFloat::write_to_file2(std::ostream& out, int base, int charsPerLine) { } */ -CORE_END_NAMESPACE +} //namespace CORE diff --git a/Core/src/CGALCore/Expr.cpp b/Core/src/CGALCore/Expr.cpp index f65b68f709d..b5f35634a92 100644 --- a/Core/src/CGALCore/Expr.cpp +++ b/Core/src/CGALCore/Expr.cpp @@ -36,7 +36,7 @@ #include #include -CORE_BEGIN_NAMESPACE +namespace CORE { #ifdef CORE_DEBUG_BOUND unsigned int BFMSS_counter = 0; @@ -1148,4 +1148,4 @@ void BinOpRep::debugTree(int level, int indent, int depthLimit) const { second->debugTree(level, indent + 2, depthLimit - 1); } -CORE_END_NAMESPACE +} //namespace CORE diff --git a/Core/src/CGALCore/GmpIO.cpp b/Core/src/CGALCore/GmpIO.cpp index b79f858ccec..7f4fd70f324 100644 --- a/Core/src/CGALCore/GmpIO.cpp +++ b/Core/src/CGALCore/GmpIO.cpp @@ -41,7 +41,7 @@ MA 02110-1301, USA. */ using namespace std; -CORE_BEGIN_NAMESPACE +namespace CORE { int __gmp_istream_set_base (istream &i, char &c, bool &zero, bool &showbase) @@ -255,4 +255,4 @@ io_write (ostream &o, mpq_srcptr q) return o << mpq_get_str (0, 10, q); } -CORE_END_NAMESPACE +} //namespace CORE diff --git a/Core/src/CGALCore/Real.cpp b/Core/src/CGALCore/Real.cpp index 48f75bd34b2..28897057fc2 100644 --- a/Core/src/CGALCore/Real.cpp +++ b/Core/src/CGALCore/Real.cpp @@ -37,7 +37,7 @@ #include #include -CORE_BEGIN_NAMESPACE +namespace CORE { const Real& Real::getZero() { static Real Zero(0); @@ -265,4 +265,4 @@ std::istream& operator >>(std::istream& i, Real& x) { return i; }//operator >> (std::istream&, Real&) -CORE_END_NAMESPACE +} //namespace CORE diff --git a/Core/src/CGALCore/extLong.cpp b/Core/src/CGALCore/extLong.cpp index 76de140614a..136cfe1fa3f 100644 --- a/Core/src/CGALCore/extLong.cpp +++ b/Core/src/CGALCore/extLong.cpp @@ -40,7 +40,7 @@ #include -CORE_BEGIN_NAMESPACE +namespace CORE { const extLong& extLong::getNaNLong() { static extLong NaNLong(true); @@ -191,4 +191,4 @@ std::ostream& operator<< (std::ostream& o, const extLong& x) { return o; } -CORE_END_NAMESPACE +} //namespace CORE diff --git a/Developers_manual/doc_tex/Developers_manual/namespaces.tex b/Developers_manual/doc_tex/Developers_manual/namespaces.tex index 873eb323790..91085331901 100644 --- a/Developers_manual/doc_tex/Developers_manual/namespaces.tex +++ b/Developers_manual/doc_tex/Developers_manual/namespaces.tex @@ -82,10 +82,7 @@ my_new_function( My_new_cgal_class& ); Make sure not to have include statements nested between \verb+ namespace CGAL { + and \verb+ } // namespace CGAL+. Otherwise all names defined in the file included will be -added to namespace \ccc{CGAL}. (Some people use the macros -\ccc{CGAL_BEGIN_NAMESPACE} and \ccc{CGAL_END_NAMESPACE} -in place of the \texttt{namespace CGAL \{} and -\texttt{\} // namespace CGAL}, respectively, for better readability.) +added to namespace \ccc{CGAL}. \section{Namespace {\tt internal}} \ccIndexSubitem{namespace}{\ccFont internal} diff --git a/Kernel_d/noweb/Aff_transformationHd.lw b/Kernel_d/noweb/Aff_transformationHd.lw index 55d8a3b2e8d..d83d65309d2 100644 --- a/Kernel_d/noweb/Aff_transformationHd.lw +++ b/Kernel_d/noweb/Aff_transformationHd.lw @@ -33,12 +33,12 @@ #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { <> <> -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_AFF_TRANSFORMATIONHD_H @ The implementation file contains the following. @@ -51,11 +51,11 @@ CGAL_END_NAMESPACE #ifndef CGAL_AFF_TRANSFORMATIONHD_C #define CGAL_AFF_TRANSFORMATIONHD_C -CGAL_BEGIN_NAMESPACE +namespace CGAL { <> -CGAL_END_NAMESPACE +} //namespace CGAL #endif // CGAL_AFF_TRANSFORMATIONHD_C @ \subsection{The Representation Class} diff --git a/Kernel_d/noweb/function_objectsCd.lw b/Kernel_d/noweb/function_objectsCd.lw index 7ec0bf4c313..f37c4f170cc 100644 --- a/Kernel_d/noweb/function_objectsCd.lw +++ b/Kernel_d/noweb/function_objectsCd.lw @@ -654,7 +654,7 @@ OutputIterator operator()(ForwardIterator first, ForwardIterator last, #define TRACEN(t) std::cerr << t << std::endl #define TRACEV(t) std::cerr << #t << " = " << (t) << std::endl -CGAL_BEGIN_NAMESPACE +namespace CGAL { <> <> @@ -676,7 +676,7 @@ CGAL_BEGIN_NAMESPACE <> <> -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_FUNCTION_OBJECTSCD_H @ diff --git a/Kernel_d/noweb/function_objectsHd.lw b/Kernel_d/noweb/function_objectsHd.lw index 8146ab8a369..8bbf92fc852 100644 --- a/Kernel_d/noweb/function_objectsHd.lw +++ b/Kernel_d/noweb/function_objectsHd.lw @@ -661,7 +661,7 @@ OutputIterator operator()(ForwardIterator first, ForwardIterator last, #include #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { <> <> @@ -683,7 +683,7 @@ CGAL_BEGIN_NAMESPACE <> <> -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_FUNCTION_OBJECTSHD_H @ diff --git a/Kernel_d/noweb/intersection_objects_d.lw b/Kernel_d/noweb/intersection_objects_d.lw index 98d535f20e8..881ce07a764 100644 --- a/Kernel_d/noweb/intersection_objects_d.lw +++ b/Kernel_d/noweb/intersection_objects_d.lw @@ -1000,11 +1000,11 @@ Segment_d_Hyperplane_d_pair::intersection(Segment_d& s) #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { <> -CGAL_END_NAMESPACE +} //namespace CGAL #include @@ -1019,11 +1019,11 @@ CGAL_END_NAMESPACE #define _DEBUG 11 #include -CGAL_BEGIN_NAMESPACE +namespace CGAL { <> -CGAL_END_NAMESPACE +} //namespace CGAL #include @@ -1035,7 +1035,7 @@ CGAL_END_NAMESPACE #ifndef CGAL_INTERSECTION_OBJECTS_D_H #define CGAL_INTERSECTION_OBJECTS_D_H -CGAL_BEGIN_NAMESPACE +namespace CGAL { <> <> @@ -1047,7 +1047,7 @@ CGAL_BEGIN_NAMESPACE <> <> -CGAL_END_NAMESPACE +} //namespace CGAL #endif //CGAL_INTERSECTION_OBJECTS_D_H @ \end{document} diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/include/Qt_Delaunay_stable_subset_2.h b/Kinetic_data_structures/demo/Kinetic_data_structures/include/Qt_Delaunay_stable_subset_2.h index a868ea6de08..89e34aea9ce 100644 --- a/Kinetic_data_structures/demo/Kinetic_data_structures/include/Qt_Delaunay_stable_subset_2.h +++ b/Kinetic_data_structures/demo/Kinetic_data_structures/include/Qt_Delaunay_stable_subset_2.h @@ -7,7 +7,7 @@ #include #include -CGAL_KINETIC_BEGIN_NAMESPACE +namespace CGAL { namespace Kinetic { //! This class draws a Kinetic_Delaunay_2 triangulation to a Qt_gui_2. /*! The most recently created edges are colored green and the other @@ -143,5 +143,5 @@ protected: double threshold_; }; -CGAL_KINETIC_END_NAMESPACE +} } //namespace CGAL::Kinetic #endif diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_moving_points_3.h b/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_moving_points_3.h index 3c47f0f6d65..51b324af892 100644 --- a/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_moving_points_3.h +++ b/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_moving_points_3.h @@ -42,7 +42,7 @@ #include #include -CGAL_KINETIC_BEGIN_NAMESPACE; +namespace CGAL { namespace Kinetic {; //! A graphical moving point set in 3D /*! @@ -461,5 +461,5 @@ void SoQt_moving_points_3::write(std::ostream &out) const } -CGAL_KINETIC_END_NAMESPACE; +} } //namespace CGAL::Kinetic; #endif // guard diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_moving_weighted_points_3.h b/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_moving_weighted_points_3.h index 863aa1a8de7..83366994f8e 100644 --- a/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_moving_weighted_points_3.h +++ b/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_moving_weighted_points_3.h @@ -44,7 +44,7 @@ #include #include -CGAL_KINETIC_BEGIN_NAMESPACE; +namespace CGAL { namespace Kinetic {; //! A graphical moving point set in 3D /*! @@ -450,5 +450,5 @@ void SoQt_moving_weighted_points_3::write(std::ostream &out) const } -CGAL_KINETIC_END_NAMESPACE; +} } //namespace CGAL::Kinetic; #endif // guard diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_triangulation_3.h b/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_triangulation_3.h index 2607517fe52..3e3559eba07 100644 --- a/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_triangulation_3.h +++ b/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_triangulation_3.h @@ -46,7 +46,7 @@ #include #include -CGAL_KINETIC_BEGIN_NAMESPACE +namespace CGAL { namespace Kinetic { //! A class to display a 3D triangulation. /*! @@ -423,5 +423,5 @@ void SoQt_triangulation_3::generate_geometry() //wa.apply(parent_.get()); }; -CGAL_KINETIC_END_NAMESPACE +} } //namespace CGAL::Kinetic #endif diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_widget_3.h b/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_widget_3.h index 60d427503af..3d44b7f6a1a 100644 --- a/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_widget_3.h +++ b/Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_widget_3.h @@ -32,7 +32,7 @@ class SoSeparator; -CGAL_KINETIC_BEGIN_NAMESPACE; +namespace CGAL { namespace Kinetic {; //! This provides a GUI in 3D using Coin. /*! If you want to draw something, extend @@ -177,5 +177,5 @@ protected: Window_listener window_l_; }; -CGAL_KINETIC_END_NAMESPACE; +} } //namespace CGAL::Kinetic; #endif // qt diff --git a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Active_objects_set.h b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Active_objects_set.h index 97fd62fb47a..b0e9302064c 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Active_objects_set.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Active_objects_set.h @@ -33,7 +33,7 @@ #include #include -CGAL_KINETIC_BEGIN_NAMESPACE; +namespace CGAL { namespace Kinetic {; //! Holds a set of moving points and creates notifications when changes occur. /*! This container holds a set of objects of a particular type. It @@ -357,5 +357,5 @@ inline std::istream &operator>>(std::istream &in, Active_objects_set &v) { return v.read(in); } -CGAL_KINETIC_END_NAMESPACE; +} } //namespace CGAL::Kinetic; #endif diff --git a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_1.h b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_1.h index ef738033c6b..59ffee45327 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_1.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_1.h @@ -22,7 +22,7 @@ #define CGAL_KINETIC_EXACT_SIMULATION_1_H #include -CGAL_KINETIC_BEGIN_NAMESPACE +namespace CGAL { namespace Kinetic { struct Exact_simulation_traits_1: public Suggested_exact_simulation_traits_base { typedef Suggested_exact_simulation_traits_base P; @@ -46,5 +46,5 @@ struct Exact_simulation_traits_1: public Suggested_exact_simulation_traits_base protected: Active_points_1_table::Handle ap_; }; -CGAL_KINETIC_END_NAMESPACE +} } //namespace CGAL::Kinetic #endif diff --git a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_2.h b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_2.h index d7cc4aa15cf..d041ba73d08 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_2.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_2.h @@ -22,7 +22,7 @@ #define CGAL_KINETIC_EXACT_SIMULATION_2_H #include -CGAL_KINETIC_BEGIN_NAMESPACE +namespace CGAL { namespace Kinetic { struct Exact_simulation_traits_2: public Suggested_exact_simulation_traits_base { typedef Suggested_exact_simulation_traits_base P; typedef Active_objects_vector Active_points_2_table; @@ -45,5 +45,5 @@ struct Exact_simulation_traits_2: public Suggested_exact_simulation_traits_base protected: Active_points_2_table::Handle ap_; }; -CGAL_KINETIC_END_NAMESPACE +} } //namespace CGAL::Kinetic #endif diff --git a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_3.h b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_3.h index 1f476ebc9f7..9c1cc628132 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_3.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_3.h @@ -22,7 +22,7 @@ #define CGAL_KINETIC_EXACT_SIMULATION_3_H #include -CGAL_KINETIC_BEGIN_NAMESPACE +namespace CGAL { namespace Kinetic { struct Exact_simulation_traits_3: public Suggested_exact_simulation_traits_base { typedef Suggested_exact_simulation_traits_base P; @@ -46,5 +46,5 @@ struct Exact_simulation_traits_3: public Suggested_exact_simulation_traits_base protected: Active_points_3_table::Handle ap_; }; -CGAL_KINETIC_END_NAMESPACE +} } //namespace CGAL::Kinetic #endif diff --git a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_1.h b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_1.h index 6cf991da1de..90781d42e46 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_1.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_1.h @@ -23,7 +23,7 @@ #include -CGAL_KINETIC_BEGIN_NAMESPACE +namespace CGAL { namespace Kinetic { struct Inexact_simulation_traits_1: public Suggested_inexact_simulation_traits_base { typedef Suggested_inexact_simulation_traits_base P; @@ -47,5 +47,5 @@ struct Inexact_simulation_traits_1: public Suggested_inexact_simulation_traits_b protected: Active_points_1_table::Handle ap_; }; -CGAL_KINETIC_END_NAMESPACE +} } //namespace CGAL::Kinetic #endif diff --git a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_2.h b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_2.h index 5c5ca31a268..10adf79c5b6 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_2.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_2.h @@ -23,7 +23,7 @@ #include -CGAL_KINETIC_BEGIN_NAMESPACE +namespace CGAL { namespace Kinetic { struct Inexact_simulation_traits_2: public Suggested_inexact_simulation_traits_base { typedef Suggested_inexact_simulation_traits_base P; @@ -48,5 +48,5 @@ protected: Active_points_2_table::Handle ap_; }; -CGAL_KINETIC_END_NAMESPACE +} } //namespace CGAL::Kinetic #endif diff --git a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_3.h b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_3.h index e75a7249eec..9652c6a6f5b 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_3.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_3.h @@ -24,7 +24,7 @@ #include -CGAL_KINETIC_BEGIN_NAMESPACE +namespace CGAL { namespace Kinetic { struct Inexact_simulation_traits_3: public Suggested_inexact_simulation_traits_base { typedef Suggested_inexact_simulation_traits_base P; @@ -49,5 +49,5 @@ protected: Active_points_3_table::Handle ap_; }; -CGAL_KINETIC_END_NAMESPACE +} } //namespace CGAL::Kinetic #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 cb48f7f04cb..5d76e8062d4 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 @@ -4,7 +4,7 @@ #include -CGAL_KINETIC_BEGIN_NAMESPACE +namespace CGAL { namespace Kinetic { template class Interval_root { @@ -209,7 +209,7 @@ std::pair to_interval(const Interval_root& a) { }*/ -CGAL_KINETIC_END_NAMESPACE +} } //namespace CGAL::Kinetic namespace CGAL { @@ -244,7 +244,7 @@ namespace std { }; }; -CGAL_KINETIC_BEGIN_NAMESPACE +namespace CGAL { namespace Kinetic { template struct Interval_simulator_traits { @@ -302,6 +302,6 @@ struct Interval_simulator_traits { } }; -CGAL_KINETIC_END_NAMESPACE +} } //namespace CGAL::Kinetic #endif diff --git a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Simulation_traits.h b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Simulation_traits.h index 97659cab5f9..9eb69766d79 100644 --- a/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Simulation_traits.h +++ b/Kinetic_data_structures/hidden/include/CGAL/Kinetic/Simulation_traits.h @@ -47,7 +47,7 @@ #define CGAL_KINETIC_USE_CORE -CGAL_KINETIC_BEGIN_NAMESPACE +namespace CGAL { namespace Kinetic { template