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).
This commit is contained in:
Laurent Rineau 2010-11-23 11:20:03 +00:00
parent 1caaf5665c
commit 7fea74cad6
33 changed files with 65 additions and 65 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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) \
{ \

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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