From 7fea74cad6ea3bf2023df915a261a876c10c417e Mon Sep 17 00:00:00 2001
From: Laurent Rineau <Laurent.Rineau__CGAL@normalesup.org>
Date: Tue, 23 Nov 2010 11:20:03 +0000
Subject: [PATCH] Replace CGAL_BEGIN_NAMESPACE and CGAL_END_NAMESPACE in
 Straight_skeleton_2 (that had been reverted a few months ago, after the
 massive changes of all CGAL_BEGIN_NAMESPACE in the CGAL repository).

---
 Straight_skeleton_2/include/CGAL/IO/Dxf_stream.h              | 4 ++--
 Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h              | 4 ++--
 Straight_skeleton_2/include/CGAL/Polygon_offset_builder_2.h   | 4 ++--
 .../include/CGAL/Polygon_offset_builder_traits_2.h            | 4 ++--
 Straight_skeleton_2/include/CGAL/Straight_skeleton_2.h        | 4 ++--
 .../CGAL/Straight_skeleton_2/Polygon_offset_builder_2_impl.h  | 4 ++--
 .../include/CGAL/Straight_skeleton_2/Straight_skeleton_aux.h  | 2 +-
 .../Straight_skeleton_2/Straight_skeleton_builder_2_impl.h    | 4 ++--
 .../Straight_skeleton_2/Straight_skeleton_builder_events_2.h  | 4 ++--
 .../Straight_skeleton_builder_traits_2_aux.h                  | 4 ++--
 .../include/CGAL/Straight_skeleton_2/assertions.h             | 4 ++--
 Straight_skeleton_2/include/CGAL/Straight_skeleton_2/debug.h  | 4 ++--
 Straight_skeleton_2/include/CGAL/Straight_skeleton_2/test.h   | 4 ++--
 .../include/CGAL/Straight_skeleton_builder_2.h                | 4 ++--
 .../include/CGAL/Straight_skeleton_builder_traits_2.h         | 4 ++--
 .../include/CGAL/Straight_skeleton_converter_2.h              | 4 ++--
 .../include/CGAL/Straight_skeleton_face_base_2.h              | 4 ++--
 .../include/CGAL/Straight_skeleton_halfedge_base_2.h          | 4 ++--
 Straight_skeleton_2/include/CGAL/Straight_skeleton_items_2.h  | 4 ++--
 .../include/CGAL/Straight_skeleton_vertex_base_2.h            | 4 ++--
 .../include/CGAL/Unfiltered_predicate_adaptor.h               | 4 ++--
 Straight_skeleton_2/include/CGAL/arrange_offset_polygons_2.h  | 4 ++--
 .../include/CGAL/certified_numeric_predicates.h               | 4 ++--
 .../include/CGAL/certified_quotient_predicates.h              | 4 ++--
 Straight_skeleton_2/include/CGAL/compute_outer_frame_margin.h | 4 ++--
 .../include/CGAL/constructions/Polygon_offset_cons_ftC2.h     | 4 ++--
 .../include/CGAL/constructions/Straight_skeleton_cons_ftC2.h  | 4 ++--
 Straight_skeleton_2/include/CGAL/create_offset_polygons_2.h   | 4 ++--
 .../CGAL/create_offset_polygons_from_polygon_with_holes_2.h   | 4 ++--
 Straight_skeleton_2/include/CGAL/create_straight_skeleton_2.h | 4 ++--
 .../CGAL/create_straight_skeleton_from_polygon_with_holes_2.h | 4 ++--
 .../include/CGAL/predicates/Polygon_offset_pred_ftC2.h        | 4 ++--
 .../include/CGAL/predicates/Straight_skeleton_pred_ftC2.h     | 4 ++--
 33 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/Straight_skeleton_2/include/CGAL/IO/Dxf_stream.h b/Straight_skeleton_2/include/CGAL/IO/Dxf_stream.h
