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

@@ -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

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

AABB_tree/include/CGAL/internal/AABB_Intersections_3/Bbox_3_Sphere_3_do_intersect.h

@@ -27,7 +27,7 @@
 #include <CGAL/number_utils.h>
 
 
-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

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/internal/AABB_Intersections_3/Bbox_3_Plane_3_do_intersect.h>
 
-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

Algebraic_foundations/include/CGAL/Algebraic_extension_traits.h

@@ -30,7 +30,7 @@
 
 #include <numeric> // for std::accumulate
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 template< class T >
 class Algebraic_extension_traits {
@@ -79,7 +79,7 @@ public:
     };
 };
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // NiX_ALGEBRAIC_NUMBER_TRAITS_H
 // EOF

Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h

@@ -27,7 +27,7 @@
 #include <CGAL/number_type_basic.h>
 #include <CGAL/type_traits.h>
 
-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

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<class A , class B>
 struct Coercion_traits :public Coercion_traits_for_level<A,B,CTL_TOP>{};
 
  
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif //NiX_COERCION_TRAITS_H

Algebraic_foundations/include/CGAL/Fraction_traits.h

@@ -37,7 +37,7 @@
 
 #include <CGAL/number_type_basic.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 /*! \ingroup NiX_Fraction_traits_spec
  *  \brief Traits class for accessing numerator and denominator.\n 
@@ -62,7 +62,7 @@ public:
     typedef Null_functor Compose;
 };
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_FRACTION_TRAITS_H
 // EOF

Algebraic_foundations/include/CGAL/Needs_parens_as_product.h