index d091a73cdc9..85ec796b74f 100644
--- a/Straight_skeleton_2/include/CGAL/IO/Dxf_stream.h
+++ b/Straight_skeleton_2/include/CGAL/IO/Dxf_stream.h
@@ -32,7 +32,7 @@
 #include <fstream>
 #include <stdio.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 class Dxf_layer
 {
@@ -317,6 +317,6 @@ protected:
   
 };
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #endif
diff --git a/Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h b/Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h
index e0278da4b4c..0a12144248e 100644
--- a/Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h
+++ b/Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h
@@ -30,7 +30,7 @@
 #include <string>
 #include <list>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 class Dxf_writer
 {
@@ -278,6 +278,6 @@ private:
 
 } ;
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #endif // CGAL_IO_DXF_WRITER_H
diff --git a/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_2.h b/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_2.h
index fbe230a1db1..3a79d660f85 100644
--- a/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_2.h
+++ b/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_2.h
@@ -28,7 +28,7 @@
 
 #include <CGAL/Polygon_offset_builder_traits_2.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 template<class Traits_, class SSkel_>
 struct Default_polygon_offset_builder_2_visitor
@@ -246,7 +246,7 @@ private:
   CGAL_POLYOFFSET_DEBUG_CODE( int mStepID ; )
 };
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #include <CGAL/Straight_skeleton_2/Polygon_offset_builder_2_impl.h>
 
diff --git a/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_traits_2.h b/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_traits_2.h
index 1ec4182aabd..a62a56e4552 100644
--- a/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_traits_2.h
+++ b/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_traits_2.h
@@ -24,7 +24,7 @@
 #include <CGAL/constructions/Polygon_offset_cons_ftC2.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 namespace CGAL_SS_i {
 
@@ -278,7 +278,7 @@ class Polygon_offset_builder_traits_2
 CGAL_STRAIGHT_SKELETON_CREATE_FUNCTOR_ADAPTER(Compare_offset_against_event_time_2);
 CGAL_STRAIGHT_SKELETON_CREATE_FUNCTOR_ADAPTER(Construct_offset_point_2);
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 
 #endif // CGAL_POLYGON_OFFSET_BUILDER_TRAITS_2_H //
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2.h
index d7584823c2a..6170d409a6e 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2.h
@@ -22,7 +22,7 @@
 #include <CGAL/Straight_skeleton_items_2.h>
 #include <CGAL/HalfedgeDS_default.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 template<  class Traits_
          , class Items_ = Straight_skeleton_items_2
@@ -362,7 +362,7 @@ public :
 };
 
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 
 #endif // CGAL_STRAIGHT_SKELETON_2_H //
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Polygon_offset_builder_2_impl.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Polygon_offset_builder_2_impl.h
index fc64acdeefb..3be95eae76f 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Polygon_offset_builder_2_impl.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Polygon_offset_builder_2_impl.h
@@ -18,7 +18,7 @@
 #ifndef CGAL_POLYGON_OFFSET_BUILDER_2_IMPL_H
 #define CGAL_POLYGON_OFFSET_BUILDER_2_IMPL_H 1
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 
 template<class Ss, class Gt, class Cont, class Visitor>
@@ -410,7 +410,7 @@ Polygon_offset_builder_2<Ss,Gt,Cont,Visitor>::GetSeedVertex ( Vertex_const_handl
   return rSeed ;
 }
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #endif // CGAL_POLYGON_OFFSET_BUILDER_2_IMPL_H //
 // EOF //
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_aux.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_aux.h
index 4459559be35..f33c3b3f756 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_aux.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_aux.h
@@ -31,7 +31,7 @@
 //
 // The heap objects used in this implementation are intrusively reference counted. Thus, they inherit from Ref_counted_base.
 //
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 namespace CGAL_SS_i
 {
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_2_impl.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_2_impl.h
index 6b41e9aaec7..355cdba9c1b 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_2_impl.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_2_impl.h
@@ -30,7 +30,7 @@
 #  pragma warning(disable:4355) // complaint about using 'this' to
 #endif                          // initialize a member
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 
 template<class Gt, class Ss, class V>
@@ -1806,7 +1806,7 @@ typename Straight_skeleton_builder_2<Gt,Ss,V>::SSkelPtr Straight_skeleton_builde
   return mSSkel ;
 }
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #if defined(BOOST_MSVC)
 #  pragma warning(pop)
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_events_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_events_2.h
index d886c00eb30..dcb0ace405f 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_events_2.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_events_2.h
@@ -22,7 +22,7 @@
 
 #include <CGAL/Straight_skeleton_2/Straight_skeleton_aux.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 namespace CGAL_SS_i
 {
@@ -253,7 +253,7 @@ private :
 
 }
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #endif // CGAL_STRAIGHT_SKELETON_BUILDER_EVENTS_2_H //
 // EOF //
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_traits_2_aux.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_traits_2_aux.h
index 31a505b7e5b..2930b44ae9a 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_traits_2_aux.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_traits_2_aux.h
@@ -38,7 +38,7 @@
 #  include <CGAL/CORE_BigFloat.h>  
 #endif
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 namespace CGAL_SS_i {
 
@@ -545,7 +545,7 @@ struct SS_converter : Converter
         }
 
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 
 #endif // CGAL_STRAIGHT_SKELETON_BUILDER_TRAITS_2_AUX_H //
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/assertions.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/assertions.h
index ec8f9db5d55..7aab5d31054 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/assertions.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/assertions.h
@@ -32,7 +32,7 @@
 #endif 
 
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 namespace {
 
@@ -44,7 +44,7 @@ template<class Handle> inline bool handle_assigned ( Handle const& aH )
 
 }
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #endif // CGAL_STRAIGHT_SKELETON_ASSERTIONS_H //
 // EOF //
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/debug.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/debug.h
index 71f35770682..89a0c92b563 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/debug.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/debug.h
@@ -293,7 +293,7 @@ bool sEnableTraitsTrace = false ;
 #  include<iostream>
 #  include<sstream>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 namespace CGAL_STRAIGHT_SKELETON_i_profiling
 {
@@ -307,7 +307,7 @@ template<> char const* kernel_type<CORE::Expr>          () { return "Expr" ;
 
 } // CGAL_STRAIGHT_SKELETON_i_profiling
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #define CGAL_STSKEL_ASSERT_PREDICATE_RESULT(expr,K,pred,error) \
         { \
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/test.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/test.h
index 9b77c7cd825..1b05d8092ec 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/test.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/test.h
@@ -42,7 +42,7 @@
 #  define CGAL_stskel_intrinsic_test_trace_if(EX,m)
 #endif
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 namespace CGAL_SS_i {
 
@@ -165,7 +165,7 @@ inline bool is_time_clearly_within_possibly_inexact_bisector_time_interval( FT c
 
 } // namespace CGAL_SS_i
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #endif // CGAL_STRAIGHT_SKELETON_TEST_H //
 // EOF //
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h
index 9207e2295ba..ee3efdb9dfe 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h
@@ -38,7 +38,7 @@
 #include <CGAL/HalfedgeDS_const_decorator.h>
 #include <CGAL/enum.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 template<class SSkel_>
 struct Dummy_straight_skeleton_builder_2_visitor
@@ -925,7 +925,7 @@ public:
 
 } ;
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #include <CGAL/Straight_skeleton_2/Straight_skeleton_builder_2_impl.h>
 
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_traits_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_traits_2.h
index 8578ef49671..6301e2a331a 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_traits_2.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_traits_2.h
@@ -25,7 +25,7 @@
 #include <CGAL/constructions/Straight_skeleton_cons_ftC2.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 namespace CGAL_SS_i {
 
@@ -533,7 +533,7 @@ CGAL_STRAIGHT_SKELETON_CREATE_FUNCTOR_ADAPTER(Are_ss_edges_collinear_2)
 CGAL_STRAIGHT_SKELETON_CREATE_FUNCTOR_ADAPTER(Construct_ss_event_time_and_point_2)
 CGAL_STRAIGHT_SKELETON_CREATE_FUNCTOR_ADAPTER(Construct_ss_trisegment_2)
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #endif // CGAL_STRAIGHT_SKELETON_BUILDER_TRAITS_2_H //
 // EOF //
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_converter_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_converter_2.h
index 4768cf6f252..52baca3d5f2 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_converter_2.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_converter_2.h
@@ -22,7 +22,7 @@
 
 #include <CGAL/Straight_skeleton_2.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 template<class Source_skeleton_
         ,class Target_skeleton_
@@ -293,7 +293,7 @@ convert_straight_skeleton_2 ( Source_skeleton const& aSrc )
     
 }
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 
 #endif // CGAL_STRAIGHT_SKELETON_2_CONVERTER_H //
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_face_base_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_face_base_2.h
index 735683d6c12..8e187ea961b 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_face_base_2.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_face_base_2.h
@@ -19,7 +19,7 @@
 #define CGAL_STRAIGHT_SKELETON_FACE_BASE_2_H 1
 
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 template <class Refs>
 class Straight_skeleton_face_base_base_2
@@ -83,7 +83,7 @@ private:
 
 } ;
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #endif // CGAL_STRAIGHT_SKELETON_FACE_BASE_2_H //
 // EOF //
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_halfedge_base_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_halfedge_base_2.h
index e815a21b70d..b70dc47295d 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_halfedge_base_2.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_halfedge_base_2.h
@@ -19,7 +19,7 @@
 #define CGAL_STRAIGHT_SKELETON_HALFEDGE_BASE_2_H 1
 
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 template < class Refs, class S >
 class Straight_skeleton_halfedge_base_base_2