@@ -25,7 +25,7 @@
 
 #include <CGAL/IO/io.h>
  
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 /*! 
  * oformat flag for parentheses if needed for a coefficient
@@ -97,6 +97,6 @@ template <> struct Needs_parens_as_product<long double>{
     bool operator()(const long double& x){return x < (long double)(0);} 
 };
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif  //CGAL_NEEDS_PARENTHESES_AS_PRODUCT_H

Algebraic_foundations/include/CGAL/Rational_traits.h

@@ -29,7 +29,7 @@
 #include <CGAL/number_type_basic.h>
 #include <CGAL/Fraction_traits.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 namespace internal{
 
@@ -87,7 +87,7 @@ typename Fraction_traits<T>::Denominator_type
 >::value >
 {};
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_RATIONAL_TRAITS_H
 // EOF

Algebraic_foundations/include/CGAL/Real_embeddable_traits.h

@@ -26,7 +26,7 @@
 
 #include <CGAL/number_type_basic.h>
 
-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<Type_,CGAL::Tag_false> {};
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif  // CGAL_REAL_EMBEDDABLE_TRAITS_H

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

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<Is_numerical_sensitive, CGAL::Null_tag>::value));
 }
   
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_TEST_ALGEBRAIC_STRUCTURE_H

Algebraic_foundations/include/CGAL/Test/_test_coercion_traits.h

@@ -28,7 +28,7 @@
 #include <cassert>
 
 // 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  <class FROM, class TO>
 void test_explicit_interoperable_from_to(){
     test_explicit_interoperable<FROM,TO,TO>();
 }
-CGAL_END_NAMESPACE
+} //namespace CGAL

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 <class T>
 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

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 <class Rational>
 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

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 Type, class ToDouble>
     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

Algebraic_foundations/include/CGAL/extended_euclidean_algorithm.h

@@ -25,7 +25,7 @@
 #include <CGAL/basic.h>
 #include <vector>
 
-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 //

Algebraic_foundations/include/CGAL/ipower.h

@@ -26,7 +26,7 @@
 #ifndef CGAL_IPOWER_H
 #define CGAL_IPOWER_H
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 template <typename NT>
 inline
@@ -76,6 +76,6 @@ NT ipower(const NT& base, long expn) {
     return res;
 }
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_IPOWER_H

Algebraic_foundations/include/CGAL/number_utils.h

@@ -26,7 +26,7 @@
 
 #include <CGAL/number_type_basic.h>
 
-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

Algebraic_foundations/include/CGAL/number_utils_classes.h

@@ -31,7 +31,7 @@
 #include <algorithm>
 #include <utility>
 
-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

Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_converter.h

@@ -27,7 +27,7 @@
 
 #include <CGAL/NT_converter.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 // TODO :
 // - FT converter ?
@@ -61,6 +61,6 @@ public:
 	}
 };
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_CONVERTER_H

Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/function_objects_on_roots_and_polynomials_2_2.h

@@ -29,7 +29,7 @@
 #include <CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomial_1_2_and_2_2.h>
 #include <CGAL/Algebraic_kernel_for_circles/internal_functions_comparison_root_for_circles_2_2.h>
 
-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

Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles_2_2.h

@@ -33,7 +33,7 @@
 
 #include <CGAL/Algebraic_kernel_for_circles/function_objects_on_roots_and_polynomials_2_2.h>
 
-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

Algebraic_kernel_for_circles/include/CGAL/Polynomials_1_2.h

@@ -27,7 +27,7 @@
 
 #include <CGAL/enum.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 template < typename RT_ >
 class Polynomial_1_2
@@ -67,6 +67,6 @@ operator == ( const Polynomial_1_2<RT> & p1,
               (p1.c() == p2.c()) );
 }
     
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif //CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_POLYNOMIALS_1_2_H

Algebraic_kernel_for_circles/include/CGAL/Polynomials_2_2.h

@@ -29,7 +29,7 @@
 
 #include <CGAL/enum.h>
 
-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<FT> & p1,
               (p1.r_sq() == p2.r_sq()) );
 }
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif //CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_POLYNOMIALS_2_2_H

Algebraic_kernel_for_circles/include/CGAL/Root_for_circles_2_2.h

@@ -30,7 +30,7 @@
 #include <CGAL/Handle_for.h>
 #include <boost/type_traits/is_same.hpp>
 
-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<RT> &r)
   return is;
 }
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_ALGEBRAIC_KERNEL_FOR_CIRCLES_ROOT_FOR_CIRCLES_2_2_H

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

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

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

Algebraic_kernel_for_spheres/include/CGAL/Algebraic_kernel_for_spheres/function_objects_on_roots_and_polynomials_2_3.h

@@ -31,7 +31,7 @@
 #include <CGAL/Algebraic_kernel_for_spheres/internal_functions_on_roots_and_polynomials_2_3.h>
 #include <CGAL/Algebraic_kernel_for_spheres/internal_functions_on_roots_and_polynomial_1_3_and_2_3.h>
 #include <CGAL/Algebraic_kernel_for_spheres/internal_functions_on_roots_and_polynomials_1_3.h>
-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

Algebraic_kernel_for_spheres/include/CGAL/Algebraic_kernel_for_spheres_2_3.h

@@ -40,7 +40,7 @@
 #include <CGAL/global_functions_on_roots_and_polynomials_2_3.h>
 #include <CGAL/global_functions_on_root_for_sphere_2_3.h>
 
-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

Algebraic_kernel_for_spheres/include/CGAL/Polynomials_1_3.h

@@ -31,7 +31,7 @@
 
 #include <CGAL/enum.h>
 
-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<FT> & p1,
          (p2.d() * p1.a() == p1.d() * p2.a());
 }
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif //CGAL_ALGEBRAIC_KERNEL_POLYNOMIALS_1_3_H

Algebraic_kernel_for_spheres/include/CGAL/Polynomials_2_3.h

@@ -31,7 +31,7 @@
 
 #include <CGAL/enum.h>
 
-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<FT> & p1,
 	  (p1.r_sq() == p2.r_sq()) );
 }
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif //CGAL_ALGEBRAIC_KERNEL_POLYNOMIALS_2_3_H

Algebraic_kernel_for_spheres/include/CGAL/Polynomials_for_line_3.h

@@ -29,7 +29,7 @@
 
 #include <CGAL/enum.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 template < typename FT_ >
 class Polynomials_for_line_3
@@ -96,6 +96,6 @@ operator == ( const Polynomials_for_line_3<FT> & p1,
 	  (p1.b3() == p2.b3()));
 }
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif //CGAL_ALGEBRAIC_KERNEL_POLYNOMIALS_FOR_LINE_3_H

Algebraic_kernel_for_spheres/include/CGAL/Root_for_spheres_2_3.h

@@ -35,7 +35,7 @@
 #include <CGAL/Polynomials_for_line_3.h>
 #include <CGAL/Bbox_3.h>
 
-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<RT> &r)
   return is;
 }
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_ROOT_FOR_SPHERES_2_3_H

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

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

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

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<Dt>::print_edge_map() {
 
 
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 
 #endif //CGAL_ALPHA_SHAPE_2_H

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

Alpha_shapes_2/include/CGAL/Alpha_shape_face_base_2.h

@@ -22,7 +22,7 @@
 
 #include <CGAL/utility.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 template < class Gt, class Fb = Triangulation_face_base_2<Gt> >
 class Alpha_shape_face_base_2 : public Fb
@@ -81,6 +81,6 @@ public:
 
 };
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif //ALPHA_SHAPE_FACE_BASE_2_H

Alpha_shapes_2/include/CGAL/Alpha_shape_vertex_base_2.h

@@ -24,7 +24,7 @@
 #include <CGAL/Triangulation_vertex_base_2.h>
 
 //-------------------------------------------------------------------
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 //-------------------------------------------------------------------
 
 template <class Gt, class Vb = Triangulation_vertex_base_2<Gt> >
@@ -77,7 +77,7 @@ public:
 };
 
 //-------------------------------------------------------------------
-CGAL_END_NAMESPACE
+} //namespace CGAL
 //-------------------------------------------------------------------
 
 #endif //ALPHA_SHAPE_VERTEX_BASE_2_H

Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_2.h

@@ -31,7 +31,7 @@
 
 #include <CGAL/less_partial.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 template < class Rt >
 class Weighted_alpha_shape_2 : public Alpha_shape_2<Rt>
@@ -235,6 +235,6 @@ Weighted_alpha_shape_2<Rt>::initialize_weights_to_the_nearest_vertex
     }
 }
  
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif //CGAL_WEIGHTED_ALPHA_2_H

Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h

@@ -29,7 +29,7 @@
 #include <CGAL/Regular_triangulation_euclidean_traits_2.h>
 
 //-------------------------------------------------------------------
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 //-------------------------------------------------------------------
 
 //------------------ Function Objects----------------------------------
@@ -141,7 +141,7 @@ public:
 };
   
 //-------------------------------------------------------------------
-CGAL_END_NAMESPACE
+} //namespace CGAL
 //-------------------------------------------------------------------
 
 #endif

Alpha_shapes_2/include/CGAL/constructions/squared_radius_smallest_orthogonalcircle_ftC2.h

@@ -24,7 +24,7 @@
 #include <CGAL/enum.h>
 
 //-------------------------------------------------------------------
-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

Alpha_shapes_2/include/CGAL/predicates/in_smallest_orthogonalcircle_ftC2.h

@@ -24,7 +24,7 @@
 #include <CGAL/enum.h>
 
 //-------------------------------------------------------------------
-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

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<Dt>::print_alpha_status(const Alpha_status& as) const
   std::cerr << std::endl;
 }
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #ifdef CGAL_USE_GEOMVIEW
 #include <CGAL/IO/alpha_shape_geomview_ostream_3.h>

Alpha_shapes_3/include/CGAL/Alpha_shape_cell_base_3.h

@@ -24,7 +24,7 @@
 #include <CGAL/Compact_container.h>
 #include <CGAL/Triangulation_cell_base_3.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 template < class NT>
 class  Alpha_status 
@@ -106,6 +106,6 @@ public:
 
 };
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_ALPHA_SHAPE_CELL_BASE_3_H

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 K>
 class Alpha_shape_euclidean_traits_3 : public K {};
 
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif //CGAL_ALPHA_SHAPE_EUCLIDEAN_TRAITS_3_H

Alpha_shapes_3/include/CGAL/Alpha_shape_vertex_base_3.h

@@ -25,7 +25,7 @@
 #include <CGAL/Triangulation_vertex_base_3.h>
 #include <CGAL/Alpha_shape_cell_base_3.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 template <class Gt, class Vb = Triangulation_vertex_base_3<Gt> >
 class Alpha_shape_vertex_base_3
@@ -69,6 +69,6 @@ public:
   void set_alpha_status(Alpha_status_iterator as) {_as= as;}
 };
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_ALPHA_SHAPE_VERTEX_BASE_3_H

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<Dt>& A)
 }
 
 //-------------------------------------------------------------------
-CGAL_END_NAMESPACE
+} //namespace CGAL
 //-------------------------------------------------------------------
 
 #endif // CGAL_IO_ALPHA_SHAPE_GEOMVIEW_OSTREAM_3_H

Alpha_shapes_3/include/CGAL/Weighted_alpha_shape_euclidean_traits_3.h

@@ -22,7 +22,7 @@
 
 #include <CGAL/Regular_triangulation_euclidean_traits_3.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 
    
@@ -35,7 +35,7 @@ class Weighted_alpha_shape_euclidean_traits_3 : public
 Regular_triangulation_euclidean_traits_3<K>
 {};
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 #endif //CGAL_NO_DEPRECATED_CODE
   
   

Apollonius_graph_2/demo/Apollonius_graph_2/Qt3/include/CGAL/colors.h

@@ -22,7 +22,7 @@
 
 #include <CGAL/basic.h>
 
-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

Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/make_degenerate.h

@@ -4,7 +4,7 @@
 #include <CGAL/basic.h>
 #include <CGAL/Apollonius_graph_hierarchy_2.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 template<class InputIterator, class OutputIterator, class Traits>
 OutputIterator
@@ -34,6 +34,6 @@ make_degenerate(InputIterator first,
   return oit;
 }
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_MAKE_DEGENERATE_H

Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/random_integral_sites_in_square_2.h

@@ -4,7 +4,7 @@
 #include <CGAL/basic.h>
 #include <CGAL/random_integer.h>
 
-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 @@ private:
   Random r_;
 };
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_RANDOM_INTEGRAL_SITES_IN_SQUARE_2_H

Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/random_integral_sites_on_parabola_2.h

@@ -4,7 +4,7 @@
 #include <CGAL/basic.h>
 #include <CGAL/random_integer.h>
 
-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 @@ private:
   Random r_;
 };
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_RANDOM_INTEGRAL_SITES_ON_PARABOLA_2_H

Apollonius_graph_2/generators/include/CGAL/Apollonius_graph_2/random_sites_in_0x1_box.h

@@ -4,7 +4,7 @@
 #include <CGAL/basic.h>
 #include <CGAL/Random.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 template<class Site>
 class Random_sites_in_0x1_box
@@ -32,6 +32,6 @@ private:
   Random random_;
 };
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_RANDOM_SITES_IN_0X1_BOX_H

Apollonius_graph_2/generators/include/CGAL/bits.h

@@ -4,7 +4,7 @@
 #include <CGAL/basic.h>
 #include <cmath>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 double log2(double x)
 {
@@ -18,6 +18,6 @@ unsigned int bits(double x)
   return static_cast<unsigned int>(log2( fabs(x) )) + 1;
 }
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_BITS_H

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

Apollonius_graph_2/include/CGAL/Apollonius_graph_2.h

@@ -47,7 +47,7 @@
 #include <CGAL/Concatenate_iterator.h>
 
 
-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 <CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h>
 

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<Gt,Agds,LTag>::file_input(std::istream& is)
 }
 
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_IMPL_H

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<class Gt, class Agds, class LTag>
 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

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Bounded_side_of_ccw_circle_C2.h

@@ -26,7 +26,7 @@
 #include <CGAL/Apollonius_graph_2/Predicate_constructions_C2.h>
 
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
 
@@ -97,6 +97,6 @@ public:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_BOUNDED_SIDE_OF_CCW_CIRCLE_C2_H

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 @@ public:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_COMPARE_WEIGHT_2_H

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 @@ public:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_COMPARE_X_2_H

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 @@ public:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_COMPARE_Y_2_H

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 @@ public:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_CONSTRUCTIONS_C2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_ftC2.h

@@ -25,7 +25,7 @@
 #include <CGAL/Apollonius_graph_2/basic.h>
 #include <CGAL/determinant.h>
 
-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

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_rtH2.h

@@ -26,7 +26,7 @@
 
 #include <CGAL/Apollonius_graph_2/Constructions_ftC2.h>
 
-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

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_filtered_traits_2.h

@@ -36,7 +36,7 @@
 #include <CGAL/number_utils_classes.h>
 
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 
 //-----------------------------------------------------------------------
@@ -408,7 +408,7 @@ public:
 
 
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 
 #endif // CGAL_APOLLONIUS_GRAPH_UNCERTAIN_FILTERED_TRAITS_2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_mixed_traits_2.h

@@ -26,7 +26,7 @@
 #include <CGAL/number_type_basic.h>
 #include <CGAL/Apollonius_graph_2/Kernel_wrapper_2.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 //-----------------------------------------------------------------------
 //-----------------------------------------------------------------------
@@ -208,6 +208,6 @@ public:
 
 };
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_NEW_TRAITS_2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_filtered_traits_2.h

@@ -36,7 +36,7 @@
 #include <CGAL/number_utils_classes.h>
 
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 
 //-----------------------------------------------------------------------
@@ -411,7 +411,7 @@ public:
 
 
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 
 #endif // CGAL_APOLLONIUS_GRAPH_NEW_FILTERED_TRAITS_2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Apollonius_graph_new_traits_2.h

@@ -26,7 +26,7 @@
 #include <CGAL/number_type_basic.h>
 #include <CGAL/Apollonius_graph_2/Kernel_wrapper_2.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 //-----------------------------------------------------------------------
 //-----------------------------------------------------------------------
@@ -211,6 +211,6 @@ public:
 
 };
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_NEW_TRAITS_2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Conflict_2.h

@@ -25,7 +25,7 @@
 #include <CGAL/Apollonius_graph_2/basic.h>
 #include <CGAL/Apollonius_graph_2/Predicate_constructions_C2.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
 
@@ -183,6 +183,6 @@ protected:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_CONFLICT_2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Edge_conflict_2.h

@@ -25,7 +25,7 @@
 
 #include <CGAL/Apollonius_graph_2/Delage_traits/Conflict_2.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
 
@@ -106,6 +106,6 @@ protected:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_EDGE_CONFLICT_2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Finite_edge_conflict_2.h

@@ -24,7 +24,7 @@
 
 #include <CGAL/Apollonius_graph_2/Delage_traits/Edge_conflict_2.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
 
@@ -85,6 +85,6 @@ public:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_FINITE_EDGE_CONFLICT_2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Infinite_edge_conflict_2.h

@@ -25,7 +25,7 @@
 
 #include <CGAL/Apollonius_graph_2/Delage_traits/Edge_conflict_2.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
 
@@ -64,6 +64,6 @@ public:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_INFINITE_EDGE_CONFLICT_2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Orientation_2.h

@@ -25,7 +25,7 @@
 
 #include <CGAL/Apollonius_graph_2/Orientation_2.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
 
@@ -94,6 +94,6 @@ public:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_ORIENTATION_NEW_2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Vertex_conflict_2.h

@@ -26,7 +26,7 @@
 #include <CGAL/Apollonius_graph_2/basic.h>
 
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
 
@@ -322,6 +322,6 @@ public:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_VERTEX_CONFLICT_2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test8_C2.h

@@ -26,7 +26,7 @@
 #include <CGAL/Apollonius_graph_2/Oriented_side_of_bisector_C2.h>
 
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
 
@@ -751,6 +751,6 @@ public:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_FINITE_EDGE_TEST8_C2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test_C2.h

@@ -29,7 +29,7 @@
 #include <CGAL/functions_on_signs.h>
 #include <CGAL/Apollonius_graph_2/compare_quadratic.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
 
@@ -631,6 +631,6 @@ public:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_FINITE_EDGE_TEST_C2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Incircle8_C2.h

@@ -25,7 +25,7 @@
 #include <CGAL/Apollonius_graph_2/Incircle_C2.h>
 
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
 
@@ -129,6 +129,6 @@ public:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_INCIRCLE8_C2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Incircle_C2.h

@@ -29,7 +29,7 @@
 #include <CGAL/Apollonius_graph_2/Bounded_side_of_ccw_circle_C2.h>
 
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
 
@@ -241,6 +241,6 @@ public:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_INCIRCLE_C2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Infinite_edge_test_C2.h

@@ -27,7 +27,7 @@
 #include <CGAL/Apollonius_graph_2/Predicate_constructions_C2.h>
 
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
 
@@ -314,7 +314,7 @@ public:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_INFINITE_EDGE_TEST_C2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Is_degenerate_edge_C2.h

@@ -29,7 +29,7 @@
 #include <CGAL/Apollonius_graph_2/Incircle_C2.h>
 #include <CGAL/Apollonius_graph_2/Finite_edge_test_C2.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
 
@@ -94,6 +94,6 @@ public:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_IS_DEGENERATE_EDGE_C2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Is_hidden_C2.h

@@ -25,7 +25,7 @@
 #include <CGAL/Apollonius_graph_2/basic.h>
 
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
 
@@ -83,6 +83,6 @@ public:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_IS_HIDDEN_C2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Kernel_wrapper_2.h

@@ -27,7 +27,7 @@
 #include <CGAL/Apollonius_site_2.h>
 //#include <CGAL/Cartesian_converter.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
 
@@ -80,7 +80,7 @@ public:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_KERNEL_WRAPPER_2_H

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 @@ public:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_ORIENTATION8_C2_H

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 @@ public:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_ORIENTATION_2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Oriented_side_of_bisector_C2.h

@@ -25,7 +25,7 @@
 #include <CGAL/Apollonius_graph_2/basic.h>
 
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
 
@@ -123,6 +123,6 @@ public:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_ORIENTED_SIDE_OF_BISECTOR_C2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Predicate_constructions_C2.h

@@ -24,7 +24,7 @@
 
 #include <CGAL/Apollonius_graph_2/basic.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
 
@@ -357,6 +357,6 @@ public:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif  // CGAL_APOLLONIUS_GRAPH_2_PREDICATE_CONSTRUCTIONS_2_H

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 @@ public:
 
 CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_TRAITS_WRAPPER_2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/comparator_profiler.h

@@ -24,7 +24,7 @@
 
 #include <CGAL/Apollonius_graph_2/basic.h>
 
-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

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/compare_quadratic.h

@@ -25,7 +25,7 @@
 #include <CGAL/Apollonius_graph_2/basic.h>
 #include <CGAL/functions_on_signs.h>
 
-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

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

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Apollonius_graph_uncertain_filtered_traits_2.h

@@ -44,7 +44,7 @@
 #include <CGAL/Apollonius_graph_2/uncertain/Uncertain_vertex_conflict_2.h>
 
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 
 //-----------------------------------------------------------------------
@@ -502,7 +502,7 @@ public:
 
 
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 
 #endif // CGAL_APOLLONIUS_GRAPH_UNCERTAIN_FILTERED_TRAITS_2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_is_hidden_C2.h

@@ -27,7 +27,7 @@
 #include <CGAL/number_type_basic.h>
 
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 //--------------------------------------------------------------------
 
@@ -92,6 +92,6 @@ public:
 //--------------------------------------------------------------------
 
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_UNCERTAIN_IS_HIDDEN_C2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_oriented_side_of_bisector_C2.h

@@ -27,7 +27,7 @@
 #include <CGAL/number_type_basic.h>
 #include <CGAL/Apollonius_graph_2/uncertain/uncertain_functions_on_signs.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 //--------------------------------------------------------------------
 
@@ -120,6 +120,6 @@ public:
 
 //--------------------------------------------------------------------
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_UNCERTAIN_ORIENTED_SIDE_OF_BISECTOR_C2_H

Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_vertex_conflict_2.h

@@ -27,7 +27,7 @@
 #include <CGAL/Uncertain.h>
 #include <CGAL/Apollonius_graph_traits_2.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 //-----------------------------------------------------------------------
 //                        Vertex conflict
@@ -402,6 +402,6 @@ public:
 };
 
 
-CGAL_END_NAMESPACE
+} //namespace CGAL
 
 #endif // CGAL_APOLLONIUS_GRAPH_2_UNCERTAIN_VERTEX_CONFLICT_2_H