@@ -139,7 +139,7 @@ private:
 
 } ;
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #endif // CGAL_STRAIGHT_SKELETON_HALFEDGE_BASE_2_H //
 // EOF //
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_items_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_items_2.h
index 37a33682c34..a9ee4050f57 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_items_2.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_items_2.h
@@ -22,7 +22,7 @@
 #include <CGAL/Straight_skeleton_halfedge_base_2.h>
 #include <CGAL/Straight_skeleton_face_base_2.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 class Straight_skeleton_items_2
 {
@@ -50,7 +50,7 @@ public:
   } ;
 };
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #endif // CGAL_STRAIGHT_SKELETON_ITEMS_2_H //
 // EOF //
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_vertex_base_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_vertex_base_2.h
index 07400f11101..fbafb1d7d1a 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_vertex_base_2.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_vertex_base_2.h
@@ -23,7 +23,7 @@
 
 #include <boost/iterator/iterator_facade.hpp>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 template < class Refs, class P, class N >
 class Straight_skeleton_vertex_base_base_2
@@ -294,7 +294,7 @@ private:
   
 } ;
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #endif // CGAL_STRAIGHT_SKELETON_VERTEX_BASE_2_H //
 // EOF //
diff --git a/Straight_skeleton_2/include/CGAL/Unfiltered_predicate_adaptor.h b/Straight_skeleton_2/include/CGAL/Unfiltered_predicate_adaptor.h
index aa6bfa880a8..5f40cc167b7 100644
--- a/Straight_skeleton_2/include/CGAL/Unfiltered_predicate_adaptor.h
+++ b/Straight_skeleton_2/include/CGAL/Unfiltered_predicate_adaptor.h
@@ -22,7 +22,7 @@
 
 #include <CGAL/basic.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 template <class CAP>
 class Unfiltered_predicate_adaptor
@@ -249,6 +249,6 @@ Unfiltered_predicate_adaptor<CAP>::
 }
 #endif
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #endif // CGAL_UNFILTERED_PREDICATE_ADAPTOR_H
diff --git a/Straight_skeleton_2/include/CGAL/arrange_offset_polygons_2.h b/Straight_skeleton_2/include/CGAL/arrange_offset_polygons_2.h
index 6757afb6d4a..f77ccb2c802 100644
--- a/Straight_skeleton_2/include/CGAL/arrange_offset_polygons_2.h
+++ b/Straight_skeleton_2/include/CGAL/arrange_offset_polygons_2.h
@@ -22,7 +22,7 @@
 #include <boost/shared_ptr.hpp>
 #include <CGAL/Polygon_with_holes_2.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 //
 // This should only be used to arrange the polygons coming from Polygon_offset_builder
@@ -109,7 +109,7 @@ arrange_offset_polygons_2 ( std::vector< boost::shared_ptr< Polygon_2<K> > > con
   return rResult ;
 }
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 
 #endif 
diff --git a/Straight_skeleton_2/include/CGAL/certified_numeric_predicates.h b/Straight_skeleton_2/include/CGAL/certified_numeric_predicates.h
index 466a4958f84..127e0d2406c 100644
--- a/Straight_skeleton_2/include/CGAL/certified_numeric_predicates.h
+++ b/Straight_skeleton_2/include/CGAL/certified_numeric_predicates.h
@@ -23,7 +23,7 @@
 #include <CGAL/Interval_arithmetic.h>
 #include <CGAL/Uncertain.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 inline Uncertain<bool> logical_or ( Uncertain<bool> a, Uncertain<bool> b ) { return a | b ; }
 inline Uncertain<bool> logical_and( Uncertain<bool> a, Uncertain<bool> b ) { return a & b ; }
@@ -139,7 +139,7 @@ inline Uncertain<Sign> certified_sign_of_determinant2x2( const NT& a00
   return certified_compare(a00*a11, a10*a01) ;
 }
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #endif // CGAL_CERTIFIED_NUMERIC_PREDICATES_H
 
diff --git a/Straight_skeleton_2/include/CGAL/certified_quotient_predicates.h b/Straight_skeleton_2/include/CGAL/certified_quotient_predicates.h
index ae81aa7f6ae..e9a8d5a5a0d 100644
--- a/Straight_skeleton_2/include/CGAL/certified_quotient_predicates.h
+++ b/Straight_skeleton_2/include/CGAL/certified_quotient_predicates.h
@@ -22,7 +22,7 @@
 #include <CGAL/certified_numeric_predicates.h>
 #include <CGAL/Quotient.h>
 
-CGAL_BEGIN_NAMESPACE 
+namespace CGAL { 
 
 template <class NT>
 inline Uncertain<bool> certified_quotient_is_positive(const Quotient<NT>& x) 
@@ -129,7 +129,7 @@ inline Uncertain<Comparison_result> certified_compare(const Quotient<NT1>& n1, c
   return certified_quotient_compare(n1,n2);
 }
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #endif // CGAL_CERTIFIED_QUOTIENT_PREDICATES_H
 
diff --git a/Straight_skeleton_2/include/CGAL/compute_outer_frame_margin.h b/Straight_skeleton_2/include/CGAL/compute_outer_frame_margin.h
index 25cbfa0786a..68a86bb9c5e 100644
--- a/Straight_skeleton_2/include/CGAL/compute_outer_frame_margin.h
+++ b/Straight_skeleton_2/include/CGAL/compute_outer_frame_margin.h
@@ -27,7 +27,7 @@
 #include <CGAL/algorithm.h>
 #include <CGAL/Polygon_offset_builder_traits_2.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 template<class ForwardPointIterator, class Traits>
 boost::optional< typename Traits::FT > compute_outer_frame_margin ( ForwardPointIterator aBegin
@@ -113,7 +113,7 @@ boost::optional<FT> compute_outer_frame_margin ( ForwardPointIterator aBegin, Fo
   return compute_outer_frame_margin(aBegin,aEnd,aOffset,traits);
 }                                                                 
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #endif // CGAL_COMPUTE_OUTER_FRAME_MARGIN_H //
 // EOF //
diff --git a/Straight_skeleton_2/include/CGAL/constructions/Polygon_offset_cons_ftC2.h b/Straight_skeleton_2/include/CGAL/constructions/Polygon_offset_cons_ftC2.h
index 8a73970689c..cfd39ae3101 100644
--- a/Straight_skeleton_2/include/CGAL/constructions/Polygon_offset_cons_ftC2.h
+++ b/Straight_skeleton_2/include/CGAL/constructions/Polygon_offset_cons_ftC2.h
@@ -20,7 +20,7 @@
 
 #include <CGAL/constructions/Straight_skeleton_cons_ftC2.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 namespace CGAL_SS_i
 {
@@ -105,7 +105,7 @@ optional< Point_2<K> > construct_offset_pointC2 ( typename K::FT const&
 
 } // namespace CGAL_SS_i
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #endif // CGAL_POLYGON_OFFSET_CONS_FTC2_H //
 // EOF //
diff --git a/Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h b/Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h
index af48d4f451e..9087fe3e4e0 100644
--- a/Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h
+++ b/Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h
@@ -20,7 +20,7 @@
 
 #include <CGAL/predicates/Straight_skeleton_pred_ftC2.h>
 
-CGAL_BEGIN_NAMESPACE 
+namespace CGAL { 
 
 namespace CGAL_SS_i
 {
@@ -673,7 +673,7 @@ optional< Point_2<K> > construct_offset_lines_isecC2 ( intrusive_ptr< Trisegment
 
 } // namnepsace CGAIL_SS_i
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #endif // CGAL_STRAIGHT_SKELETON_CONS_FTC2_H //
 // EOF //
diff --git a/Straight_skeleton_2/include/CGAL/create_offset_polygons_2.h b/Straight_skeleton_2/include/CGAL/create_offset_polygons_2.h
index f0acccb05c2..a2708850e8b 100644
--- a/Straight_skeleton_2/include/CGAL/create_offset_polygons_2.h
+++ b/Straight_skeleton_2/include/CGAL/create_offset_polygons_2.h
@@ -25,7 +25,7 @@
 #include <CGAL/compute_outer_frame_margin.h>
 #include <CGAL/Polygon_2.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 namespace CGAL_SS_i
 {
@@ -344,7 +344,7 @@ create_exterior_skeleton_and_offset_polygons_2 ( FT const& aOffset, Polygon cons
                                                
 }
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 
 #endif
diff --git a/Straight_skeleton_2/include/CGAL/create_offset_polygons_from_polygon_with_holes_2.h b/Straight_skeleton_2/include/CGAL/create_offset_polygons_from_polygon_with_holes_2.h
index d53263d00da..123303defa9 100644
--- a/Straight_skeleton_2/include/CGAL/create_offset_polygons_from_polygon_with_holes_2.h
+++ b/Straight_skeleton_2/include/CGAL/create_offset_polygons_from_polygon_with_holes_2.h
@@ -23,7 +23,7 @@
 #include <CGAL/Polygon_with_holes_2.h>
 #include <CGAL/arrange_offset_polygons_2.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 template<class FT, class OfK, class SsK>
 std::vector< boost::shared_ptr< Polygon_2<OfK> > >
@@ -97,7 +97,7 @@ create_exterior_skeleton_and_offset_polygons_with_holes_2 ( FT const&
 
 
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 
 #endif 
diff --git a/Straight_skeleton_2/include/CGAL/create_straight_skeleton_2.h b/Straight_skeleton_2/include/CGAL/create_straight_skeleton_2.h
index 5f222d87824..cba1448981a 100644
--- a/Straight_skeleton_2/include/CGAL/create_straight_skeleton_2.h
+++ b/Straight_skeleton_2/include/CGAL/create_straight_skeleton_2.h
@@ -23,7 +23,7 @@
 #include <CGAL/compute_outer_frame_margin.h>
 #include <CGAL/Polygon_2.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 namespace CGAL_SS_i
 {
@@ -238,7 +238,7 @@ create_exterior_straight_skeleton_2 ( FT const& aMaxOffset, Polygon const& aPoly
                                             );
 }
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 
 #endif // CGAL_STRAIGHT_SKELETON_BUILDER_2_H //
diff --git a/Straight_skeleton_2/include/CGAL/create_straight_skeleton_from_polygon_with_holes_2.h b/Straight_skeleton_2/include/CGAL/create_straight_skeleton_from_polygon_with_holes_2.h
index c5c5bb31bfe..ecbda20a4b9 100644
--- a/Straight_skeleton_2/include/CGAL/create_straight_skeleton_from_polygon_with_holes_2.h
+++ b/Straight_skeleton_2/include/CGAL/create_straight_skeleton_from_polygon_with_holes_2.h
@@ -22,7 +22,7 @@
 #include <CGAL/create_straight_skeleton_2.h>
 #include <CGAL/Polygon_with_holes_2.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 template<class K>
 boost::shared_ptr< Straight_skeleton_2<K> >
@@ -37,7 +37,7 @@ create_interior_straight_skeleton_2 ( Polygon_with_holes_2<K> const& aPolyWithHo
                                             );
 }
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 
 #endif // CGAL_STRAIGHT_SKELETON_BUILDER_2_H //
diff --git a/Straight_skeleton_2/include/CGAL/predicates/Polygon_offset_pred_ftC2.h b/Straight_skeleton_2/include/CGAL/predicates/Polygon_offset_pred_ftC2.h
index b7d14e05471..58cdb304093 100644
--- a/Straight_skeleton_2/include/CGAL/predicates/Polygon_offset_pred_ftC2.h
+++ b/Straight_skeleton_2/include/CGAL/predicates/Polygon_offset_pred_ftC2.h
@@ -20,7 +20,7 @@
 
 #include <CGAL/constructions/Straight_skeleton_cons_ftC2.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 namespace CGAL_SS_i
 {
@@ -57,7 +57,7 @@ Uncertain<Comparison_result> compare_offset_against_isec_timeC2 ( typename K::FT
 
 } // namespace CGAL_SS_i
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #endif // CGAL_POLYGON_OFFSET_PRED_FTC2_H //
 // EOF //
diff --git a/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h b/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h
index c194e595203..5f2e6f65d61 100644
--- a/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h
+++ b/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h
@@ -22,7 +22,7 @@
 #include <CGAL/Uncertain.h>
 #include <CGAL/certified_quotient_predicates.h>
 
-CGAL_BEGIN_NAMESPACE
+namespace CGAL {
 
 namespace CGAL_SS_i
 {
@@ -523,6 +523,6 @@ Uncertain<bool> are_events_simultaneousC2 ( intrusive_ptr< Trisegment_2<K> > con
 
 } // namespace CGAL_SS_i
 
-CGAL_END_NAMESPACE
+} // end namespace CGAL
 
 #endif // CGAL_STRAIGHT_SKELETON_PREDICATES_FTC2_H //