diff --git a/Algebraic_foundations/examples/Algebraic_foundations/fraction_traits.cpp b/Algebraic_foundations/examples/Algebraic_foundations/fraction_traits.cpp index a05c03cee23..3958bc2c7b2 100644 --- a/Algebraic_foundations/examples/Algebraic_foundations/fraction_traits.cpp +++ b/Algebraic_foundations/examples/Algebraic_foundations/fraction_traits.cpp @@ -10,8 +10,8 @@ int main(){ typedef FT::Numerator_type Numerator_type; typedef FT::Denominator_type Denominator_type; - BOOST_STATIC_ASSERT((boost::is_same::value)); - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); Numerator_type numerator; Denominator_type denominator; diff --git a/Algebraic_foundations/examples/Algebraic_foundations/interoperable.cpp b/Algebraic_foundations/examples/Algebraic_foundations/interoperable.cpp index bec92a98776..5967bbf089d 100644 --- a/Algebraic_foundations/examples/Algebraic_foundations/interoperable.cpp +++ b/Algebraic_foundations/examples/Algebraic_foundations/interoperable.cpp @@ -10,7 +10,7 @@ binary_func(const A& a , const B& b){ typedef CGAL::Coercion_traits CT; // check for explicit interoperability - BOOST_STATIC_ASSERT((CT::Are_explicit_interoperable::value)); + CGAL_static_assertion((CT::Are_explicit_interoperable::value)); // CT::Cast is used to to convert both types into the coercion type typename CT::Cast cast; diff --git a/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h b/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h index 875bfc63004..804aeefb0a9 100644 --- a/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h +++ b/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h @@ -355,7 +355,7 @@ class Algebraic_structure_traits_base< Type_, Type& r ) const { typedef Coercion_traits< NT1, NT2 > CT; typedef typename CT::Type Type; - BOOST_STATIC_ASSERT(( + CGAL_static_assertion(( ::boost::is_same::value)); typename Coercion_traits< NT1, NT2 >::Cast cast; diff --git a/Algebraic_foundations/include/CGAL/Coercion_traits.h b/Algebraic_foundations/include/CGAL/Coercion_traits.h index e7b17217a65..6a8ee091f53 100644 --- a/Algebraic_foundations/include/CGAL/Coercion_traits.h +++ b/Algebraic_foundations/include/CGAL/Coercion_traits.h @@ -43,7 +43,7 @@ #define CGAL_IMPLICIT_INTEROPERABLE_BINARY_OPERATOR_WITH_RT( NT, Result_type ) \ template < class CT_Type_1, class CT_Type_2 > \ Result_type operator()( const CT_Type_1& x, const CT_Type_2& y ) const { \ - BOOST_STATIC_ASSERT((::boost::is_same< \ + CGAL_static_assertion((::boost::is_same< \ typename Coercion_traits< CT_Type_1, CT_Type_2 >::Type, NT \ >::value)); \ \ diff --git a/Algebraic_foundations/include/CGAL/Scalar_factor_traits.h b/Algebraic_foundations/include/CGAL/Scalar_factor_traits.h index 105dc498953..f59315ccb4d 100644 --- a/Algebraic_foundations/include/CGAL/Scalar_factor_traits.h +++ b/Algebraic_foundations/include/CGAL/Scalar_factor_traits.h @@ -92,13 +92,13 @@ public: // determine extractable scalar factor Scalar operator () (const NT& a) { - BOOST_STATIC_ASSERT(( ::boost::is_same< NT,Scalar >::value)); + CGAL_static_assertion(( ::boost::is_same< NT,Scalar >::value)); typedef typename Algebraic_structure_traits::Algebraic_category SAT; return scalar_factor(a, SAT()); } // determine extractable scalar factor Scalar operator () (const NT& a, const Scalar& d) { - BOOST_STATIC_ASSERT(( ::boost::is_same< NT,Scalar >::value)); + CGAL_static_assertion(( ::boost::is_same< NT,Scalar >::value)); typedef typename Algebraic_structure_traits::Algebraic_category SAT; return scalar_factor(a,d,SAT()); } diff --git a/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h b/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h index 3ac283bdd34..69de72f17d8 100644 --- a/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h +++ b/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h @@ -31,7 +31,7 @@ #include //#include -#include +#include #include #include #include @@ -48,7 +48,7 @@ template void check_result_type(AdaptableFunctor, ResultType){ typedef typename AdaptableFunctor::result_type result_type; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); } // check nothing for CGAL::Null_functor template @@ -110,12 +110,12 @@ void test_algebraic_structure_intern( const CGAL::Integral_domain_tag& ) { CGAL_SNAP_AST_FUNCTORS(AST); using CGAL::Null_functor; - BOOST_STATIC_ASSERT( + CGAL_static_assertion( (!::boost::is_same< Integral_division, Null_functor >::value)); - BOOST_STATIC_ASSERT((!::boost::is_same< Divides, Null_functor >::value)); - BOOST_STATIC_ASSERT((!::boost::is_same< Is_zero, Null_functor >::value)); - BOOST_STATIC_ASSERT((!::boost::is_same< Is_one, Null_functor >::value)); - BOOST_STATIC_ASSERT((!::boost::is_same< Square, Null_functor >::value)); + CGAL_static_assertion((!::boost::is_same< Divides, Null_functor >::value)); + CGAL_static_assertion((!::boost::is_same< Is_zero, Null_functor >::value)); + CGAL_static_assertion((!::boost::is_same< Is_one, Null_functor >::value)); + CGAL_static_assertion((!::boost::is_same< Square, Null_functor >::value)); // functor const Is_zero is_zero = Is_zero(); @@ -194,7 +194,7 @@ void test_algebraic_structure_intern( CGAL_SNAP_AST_FUNCTORS(AST); using CGAL::Null_functor; - BOOST_STATIC_ASSERT((!::boost::is_same< Gcd, Null_functor>::value)); + CGAL_static_assertion((!::boost::is_same< Gcd, Null_functor>::value)); const Gcd gcd = Gcd(); assert( gcd( AS ( 0), AS ( 0)) == unit_normal( AS (0) ) ); @@ -256,9 +256,9 @@ void test_algebraic_structure_intern( const CGAL::Euclidean_ring_tag&) { CGAL_SNAP_AST_FUNCTORS(AST); using CGAL::Null_functor; - BOOST_STATIC_ASSERT((!::boost::is_same< Div, Null_functor>::value)); - BOOST_STATIC_ASSERT((!::boost::is_same< Mod, Null_functor>::value)); - BOOST_STATIC_ASSERT((!::boost::is_same< Div_mod, Null_functor>::value)); + CGAL_static_assertion((!::boost::is_same< Div, Null_functor>::value)); + CGAL_static_assertion((!::boost::is_same< Mod, Null_functor>::value)); + CGAL_static_assertion((!::boost::is_same< Div_mod, Null_functor>::value)); const Div div=Div(); const Mod mod=Mod(); @@ -374,7 +374,7 @@ void test_algebraic_structure_intern( const CGAL::Field_with_sqrt_tag& ) { CGAL_SNAP_AST_FUNCTORS(AST); - BOOST_STATIC_ASSERT((!::boost::is_same< Sqrt, Null_functor>::value)); + CGAL_static_assertion((!::boost::is_same< Sqrt, Null_functor>::value)); const Sqrt sqrt =Sqrt(); AS a(4); @@ -597,11 +597,11 @@ class Test_is_square { typedef typename Is_square::first_argument_type First_argument_type; typedef typename Is_square::second_argument_type Second_argument_type; typedef typename Is_square::result_type Result_type; - BOOST_STATIC_ASSERT( + CGAL_static_assertion( ( ::boost::is_same< AS , First_argument_type>::value)); - BOOST_STATIC_ASSERT( + CGAL_static_assertion( ( ::boost::is_same< AS& , Second_argument_type>::value)); - //BOOST_STATIC_ASSERT(( ::boost::is_same< bool , Result_type>::value)); + //CGAL_static_assertion(( ::boost::is_same< bool , Result_type>::value)); bool b = Result_type(true); CGAL_USE(b); AS test_number = AS(3)*AS(3); @@ -630,8 +630,8 @@ public: void operator() (const Sqrt& sqrt) { typedef typename Sqrt::argument_type Argument_type; typedef typename Sqrt::result_type Result_type; - BOOST_STATIC_ASSERT(( ::boost::is_same< AS , Argument_type>::value)); - BOOST_STATIC_ASSERT(( ::boost::is_same< AS , Result_type>::value)); + CGAL_static_assertion(( ::boost::is_same< AS , Argument_type>::value)); + CGAL_static_assertion(( ::boost::is_same< AS , Result_type>::value)); typedef Algebraic_structure_traits AST; typedef typename AST::Is_exact Is_exact; assert( !Is_exact::value || AS (3) == sqrt( AS (9))); @@ -653,11 +653,11 @@ public: typedef typename Root::first_argument_type First_argument_type; typedef typename Root::second_argument_type Second_argument_type; typedef typename Root::result_type Result_type; - BOOST_STATIC_ASSERT( + CGAL_static_assertion( ( ::boost::is_same::value)); - BOOST_STATIC_ASSERT( + CGAL_static_assertion( ( ::boost::is_same< AS , Second_argument_type>::value)); - BOOST_STATIC_ASSERT( + CGAL_static_assertion( ( ::boost::is_same< AS , Result_type>::value)); AS epsilon(1); assert( test_equality_epsilon( AS (2), @@ -781,7 +781,7 @@ void test_algebraic_structure(){ typedef CGAL::Algebraic_structure_traits< AS > AST; CGAL_SNAP_AST_FUNCTORS(AST); - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); typedef typename AST::Boolean Boolean; assert(!Boolean()); @@ -794,14 +794,14 @@ void test_algebraic_structure(){ using CGAL::Integral_domain_without_division_tag; using CGAL::Null_functor; // Test for desired exactness - BOOST_STATIC_ASSERT( + CGAL_static_assertion( ( ::boost::is_same< typename AST::Is_exact, Is_exact >::value)); - BOOST_STATIC_ASSERT(( ::boost::is_convertible< Tag, + CGAL_static_assertion(( ::boost::is_convertible< Tag, Integral_domain_without_division_tag >::value )); - BOOST_STATIC_ASSERT(( ::boost::is_same< Tag, Algebraic_category>::value)); - BOOST_STATIC_ASSERT((!::boost::is_same< Simplify, Null_functor>::value)); - BOOST_STATIC_ASSERT((!::boost::is_same< Unit_part, Null_functor>::value)); + CGAL_static_assertion(( ::boost::is_same< Tag, Algebraic_category>::value)); + CGAL_static_assertion((!::boost::is_same< Simplify, Null_functor>::value)); + CGAL_static_assertion((!::boost::is_same< Unit_part, Null_functor>::value)); const Simplify simplify=Simplify();; const Unit_part unit_part= Unit_part(); @@ -919,7 +919,7 @@ void test_algebraic_structure( const AS & a, const AS & b, const AS & c) { typedef CGAL::Algebraic_structure_traits AST; typedef typename AST::Is_numerical_sensitive Is_numerical_sensitive; - BOOST_STATIC_ASSERT( + CGAL_static_assertion( !(::boost::is_same::value)); } diff --git a/Algebraic_foundations/include/CGAL/Test/_test_coercion_traits.h b/Algebraic_foundations/include/CGAL/Test/_test_coercion_traits.h index a1d9e65719f..eb75d48dbc2 100644 --- a/Algebraic_foundations/include/CGAL/Test/_test_coercion_traits.h +++ b/Algebraic_foundations/include/CGAL/Test/_test_coercion_traits.h @@ -329,7 +329,7 @@ void test_implicit_interoperable_one_way() { typedef typename CT::Type C; typedef typename CT::Are_implicit_interoperable Are_implicit_interoperable; - BOOST_STATIC_ASSERT( + CGAL_static_assertion( (::boost::is_same::value)); assert((::boost::is_same::value)); @@ -349,9 +349,9 @@ void test_explicit_interoperable_one_way(){ typedef typename CT::Cast Cast; typedef typename Cast::result_type result_type; - BOOST_STATIC_ASSERT((::boost::is_same::value)); - BOOST_STATIC_ASSERT((::boost::is_same< typename CT::Are_explicit_interoperable,CGAL::Tag_true>::value)); - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same< typename CT::Are_explicit_interoperable,CGAL::Tag_true>::value)); + CGAL_static_assertion((::boost::is_same::value)); typename CT::Cast cast; A a(3); diff --git a/Algebraic_foundations/include/CGAL/Test/_test_fraction_traits.h b/Algebraic_foundations/include/CGAL/Test/_test_fraction_traits.h index 9e7e63d0025..22d11d8da5e 100644 --- a/Algebraic_foundations/include/CGAL/Test/_test_fraction_traits.h +++ b/Algebraic_foundations/include/CGAL/Test/_test_fraction_traits.h @@ -44,11 +44,11 @@ void test_fraction_traits(){ typedef typename FT::Decompose Decompose; typedef typename FT::Compose Compose; - BOOST_STATIC_ASSERT( (::boost::is_same::value)); - BOOST_STATIC_ASSERT( (::boost::is_same::value)); - BOOST_STATIC_ASSERT(!(::boost::is_same::value)); - BOOST_STATIC_ASSERT(!(::boost::is_same::value)); - BOOST_STATIC_ASSERT(!(::boost::is_same::value)); + CGAL_static_assertion( (::boost::is_same::value)); + CGAL_static_assertion( (::boost::is_same::value)); + CGAL_static_assertion(!(::boost::is_same::value)); + CGAL_static_assertion(!(::boost::is_same::value)); + CGAL_static_assertion(!(::boost::is_same::value)); // Decompose diff --git a/Algebraic_foundations/include/CGAL/Test/_test_rational_traits.h b/Algebraic_foundations/include/CGAL/Test/_test_rational_traits.h index c7451b9dd96..a02703146d0 100644 --- a/Algebraic_foundations/include/CGAL/Test/_test_rational_traits.h +++ b/Algebraic_foundations/include/CGAL/Test/_test_rational_traits.h @@ -38,7 +38,7 @@ void test_rational_traits(){ typedef Rational_traits Rational_traits; typedef typename Rational_traits::RT RT; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); assert( Rational_traits().numerator(x) == RT(7)); assert( Rational_traits().denominator(x) == RT(2)); diff --git a/Algebraic_foundations/include/CGAL/Test/_test_real_embeddable.h b/Algebraic_foundations/include/CGAL/Test/_test_real_embeddable.h index 4daa960d50a..6cc9a5854e0 100644 --- a/Algebraic_foundations/include/CGAL/Test/_test_real_embeddable.h +++ b/Algebraic_foundations/include/CGAL/Test/_test_real_embeddable.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include @@ -58,8 +58,8 @@ namespace CGAL { void operator() (const ToDouble& to_double) { typedef typename ToDouble::argument_type Argument_type; typedef typename ToDouble::result_type Result_type; - BOOST_STATIC_ASSERT(( ::boost::is_same::value)); - BOOST_STATIC_ASSERT(( ::boost::is_same::value)); + CGAL_static_assertion(( ::boost::is_same::value)); + CGAL_static_assertion(( ::boost::is_same::value)); assert(42.0 == to_double(Type(42))); } }; @@ -79,8 +79,8 @@ namespace CGAL { typedef typename To_interval::argument_type Argument_type; typedef typename To_interval::result_type Result_type; typedef std::pair Interval_type; - BOOST_STATIC_ASSERT(( ::boost::is_same::value)); - BOOST_STATIC_ASSERT(( ::boost::is_same::value)); + CGAL_static_assertion(( ::boost::is_same::value)); + CGAL_static_assertion(( ::boost::is_same::value)); // assert(NiX::in(42.0,to_Interval(Type(42)))); // Instead of 'NiX::in': @@ -145,7 +145,7 @@ void test_real_embeddable() { CGAL_SNAP_RET_FUNCTORS(RET); typedef typename RET::Is_real_embeddable Is_real_embeddable; using CGAL::Tag_true; - BOOST_STATIC_ASSERT(( ::boost::is_same< Is_real_embeddable, Tag_true>::value)); + CGAL_static_assertion(( ::boost::is_same< Is_real_embeddable, Tag_true>::value)); typedef typename RET::Boolean Boolean; typedef typename RET::Sign Sign; @@ -251,20 +251,20 @@ void test_not_real_embeddable() { typedef CGAL::Real_embeddable_traits RET; typedef typename RET::Is_real_embeddable Is_real_embeddable; using CGAL::Tag_false; - BOOST_STATIC_ASSERT(( ::boost::is_same< Is_real_embeddable, Tag_false>::value)); + CGAL_static_assertion(( ::boost::is_same< Is_real_embeddable, Tag_false>::value)); } //template //void test_rounded_log2_abs(Type zero, CGAL::Null_functor, CeilLog2Abs) { // typedef CGAL::Null_functor Null_functor; -// BOOST_STATIC_ASSERT(( ::boost::is_same< CeilLog2Abs, Null_functor>::value)); +// CGAL_static_assertion(( ::boost::is_same< CeilLog2Abs, Null_functor>::value)); //} // //template //void test_rounded_log2_abs(Type zero, FloorLog2Abs fl_log, CeilLog2Abs cl_log) { // typedef CGAL::Null_functor Null_functor; -// BOOST_STATIC_ASSERT((!::boost::is_same< CeilLog2Abs, Null_functor>::value)); +// CGAL_static_assertion((!::boost::is_same< CeilLog2Abs, Null_functor>::value)); // // assert( fl_log(Type( 7)) == 2 ); // assert( cl_log(Type( 7)) == 3 ); diff --git a/Algebraic_foundations/test/Algebraic_foundations/Algebraic_extension_traits.cpp b/Algebraic_foundations/test/Algebraic_foundations/Algebraic_extension_traits.cpp index 9ac4edc9d3e..ca89fa93700 100644 --- a/Algebraic_foundations/test/Algebraic_foundations/Algebraic_extension_traits.cpp +++ b/Algebraic_foundations/test/Algebraic_foundations/Algebraic_extension_traits.cpp @@ -8,27 +8,27 @@ int main(){ typedef CGAL::Algebraic_extension_traits AET; typedef AET::Type Type; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); typedef AET::Is_extended Is_extended; - BOOST_STATIC_ASSERT( + CGAL_static_assertion( (::boost::is_same::value)); typedef AET::Normalization_factor Normalization_factor; { typedef Normalization_factor::argument_type argument_type; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); typedef Normalization_factor::result_type result_type; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); Normalization_factor nfac; assert(nfac(3)==1); } typedef AET::Denominator_for_algebraic_integers DFAI; { typedef DFAI::argument_type argument_type; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); typedef DFAI::result_type result_type; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); DFAI dfai; assert(dfai(3)==1); } @@ -38,18 +38,18 @@ int main(){ typedef CGAL::Algebraic_extension_traits AET; typedef AET::Type Type; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); typedef AET::Is_extended Is_extended; - BOOST_STATIC_ASSERT( + CGAL_static_assertion( (::boost::is_same::value)); typedef AET::Normalization_factor Normalization_factor; { typedef Normalization_factor::argument_type argument_type; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); typedef Normalization_factor::result_type result_type; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); Normalization_factor nfac; assert(nfac(EXT(3))==1); assert(nfac(EXT(3,0,5))==1); @@ -58,9 +58,9 @@ int main(){ typedef AET::Denominator_for_algebraic_integers DFAI; { typedef DFAI::argument_type argument_type; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); typedef DFAI::result_type result_type; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); DFAI dfai; assert(dfai(EXT(3))==1); assert(dfai(EXT(3,0,5))==1); diff --git a/Algebraic_foundations/test/Algebraic_foundations/Algebraic_structure_traits.cpp b/Algebraic_foundations/test/Algebraic_foundations/Algebraic_structure_traits.cpp index 7c1f3f8cbae..6c3722c4f81 100644 --- a/Algebraic_foundations/test/Algebraic_foundations/Algebraic_structure_traits.cpp +++ b/Algebraic_foundations/test/Algebraic_foundations/Algebraic_structure_traits.cpp @@ -6,7 +6,7 @@ #define CGAL_IS_AST_NULL_FUNCTOR(NAME) \ { \ typedef AST::NAME NAME; \ - BOOST_STATIC_ASSERT( \ + CGAL_static_assertion( \ (::boost::is_same::value)); \ } @@ -14,16 +14,16 @@ int main(){ typedef CGAL::Algebraic_structure_traits AST; typedef AST::Type Type; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); typedef AST::Algebraic_category Algebraic_category; - BOOST_STATIC_ASSERT( + CGAL_static_assertion( (::boost::is_same::value)); typedef AST::Is_exact Is_exact; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); typedef AST::Is_numerical_sensitive Is_sensitive; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); CGAL_IS_AST_NULL_FUNCTOR ( Simplify); CGAL_IS_AST_NULL_FUNCTOR ( Unit_part); diff --git a/Algebraic_foundations/test/Algebraic_foundations/Coercion_traits.cpp b/Algebraic_foundations/test/Algebraic_foundations/Coercion_traits.cpp index fe1b943969a..cd462d85753 100644 --- a/Algebraic_foundations/test/Algebraic_foundations/Coercion_traits.cpp +++ b/Algebraic_foundations/test/Algebraic_foundations/Coercion_traits.cpp @@ -4,21 +4,21 @@ int main(){ { typedef CGAL::Coercion_traits CT; - BOOST_STATIC_ASSERT(( boost::is_same::value)); - BOOST_STATIC_ASSERT( + CGAL_static_assertion(( boost::is_same::value)); + CGAL_static_assertion( ( boost::is_same::value)); - BOOST_STATIC_ASSERT( + CGAL_static_assertion( ( boost::is_same::value)); assert( 5 == CT::Cast()(5)); } { typedef CGAL::Coercion_traits CT; -// BOOST_STATIC_ASSERT(( boost::is_same::value)); - BOOST_STATIC_ASSERT( +// CGAL_static_assertion(( boost::is_same::value)); + CGAL_static_assertion( ( boost::is_same::value)); - BOOST_STATIC_ASSERT( + CGAL_static_assertion( ( boost::is_same::value)); - BOOST_STATIC_ASSERT( + CGAL_static_assertion( ( boost::is_same::value)); } } diff --git a/Algebraic_foundations/test/Algebraic_foundations/Real_embeddable_traits.cpp b/Algebraic_foundations/test/Algebraic_foundations/Real_embeddable_traits.cpp index 30ef04c7de8..60edf2c2a8d 100644 --- a/Algebraic_foundations/test/Algebraic_foundations/Real_embeddable_traits.cpp +++ b/Algebraic_foundations/test/Algebraic_foundations/Real_embeddable_traits.cpp @@ -6,7 +6,7 @@ #define CGAL_IS_RET_NULL_FUNCTOR(NAME) \ { \ typedef RET::NAME NAME; \ - BOOST_STATIC_ASSERT( \ + CGAL_static_assertion( \ (::boost::is_same::value)); \ } @@ -14,10 +14,10 @@ int main(){ typedef CGAL::Real_embeddable_traits RET; typedef RET::Type Type; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); typedef RET::Is_real_embeddable Is_real_embeddable; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); CGAL_IS_RET_NULL_FUNCTOR(Abs); CGAL_IS_RET_NULL_FUNCTOR(Sgn); diff --git a/Algebraic_foundations/test/Algebraic_foundations/Scalar_factor_traits.cpp b/Algebraic_foundations/test/Algebraic_foundations/Scalar_factor_traits.cpp index c6bac8b1703..7a0f03fb503 100644 --- a/Algebraic_foundations/test/Algebraic_foundations/Scalar_factor_traits.cpp +++ b/Algebraic_foundations/test/Algebraic_foundations/Scalar_factor_traits.cpp @@ -6,27 +6,27 @@ int main(){ typedef CGAL::Scalar_factor_traits SFT; - BOOST_STATIC_ASSERT((::boost::is_same::value)); - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); typedef SFT::Scalar_factor Scalar_factor; { typedef Scalar_factor::result_type result_type; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); typedef Scalar_factor::argument_type argument_type; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); } typedef SFT::Scalar_div Scalar_div; { typedef Scalar_div::result_type result_type; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); typedef Scalar_div::first_argument_type first_argument_type; - BOOST_STATIC_ASSERT( + CGAL_static_assertion( (::boost::is_same::value)); typedef Scalar_div::second_argument_type second_argument_type; - BOOST_STATIC_ASSERT( + CGAL_static_assertion( (::boost::is_same::value)); } diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_curve_kernel_2.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_curve_kernel_2.h index b7dba1a05e4..a21eb739874 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_curve_kernel_2.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_curve_kernel_2.h @@ -33,7 +33,7 @@ #include -#include +#include #include #include @@ -562,16 +562,16 @@ public: Curve_analysis_2 _construct_defining_polynomial_from(Bound b) const { typedef CGAL::Fraction_traits FT; // We rely on the fact that the Bound is a fraction - BOOST_STATIC_ASSERT((::boost::is_same::value)); typedef typename FT::Numerator_type Numerator; typedef typename FT::Denominator_type Denominator; typedef CGAL::Coercion_traits Num_coercion; - BOOST_STATIC_ASSERT((::boost::is_same + CGAL_static_assertion((::boost::is_same ::value)); typedef CGAL::Coercion_traits Denom_coercion; - BOOST_STATIC_ASSERT((::boost::is_same + CGAL_static_assertion((::boost::is_same ::value)); typename Num_coercion::Cast num_cast; @@ -2649,16 +2649,16 @@ public: Polynomial_1 operator() (const Polynomial_2& f, Bound b) const { typedef CGAL::Fraction_traits FT; // We rely on the fact that the Bound is a fraction - BOOST_STATIC_ASSERT((::boost::is_same::value)); typedef typename FT::Numerator_type Numerator; typedef typename FT::Denominator_type Denominator; typedef CGAL::Coercion_traits Num_coercion; - BOOST_STATIC_ASSERT((::boost::is_same + CGAL_static_assertion((::boost::is_same ::value)); typedef CGAL::Coercion_traits Denom_coercion; - BOOST_STATIC_ASSERT((::boost::is_same + CGAL_static_assertion((::boost::is_same ::value)); typename Num_coercion::Cast num_cast; diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_d_1.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_d_1.h index f466c7c9f0b..dd9acd7a37b 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_d_1.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_d_1.h @@ -78,7 +78,7 @@ class Algebraic_real_d_1 : public ::CGAL::Handle_with_policy< AlgebraicRealRep_d_1, HandlePolicy > { // currently Rational is the only supported Bound type. - BOOST_STATIC_ASSERT( + CGAL_static_assertion( ( ::boost::is_same ::Arithmetic_kernel::Rational>::value)); diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/algebraic_curve_kernel_2_tools.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/algebraic_curve_kernel_2_tools.h index 48a5d74f8e2..45988ddb0bd 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/algebraic_curve_kernel_2_tools.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/algebraic_curve_kernel_2_tools.h @@ -195,7 +195,7 @@ template::value_type >::value)); @@ -237,12 +237,12 @@ template typedef typename CGAL::Polynomial_traits_d::Coefficient_type Coefficient; typedef CGAL::Fraction_traits FT; - BOOST_STATIC_ASSERT((::boost::is_same::value)); typedef typename FT::Numerator_type Numerator; typedef typename FT::Denominator_type Denominator; typedef CGAL::Coercion_traits Num_coercion; - BOOST_STATIC_ASSERT((::boost::is_same + CGAL_static_assertion((::boost::is_same ::value)); Numerator p_num; diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/Real_embeddable_traits_extension.cpp b/Algebraic_kernel_d/test/Algebraic_kernel_d/Real_embeddable_traits_extension.cpp index 47a457966cd..b3b1d2ac858 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/Real_embeddable_traits_extension.cpp +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/Real_embeddable_traits_extension.cpp @@ -53,8 +53,8 @@ void test_real_embeddable_extension(const NT_&){ const Floor floor = Floor(); typedef typename Floor::argument_type Argument_type; typedef typename Floor::result_type Result_type; - BOOST_STATIC_ASSERT(( ::boost::is_same::value)); - BOOST_STATIC_ASSERT(( ::boost::is_same::value)); + CGAL_static_assertion(( ::boost::is_same::value)); + CGAL_static_assertion(( ::boost::is_same::value)); assert(Integer(42) == floor(NT(42))); assert(Integer(-42) == floor(NT(-42))); } @@ -63,8 +63,8 @@ void test_real_embeddable_extension(const NT_&){ const Floor_log2_abs floor_log2_abs = Floor_log2_abs(); typedef typename Floor_log2_abs::argument_type Argument_type; typedef typename Floor_log2_abs::result_type Result_type; - BOOST_STATIC_ASSERT(( ::boost::is_same::value)); - BOOST_STATIC_ASSERT(( ::boost::is_same::value)); + CGAL_static_assertion(( ::boost::is_same::value)); + CGAL_static_assertion(( ::boost::is_same::value)); assert(long(0) == floor_log2_abs(NT(1))); assert(long(0) == floor_log2_abs(NT(-1))); @@ -88,8 +88,8 @@ void test_real_embeddable_extension(const NT_&){ const Ceil ceil = Ceil(); typedef typename Ceil::argument_type Argument_type; typedef typename Ceil::result_type Result_type; - BOOST_STATIC_ASSERT(( ::boost::is_same::value)); - BOOST_STATIC_ASSERT(( ::boost::is_same::value)); + CGAL_static_assertion(( ::boost::is_same::value)); + CGAL_static_assertion(( ::boost::is_same::value)); assert(Integer(42) == ceil(NT(42))); assert(Integer(-42) == ceil(NT(-42))); } @@ -98,8 +98,8 @@ void test_real_embeddable_extension(const NT_&){ const Ceil_log2_abs ceil_log2_abs = Ceil_log2_abs(); typedef typename Ceil_log2_abs::argument_type Argument_type; typedef typename Ceil_log2_abs::result_type Result_type; - BOOST_STATIC_ASSERT(( ::boost::is_same::value)); - BOOST_STATIC_ASSERT(( ::boost::is_same::value)); + CGAL_static_assertion(( ::boost::is_same::value)); + CGAL_static_assertion(( ::boost::is_same::value)); assert(long(0) == ceil_log2_abs(NT(1))); assert(long(0) == ceil_log2_abs(NT(-1))); diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_curve_kernel_2.h b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_curve_kernel_2.h index 68deb364363..5f075d6dec5 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_curve_kernel_2.h +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_curve_kernel_2.h @@ -69,18 +69,18 @@ void test_algebraic_curve_kernel_2() { typedef AlgebraicCurveKernel_2 AK_2; - /* BOOST_STATIC_ASSERT( (::boost::is_same< + /* CGAL_static_assertion( (::boost::is_same< Algebraic_real_1, typename AK::Algebraic_real_1 >::value) ); - BOOST_STATIC_ASSERT((::boost::is_same< + CGAL_static_assertion((::boost::is_same< Isolator, typename AK::Isolator >::value) ); - BOOST_STATIC_ASSERT((::boost::is_same< + CGAL_static_assertion((::boost::is_same< Coefficient, typename AK::Coefficient >::value)); - BOOST_STATIC_ASSERT((::boost::is_same< + CGAL_static_assertion((::boost::is_same< Polynomial_1, typename AK::Polynomial_1 >::value));*/ diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_1.h b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_1.h index c12f6f76e01..f6472fc433a 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_1.h +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_1.h @@ -112,17 +112,17 @@ void test_algebraic_kernel_1(const AlgebraicKernel_d_1& ak_1){ { \ typedef typename Name::argument_type AT_; \ typedef typename Name::result_type RT_; \ - {BOOST_STATIC_ASSERT(( ::boost::is_same::value));} \ - {BOOST_STATIC_ASSERT(( ::boost::is_same::value));} \ + {CGAL_static_assertion(( ::boost::is_same::value));} \ + {CGAL_static_assertion(( ::boost::is_same::value));} \ } #define CGAL_CHECK_BFUNCTION(Name,AT1,AT2,RT) \ { \ typedef typename Name::first_argument_type AT1_; \ typedef typename Name::second_argument_type AT2_; \ typedef typename Name::result_type RT_; \ - {BOOST_STATIC_ASSERT(( ::boost::is_same::value));} \ - {BOOST_STATIC_ASSERT(( ::boost::is_same::value));} \ - {BOOST_STATIC_ASSERT(( ::boost::is_same::value));} \ + {CGAL_static_assertion(( ::boost::is_same::value));} \ + {CGAL_static_assertion(( ::boost::is_same::value));} \ + {CGAL_static_assertion(( ::boost::is_same::value));} \ } // TODO: missing check for Construct_algebraic_real_1 diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_2.h b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_2.h index 6cf8d6ad735..08fb2f85c56 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_2.h +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_2.h @@ -101,21 +101,21 @@ void test_algebraic_kernel_2(const AlgebraicKernel_2& ak_2) { { \ typedef typename Name::argument_type AT_; \ typedef typename Name::result_type RT_; \ - {BOOST_STATIC_ASSERT(( ::boost::is_same::value));} \ - {BOOST_STATIC_ASSERT(( ::boost::is_same::value));} \ + {CGAL_static_assertion(( ::boost::is_same::value));} \ + {CGAL_static_assertion(( ::boost::is_same::value));} \ } #define CGAL_CHECK_BFUNCTION(Name,AT1,AT2,RT) \ { \ typedef typename Name::first_argument_type AT1_; \ typedef typename Name::second_argument_type AT2_; \ typedef typename Name::result_type RT_; \ - {BOOST_STATIC_ASSERT(( ::boost::is_same::value));} \ - {BOOST_STATIC_ASSERT(( ::boost::is_same::value));} \ - {BOOST_STATIC_ASSERT(( ::boost::is_same::value));} \ + {CGAL_static_assertion(( ::boost::is_same::value));} \ + {CGAL_static_assertion(( ::boost::is_same::value));} \ + {CGAL_static_assertion(( ::boost::is_same::value));} \ } - BOOST_STATIC_ASSERT(( ::boost::is_same + CGAL_static_assertion(( ::boost::is_same ::value)); @@ -123,7 +123,7 @@ void test_algebraic_kernel_2(const AlgebraicKernel_2& ak_2) { CGAL_CHECK_UFUNCTION(Make_square_free_2,Polynomial_2,Polynomial_2); // TODO: missing check for Square_free_factorize_2 CGAL_CHECK_BFUNCTION(Is_coprime_2,Polynomial_2,Polynomial_2,bool); - BOOST_STATIC_ASSERT(( ::boost::is_same + CGAL_static_assertion(( ::boost::is_same ::value)); CGAL_CHECK_BFUNCTION(Number_of_solutions_2,Polynomial_2,Polynomial_2, size_type); @@ -133,7 +133,7 @@ void test_algebraic_kernel_2(const AlgebraicKernel_2& ak_2) { CGAL_CHECK_UFUNCTION(Compute_polynomial_y_2,Algebraic_real_2,Polynomial_1); CGAL_CHECK_BFUNCTION(Isolate_x_2,Algebraic_real_2,Polynomial_1,BInterval); CGAL_CHECK_BFUNCTION(Isolate_y_2,Algebraic_real_2,Polynomial_1,BInterval); - BOOST_STATIC_ASSERT(( ::boost::is_same + CGAL_static_assertion(( ::boost::is_same < BArray,typename Isolate_2::result_type>::value)); CGAL_CHECK_BFUNCTION(Sign_at_2,Polynomial_2,Algebraic_real_2,Sign); CGAL_CHECK_BFUNCTION(Is_zero_at_2,Polynomial_2,Algebraic_real_2,bool); diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_comparable.h b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_comparable.h index ca1a15b7310..7b1f23a5058 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_comparable.h +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_comparable.h @@ -38,7 +38,7 @@ #include #include */ #include -#include +#include #include @@ -52,8 +52,8 @@ namespace internal { void operator() (ToDouble to_double) { typedef typename ToDouble::argument_type Argument_type; typedef typename ToDouble::result_type Result_type; - BOOST_STATIC_ASSERT((::boost::is_same::value)); - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); assert(42.0 == to_double(NT(42))); } }; @@ -72,8 +72,8 @@ namespace internal { void operator() (ToInterval to_Interval) { typedef typename ToInterval::argument_type Argument_type; typedef typename ToInterval::result_type Result_type; - BOOST_STATIC_ASSERT((::boost::is_same::value)); - BOOST_STATIC_ASSERT((::boost::is_same< typename Argument_type::Interval, Result_type>::value)); + CGAL_static_assertion((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same< typename Argument_type::Interval, Result_type>::value)); // TODO: NiX::in not available!? //assert(NiX::in(42.0,to_Interval(NT(42)))); @@ -112,7 +112,7 @@ void test_real_comparable() { typedef CGAL::Real_embeddable_traits Traits; typedef typename Traits::Is_real_embeddable Is_real_comparable; using ::CGAL::Tag_true; - BOOST_STATIC_ASSERT((::boost::is_same< Is_real_comparable, Tag_true>::value)); + CGAL_static_assertion((::boost::is_same< Is_real_comparable, Tag_true>::value)); typename Traits::Compare compare; typename Traits::Sign sign; typename Traits::Abs abs; @@ -181,20 +181,20 @@ void test_not_real_comparable() { typedef CGAL::Real_embeddable_traits Traits; typedef typename Traits::Is_real_embeddable Is_real_comparable; using ::CGAL::Tag_false; - BOOST_STATIC_ASSERT((::boost::is_same< Is_real_comparable, Tag_false>::value)); + CGAL_static_assertion((::boost::is_same< Is_real_comparable, Tag_false>::value)); } template void test_rounded_log2_abs(NT zero, ::CGAL::Null_functor, CeilLog2Abs) { typedef ::CGAL::Null_functor Nulltype; - BOOST_STATIC_ASSERT((::boost::is_same< CeilLog2Abs, Nulltype>::value)); + CGAL_static_assertion((::boost::is_same< CeilLog2Abs, Nulltype>::value)); } template void test_rounded_log2_abs(NT zero, FloorLog2Abs fl_log, CeilLog2Abs cl_log) { typedef ::CGAL::Null_functor Null_functor; - BOOST_STATIC_ASSERT((!::boost::is_same< CeilLog2Abs, Null_functor>::value)); + CGAL_static_assertion((!::boost::is_same< CeilLog2Abs, Null_functor>::value)); assert( fl_log(NT( 7)) == 2 ); assert( cl_log(NT( 7)) == 3 ); diff --git a/Arithmetic_kernel/test/Arithmetic_kernel/Get_arithmetic_kernel.cpp b/Arithmetic_kernel/test/Arithmetic_kernel/Get_arithmetic_kernel.cpp index e92a1e3c7c7..74cdc7d5505 100644 --- a/Arithmetic_kernel/test/Arithmetic_kernel/Get_arithmetic_kernel.cpp +++ b/Arithmetic_kernel/test/Arithmetic_kernel/Get_arithmetic_kernel.cpp @@ -16,15 +16,15 @@ int main() { typedef AK::Bigfloat_interval BFI; { typedef CGAL::Get_arithmetic_kernel::Arithmetic_kernel AK_; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); } { typedef CGAL::Get_arithmetic_kernel::Arithmetic_kernel AK_; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); } { typedef CGAL::Get_arithmetic_kernel::Arithmetic_kernel AK_; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); } return 0; } diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_dcel_base.h b/Arrangement_on_surface_2/include/CGAL/Arr_dcel_base.h index e6032e46a7d..fb5a27c1383 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_dcel_base.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_dcel_base.h @@ -35,14 +35,14 @@ #include #include #include -#include +#include namespace CGAL { inline void* _clean_pointer (const void* p) { - BOOST_STATIC_ASSERT(sizeof(void*) == sizeof(size_t)); + CGAL_static_assertion(sizeof(void*) == sizeof(size_t)); const size_t mask = ~1; const size_t val = (reinterpret_cast(p) & mask); diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_overlay_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_overlay_2.h index e1580b2282a..102bb4fa18a 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_overlay_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_overlay_2.h @@ -34,7 +34,7 @@ #include #include #include -#include +#include namespace CGAL { @@ -73,16 +73,16 @@ void overlay (const Arrangement_on_surface_2& arr1, typedef Arrangement_on_surface_2 ArrRes; // some type assertions (not all, but better then nothing). - BOOST_STATIC_ASSERT((boost::is_convertible< \ + CGAL_static_assertion((boost::is_convertible< \ typename GeomTraitsA::Point_2, \ typename GeomTraitsRes::Point_2 >::value)); - BOOST_STATIC_ASSERT((boost::is_convertible< \ + CGAL_static_assertion((boost::is_convertible< \ typename GeomTraitsB::Point_2, \ typename GeomTraitsRes::Point_2 >::value)); - BOOST_STATIC_ASSERT((boost::is_convertible< \ + CGAL_static_assertion((boost::is_convertible< \ typename GeomTraitsA::X_monotone_curve_2, \ typename GeomTraitsRes::X_monotone_curve_2 >::value)); - BOOST_STATIC_ASSERT((boost::is_convertible< \ + CGAL_static_assertion((boost::is_convertible< \ typename GeomTraitsB::X_monotone_curve_2, \ typename GeomTraitsRes::X_monotone_curve_2 >::value)); diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_rat_arc/Base_rational_arc_ds_1.h b/Arrangement_on_surface_2/include/CGAL/Arr_rat_arc/Base_rational_arc_ds_1.h index 7c19aa47d78..c85169b85d4 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_rat_arc/Base_rational_arc_ds_1.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_rat_arc/Base_rational_arc_ds_1.h @@ -68,8 +68,8 @@ public: typedef std::vector > Root_multiplicity_vector; - BOOST_STATIC_ASSERT((boost::is_same::value)); - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_rat_arc/Rational_arc_d_1.h b/Arrangement_on_surface_2/include/CGAL/Arr_rat_arc/Rational_arc_d_1.h index 419818cc875..5a7911fc46a 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_rat_arc/Rational_arc_d_1.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_rat_arc/Rational_arc_d_1.h @@ -103,8 +103,8 @@ public: typedef Algebraic_point_2 Point_2; - BOOST_STATIC_ASSERT((boost::is_same::value)); - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_tags.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_tags.cpp index ba73bb8347d..0efda44aa1b 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_tags.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_tags.cpp @@ -271,38 +271,38 @@ int main () assert(ident12() == false); - BOOST_STATIC_ASSERT( + CGAL_static_assertion( (boost::is_same< CGAL::internal::Arr_complete_left_side_category< Traits5 >::Category, CGAL::Arr_oblivious_side_tag >::value) ); - BOOST_STATIC_ASSERT( + CGAL_static_assertion( (boost::is_same< CGAL::internal::Arr_complete_left_side_category< Traits1 >::Category, CGAL::Arr_open_side_tag >::value) ); - BOOST_STATIC_ASSERT( + CGAL_static_assertion( (boost::is_same::Category, CGAL::Arr_oblivious_side_tag >::value) ); - BOOST_STATIC_ASSERT( + CGAL_static_assertion( (boost::is_same::Category, CGAL::Arr_open_side_tag >::value) ); - BOOST_STATIC_ASSERT( + CGAL_static_assertion( (boost::is_same< CGAL::internal::Arr_complete_top_side_category< Traits5 >::Category, CGAL::Arr_oblivious_side_tag >::value) ); - BOOST_STATIC_ASSERT( + CGAL_static_assertion( (boost::is_same< CGAL::internal::Arr_complete_top_side_category< Traits1 >::Category, CGAL::Arr_open_side_tag >::value) ); - BOOST_STATIC_ASSERT( + CGAL_static_assertion( (boost::is_same< CGAL::internal::Arr_complete_right_side_category< Traits5 >::Category, CGAL::Arr_oblivious_side_tag >::value) ); - BOOST_STATIC_ASSERT( + CGAL_static_assertion( (boost::is_same< CGAL::internal::Arr_complete_right_side_category< Traits1 >::Category, CGAL::Arr_open_side_tag >::value) ); diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map.h b/Combinatorial_map/include/CGAL/Combinatorial_map.h index 4d39a7091b6..9e5c0f868dd 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map.h @@ -35,17 +35,6 @@ #pragma GCC diagnostic ignored "-Warray-bounds" #endif -// Temporary patch since CGAL_static_assertion_msg is not yet available. -#ifndef CGAL_static_assertion - -# define CGAL_static_assertion(EX) \ - BOOST_STATIC_ASSERT(EX) -# define CGAL_static_assertion_msg(EX,MSG) \ - BOOST_STATIC_ASSERT(EX) - -#endif -// end of temporary patch: to remove asap. - namespace CGAL { /** @file Combinatorial_map.h diff --git a/Combinatorial_map/include/CGAL/Dart.h b/Combinatorial_map/include/CGAL/Dart.h index 19fdcfd4006..3db4780d4fd 100644 --- a/Combinatorial_map/include/CGAL/Dart.h +++ b/Combinatorial_map/include/CGAL/Dart.h @@ -24,18 +24,6 @@ #include #include -// Temporary patch since CGAL_static_assertion_msg is not yet available. -#ifndef CGAL_static_assertion - -# define CGAL_static_assertion(EX) \ - BOOST_STATIC_ASSERT(EX) -# define CGAL_static_assertion_msg(EX,MSG) \ - BOOST_STATIC_ASSERT(EX) - -#endif -// end of temporary patch: to remove asap. - - namespace CGAL { /** @file Dart.h diff --git a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h index 1e871349ca2..1a4eae9c65c 100644 --- a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h +++ b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include #ifdef CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES #include @@ -650,7 +650,7 @@ struct Fill_disabled template struct Fill_type{ typedef void type; - BOOST_STATIC_ASSERT(size < 10); + CGAL_static_assertion(size < 10); }; template diff --git a/Convex_hull_3/test/Convex_hull_3/quick_hull_default_traits.cpp b/Convex_hull_3/test/Convex_hull_3/quick_hull_default_traits.cpp index a5a1ea0573d..22fa1ba2cbe 100644 --- a/Convex_hull_3/test/Convex_hull_3/quick_hull_default_traits.cpp +++ b/Convex_hull_3/test/Convex_hull_3/quick_hull_default_traits.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #ifdef CGAL_USE_LEDA @@ -29,11 +29,11 @@ using namespace CGAL::internal::Convex_hull_3; int main() { - BOOST_STATIC_ASSERT( (boost::is_same::type>::value) ); - BOOST_STATIC_ASSERT( (boost::is_same::type>::value) ); - BOOST_STATIC_ASSERT( (boost::is_same::type>::value) ); - BOOST_STATIC_ASSERT( (boost::is_same::type>::value) ); - BOOST_STATIC_ASSERT( (boost::is_same,Default_traits_for_Chull_3::type>::value) ); - BOOST_STATIC_ASSERT( (boost::is_same >::Protector,CGAL::Protect_FPU_rounding >::value) ); + CGAL_static_assertion( (boost::is_same::type>::value) ); + CGAL_static_assertion( (boost::is_same::type>::value) ); + CGAL_static_assertion( (boost::is_same::type>::value) ); + CGAL_static_assertion( (boost::is_same::type>::value) ); + CGAL_static_assertion( (boost::is_same,Default_traits_for_Chull_3::type>::value) ); + CGAL_static_assertion( (boost::is_same >::Protector,CGAL::Protect_FPU_rounding >::value) ); return 0; } diff --git a/Interval_support/include/CGAL/Bigfloat_interval_traits.h b/Interval_support/include/CGAL/Bigfloat_interval_traits.h index 50a7c71075b..1827d6a0755 100644 --- a/Interval_support/include/CGAL/Bigfloat_interval_traits.h +++ b/Interval_support/include/CGAL/Bigfloat_interval_traits.h @@ -32,7 +32,7 @@ # include #endif -#include +#include namespace CGAL { // TODO: rename this into MPFI_traits ? diff --git a/Interval_support/include/CGAL/Test/_test_bigfloat_interval_traits.h b/Interval_support/include/CGAL/Test/_test_bigfloat_interval_traits.h index f515bb08b25..98e7b3e0166 100644 --- a/Interval_support/include/CGAL/Test/_test_bigfloat_interval_traits.h +++ b/Interval_support/include/CGAL/Test/_test_bigfloat_interval_traits.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include @@ -46,7 +46,7 @@ void test_bigfloat_interval_traits() { typedef typename BFIT::Is_bigfloat_interval Is_bigfloat_interval; // using CGAL::Tag_true; - BOOST_STATIC_ASSERT(( ::boost::is_same< Is_bigfloat_interval, CGAL::Tag_true>::value)); + CGAL_static_assertion(( ::boost::is_same< Is_bigfloat_interval, CGAL::Tag_true>::value)); const typename BFIT::Construct construct = typename BFIT::Construct(); const typename BFIT::Set_precision set_precision = typename BFIT::Set_precision(); diff --git a/Interval_support/include/CGAL/Test/_test_convert_to_bfi.h b/Interval_support/include/CGAL/Test/_test_convert_to_bfi.h index fb210e397de..c51e37d05dd 100644 --- a/Interval_support/include/CGAL/Test/_test_convert_to_bfi.h +++ b/Interval_support/include/CGAL/Test/_test_convert_to_bfi.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include @@ -46,7 +46,7 @@ void test_convert_to_bfi_from(BFI,CGAL::Null_tag){return;} template void test_convert_to_bfi_from(BFI,From){ typedef typename CGAL::Coercion_traits::Type CT_type; - BOOST_STATIC_ASSERT(( ::boost::is_same::value)); + CGAL_static_assertion(( ::boost::is_same::value)); assert(CGAL::convert_to_bfi(From(0)) == BFI(0)); assert(CGAL::convert_to_bfi(From(1)) == BFI(1)); assert(CGAL::convert_to_bfi(From(2)) == BFI(2)); diff --git a/Interval_support/include/CGAL/Test/_test_interval_traits.h b/Interval_support/include/CGAL/Test/_test_interval_traits.h index b98bc26dbdb..12f7f9e482c 100644 --- a/Interval_support/include/CGAL/Test/_test_interval_traits.h +++ b/Interval_support/include/CGAL/Test/_test_interval_traits.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include @@ -42,7 +42,7 @@ template void test_with_empty_interval(CGAL::Tag_false) { typedef CGAL::Interval_traits IT; typedef typename IT::Empty Empty; - BOOST_STATIC_ASSERT( + CGAL_static_assertion( (::boost::is_same< Empty, CGAL::Null_functor>::value)); // this part chages in case we allow empty intersection @@ -80,8 +80,8 @@ void test_interval_traits() { typedef typename IT::With_empty_interval With_empty_interval; using CGAL::Tag_true; - BOOST_STATIC_ASSERT(( ::boost::is_same< Is_interval, Tag_true>::value)); - BOOST_STATIC_ASSERT(( ::boost::is_same< Interval_, Interval>::value)); + CGAL_static_assertion(( ::boost::is_same< Is_interval, Tag_true>::value)); + CGAL_static_assertion(( ::boost::is_same< Interval_, Interval>::value)); test_with_empty_interval(With_empty_interval()); diff --git a/Kernel_23/include/CGAL/Circle_2.h b/Kernel_23/include/CGAL/Circle_2.h index 208d387a5d6..0c2a451823b 100644 --- a/Kernel_23/include/CGAL/Circle_2.h +++ b/Kernel_23/include/CGAL/Circle_2.h @@ -25,7 +25,7 @@ #ifndef CGAL_CIRCLE_2_H #define CGAL_CIRCLE_2_H -#include +#include #include #include #include @@ -42,7 +42,7 @@ class Circle_2 : public R_::Kernel_base::Circle_2 typedef typename R_::Aff_transformation_2 Aff_transformation_2; typedef Circle_2 Self; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Kernel_23/include/CGAL/Circle_3.h b/Kernel_23/include/CGAL/Circle_3.h index 16c347bbfd0..82a7c7ff0f5 100644 --- a/Kernel_23/include/CGAL/Circle_3.h +++ b/Kernel_23/include/CGAL/Circle_3.h @@ -30,7 +30,7 @@ #ifndef CGAL_CIRCLE_3_H #define CGAL_CIRCLE_3_H -#include +#include #include #include #include @@ -52,7 +52,7 @@ template typedef typename R_::Direction_3 Direction_3; typedef Circle_3 Self; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Kernel_23/include/CGAL/Direction_2.h b/Kernel_23/include/CGAL/Direction_2.h index 8b978fea446..b470330882b 100644 --- a/Kernel_23/include/CGAL/Direction_2.h +++ b/Kernel_23/include/CGAL/Direction_2.h @@ -24,7 +24,7 @@ #ifndef CGAL_DIRECTION_2_H #define CGAL_DIRECTION_2_H -#include +#include #include #include #include @@ -44,7 +44,7 @@ class Direction_2 : public R_::Kernel_base::Direction_2 typedef typename R_::Kernel_base::Direction_2 RDirection_2; typedef Direction_2 Self; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Kernel_23/include/CGAL/Direction_3.h b/Kernel_23/include/CGAL/Direction_3.h index 76ffe708c1f..568d2e2ea7c 100644 --- a/Kernel_23/include/CGAL/Direction_3.h +++ b/Kernel_23/include/CGAL/Direction_3.h @@ -24,7 +24,7 @@ #ifndef CGAL_DIRECTION_3_H #define CGAL_DIRECTION_3_H -#include +#include #include #include #include @@ -43,7 +43,7 @@ class Direction_3 : public R_::Kernel_base::Direction_3 typedef typename R_::Aff_transformation_3 Aff_transformation_3; typedef Direction_3 Self; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Kernel_23/include/CGAL/Iso_cuboid_3.h b/Kernel_23/include/CGAL/Iso_cuboid_3.h index faddad5472e..07657844f31 100644 --- a/Kernel_23/include/CGAL/Iso_cuboid_3.h +++ b/Kernel_23/include/CGAL/Iso_cuboid_3.h @@ -24,7 +24,7 @@ #ifndef CGAL_ISO_CUBOID_3_H #define CGAL_ISO_CUBOID_3_H -#include +#include #include #include #include @@ -40,7 +40,7 @@ class Iso_cuboid_3 : public R_::Kernel_base::Iso_cuboid_3 typedef typename R_::Aff_transformation_3 Aff_transformation_3; typedef Iso_cuboid_3 Self; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Kernel_23/include/CGAL/Iso_rectangle_2.h b/Kernel_23/include/CGAL/Iso_rectangle_2.h index 3875e377d86..3d4ea099575 100644 --- a/Kernel_23/include/CGAL/Iso_rectangle_2.h +++ b/Kernel_23/include/CGAL/Iso_rectangle_2.h @@ -24,7 +24,7 @@ #ifndef CGAL_ISO_RECTANGLE_2_H #define CGAL_ISO_RECTANGLE_2_H -#include +#include #include #include #include @@ -41,7 +41,7 @@ class Iso_rectangle_2 : public R_::Kernel_base::Iso_rectangle_2 typedef typename R_::Aff_transformation_2 Aff_transformation_2; typedef Iso_rectangle_2 Self; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Kernel_23/include/CGAL/Line_2.h b/Kernel_23/include/CGAL/Line_2.h index b9a892faa92..d08a4225511 100644 --- a/Kernel_23/include/CGAL/Line_2.h +++ b/Kernel_23/include/CGAL/Line_2.h @@ -24,7 +24,7 @@ #ifndef CGAL_LINE_2_H #define CGAL_LINE_2_H -#include +#include #include #include #include @@ -45,7 +45,7 @@ class Line_2 : public R_::Kernel_base::Line_2 typedef typename R_::Kernel_base::Line_2 RLine_2; typedef Line_2 Self; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Kernel_23/include/CGAL/Line_3.h b/Kernel_23/include/CGAL/Line_3.h index 7d1f35baa83..a32dbac4d55 100644 --- a/Kernel_23/include/CGAL/Line_3.h +++ b/Kernel_23/include/CGAL/Line_3.h @@ -25,7 +25,7 @@ #ifndef CGAL_LINE_3_H #define CGAL_LINE_3_H -#include +#include #include #include #include @@ -45,7 +45,7 @@ class Line_3 : public R_::Kernel_base::Line_3 typedef typename R_::Aff_transformation_3 Aff_transformation_3; typedef Line_3 Self; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Kernel_23/include/CGAL/Plane_3.h b/Kernel_23/include/CGAL/Plane_3.h index e2ac2b35e23..9cf4903120c 100644 --- a/Kernel_23/include/CGAL/Plane_3.h +++ b/Kernel_23/include/CGAL/Plane_3.h @@ -24,7 +24,7 @@ #ifndef CGAL_PLANE_3_H #define CGAL_PLANE_3_H -#include +#include #include #include #include @@ -46,7 +46,7 @@ class Plane_3 : public R_::Kernel_base::Plane_3 typedef typename R_::Aff_transformation_3 Aff_transformation_3; typedef Plane_3 Self; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Kernel_23/include/CGAL/Point_2.h b/Kernel_23/include/CGAL/Point_2.h index c1fcca5c03f..27ee6c40d63 100644 --- a/Kernel_23/include/CGAL/Point_2.h +++ b/Kernel_23/include/CGAL/Point_2.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include @@ -43,7 +43,7 @@ class Point_2 : public R_::Kernel_base::Point_2 typedef typename R_::Kernel_base::Point_2 RPoint_2; typedef Point_2 Self; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Kernel_23/include/CGAL/Point_3.h b/Kernel_23/include/CGAL/Point_3.h index 3e8266a08c7..66b8a242c9c 100644 --- a/Kernel_23/include/CGAL/Point_3.h +++ b/Kernel_23/include/CGAL/Point_3.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include @@ -44,7 +44,7 @@ class Point_3 : public R_::Kernel_base::Point_3 typedef typename R_::Aff_transformation_3 Aff_transformation_3; typedef Point_3 Self; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Kernel_23/include/CGAL/Ray_2.h b/Kernel_23/include/CGAL/Ray_2.h index bf1af8bab42..b6b37372380 100644 --- a/Kernel_23/include/CGAL/Ray_2.h +++ b/Kernel_23/include/CGAL/Ray_2.h @@ -24,7 +24,7 @@ #ifndef CGAL_RAY_2_H #define CGAL_RAY_2_H -#include +#include #include #include #include @@ -46,7 +46,7 @@ class Ray_2 : public R_::Kernel_base::Ray_2 typedef typename R_::Kernel_base::Ray_2 RRay_2; typedef Ray_2 Self; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Kernel_23/include/CGAL/Ray_3.h b/Kernel_23/include/CGAL/Ray_3.h index a7636d28c5f..c997765085e 100644 --- a/Kernel_23/include/CGAL/Ray_3.h +++ b/Kernel_23/include/CGAL/Ray_3.h @@ -24,7 +24,7 @@ #ifndef CGAL_RAY_3_H #define CGAL_RAY_3_H -#include +#include #include #include #include @@ -43,7 +43,7 @@ class Ray_3 : public R_::Kernel_base::Ray_3 typedef typename R_::Aff_transformation_3 Aff_transformation_3; typedef Ray_3 Self; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Kernel_23/include/CGAL/Segment_2.h b/Kernel_23/include/CGAL/Segment_2.h index d2c1f9b4d96..db0e9eb6740 100644 --- a/Kernel_23/include/CGAL/Segment_2.h +++ b/Kernel_23/include/CGAL/Segment_2.h @@ -24,7 +24,7 @@ #ifndef CGAL_SEGMENT_2_H #define CGAL_SEGMENT_2_H -#include +#include #include #include #include @@ -45,7 +45,7 @@ class Segment_2 : public R_::Kernel_base::Segment_2 typedef typename R_::Kernel_base::Segment_2 RSegment_2; typedef Segment_2 Self; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Kernel_23/include/CGAL/Segment_3.h b/Kernel_23/include/CGAL/Segment_3.h index d6f378adc46..bf52a886beb 100644 --- a/Kernel_23/include/CGAL/Segment_3.h +++ b/Kernel_23/include/CGAL/Segment_3.h @@ -24,7 +24,7 @@ #ifndef CGAL_SEGMENT_3_H #define CGAL_SEGMENT_3_H -#include +#include #include #include #include @@ -44,7 +44,7 @@ class Segment_3 : public R_::Kernel_base::Segment_3 typedef typename R_::Aff_transformation_3 Aff_transformation_3; typedef Segment_3 Self; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Kernel_23/include/CGAL/Sphere_3.h b/Kernel_23/include/CGAL/Sphere_3.h index a73b9e95747..b835fcc70c9 100644 --- a/Kernel_23/include/CGAL/Sphere_3.h +++ b/Kernel_23/include/CGAL/Sphere_3.h @@ -24,7 +24,7 @@ #ifndef CGAL_SPHERE_3_H #define CGAL_SPHERE_3_H -#include +#include #include #include #include @@ -43,7 +43,7 @@ class Sphere_3 : public R_::Kernel_base::Sphere_3 typedef typename R_::Aff_transformation_3 Aff_transformation_3; typedef Sphere_3 Self; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Kernel_23/include/CGAL/Tetrahedron_3.h b/Kernel_23/include/CGAL/Tetrahedron_3.h index bfaf2a2b283..1497b274004 100644 --- a/Kernel_23/include/CGAL/Tetrahedron_3.h +++ b/Kernel_23/include/CGAL/Tetrahedron_3.h @@ -24,7 +24,7 @@ #ifndef CGAL_TETRAHEDRON_3_H #define CGAL_TETRAHEDRON_3_H -#include +#include #include #include #include @@ -39,7 +39,7 @@ class Tetrahedron_3 : public R_::Kernel_base::Tetrahedron_3 typedef typename R_::Aff_transformation_3 Aff_transformation_3; typedef Tetrahedron_3 Self; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Kernel_23/include/CGAL/Triangle_2.h b/Kernel_23/include/CGAL/Triangle_2.h index c6cc26678b8..2bb82118163 100644 --- a/Kernel_23/include/CGAL/Triangle_2.h +++ b/Kernel_23/include/CGAL/Triangle_2.h @@ -24,7 +24,7 @@ #ifndef CGAL_TRIANGLE_2_H #define CGAL_TRIANGLE_2_H -#include +#include #include #include #include @@ -40,7 +40,7 @@ class Triangle_2 : public R_::Kernel_base::Triangle_2 typedef typename R_::Kernel_base::Triangle_2 RTriangle_2; typedef Triangle_2 Self; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Kernel_23/include/CGAL/Triangle_3.h b/Kernel_23/include/CGAL/Triangle_3.h index 7ab023c0264..6556e8a8434 100644 --- a/Kernel_23/include/CGAL/Triangle_3.h +++ b/Kernel_23/include/CGAL/Triangle_3.h @@ -24,7 +24,7 @@ #ifndef CGAL_TRIANGLE_3_H #define CGAL_TRIANGLE_3_H -#include +#include #include #include #include @@ -42,7 +42,7 @@ class Triangle_3 : public R_::Kernel_base::Triangle_3 typedef typename R_::Aff_transformation_3 Aff_transformation_3; typedef Triangle_3 Self; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Kernel_23/include/CGAL/Vector_2.h b/Kernel_23/include/CGAL/Vector_2.h index e127fd46278..f7cce5fdb3a 100644 --- a/Kernel_23/include/CGAL/Vector_2.h +++ b/Kernel_23/include/CGAL/Vector_2.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include @@ -48,7 +48,7 @@ class Vector_2 : public R_::Kernel_base::Vector_2 typedef typename R_::Kernel_base::Vector_2 RVector_2; typedef Vector_2 Self; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Kernel_23/include/CGAL/Vector_3.h b/Kernel_23/include/CGAL/Vector_3.h index 65ef9683aba..e9682bb5934 100644 --- a/Kernel_23/include/CGAL/Vector_3.h +++ b/Kernel_23/include/CGAL/Vector_3.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -48,7 +48,7 @@ class Vector_3 : public R_::Kernel_base::Vector_3 typedef typename R_::Aff_transformation_3 Aff_transformation_3; typedef Vector_3 Self; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); public: diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Default_instantaneous_kernel.h b/Kinetic_data_structures/include/CGAL/Kinetic/Default_instantaneous_kernel.h index 08ffcc70089..9e09f492a10 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Default_instantaneous_kernel.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Default_instantaneous_kernel.h @@ -246,9 +246,9 @@ public: typedef typename Static_kernel::FT NT; typedef typename Traits::Simulator::Time Time; - BOOST_STATIC_ASSERT((boost::is_convertible::value)); - BOOST_STATIC_ASSERT((boost::is_convertible::value)); - BOOST_STATIC_ASSERT((boost::is_convertible::value)); + CGAL_static_assertion((boost::is_convertible::value)); + CGAL_static_assertion((boost::is_convertible::value)); Default_instantaneous_kernel(const Traits &tr): diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Instantaneous_adaptor.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Instantaneous_adaptor.h index 307a6e04608..cd386403eb3 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/Instantaneous_adaptor.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/Instantaneous_adaptor.h @@ -36,7 +36,7 @@ class Instantaneous_adaptor { typedef typename Rep::Time Time; - BOOST_STATIC_ASSERT((boost::is_convertible::value)); + CGAL_static_assertion((boost::is_convertible::value)); public: Instantaneous_adaptor(typename Rep::Handle rep, Static_predicate pred, diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/basic.h b/Kinetic_data_structures/include/CGAL/Polynomial/basic.h index 23241965068..52c9dee5f0c 100644 --- a/Kinetic_data_structures/include/CGAL/Polynomial/basic.h +++ b/Kinetic_data_structures/include/CGAL/Polynomial/basic.h @@ -23,7 +23,7 @@ #include #include -#include +#include /*! \file CGAL/Polynomial/basic.h The file which defines the basic @@ -167,7 +167,7 @@ inline Extended_sign extended_sign(const NT &nt) template inline Rt infinity() { - //BOOST_STATIC_ASSERT(std::numeric_limits::is_specialized); + //CGAL_static_assertion(std::numeric_limits::is_specialized); if (std::numeric_limits::has_infinity) return std::numeric_limits::infinity(); else return (std::numeric_limits::max)(); } diff --git a/Number_types/include/CGAL/Lazy_exact_nt.h b/Number_types/include/CGAL/Lazy_exact_nt.h index 9f3f90064fe..455fe29df48 100644 --- a/Number_types/include/CGAL/Lazy_exact_nt.h +++ b/Number_types/include/CGAL/Lazy_exact_nt.h @@ -29,7 +29,7 @@ #include #include // for Root_of functor -#include +#include #include #include @@ -914,7 +914,7 @@ struct Div_mod_selector { void operator()( const NT1& x, const NT2& y, NT& q, NT& r ) const { - BOOST_STATIC_ASSERT((::boost::is_same< + CGAL_static_assertion((::boost::is_same< typename Coercion_traits< NT1, NT2 >::Type, NT >::value)); @@ -999,7 +999,7 @@ template < typename ET > class Real_embeddable_traits< Lazy_exact_nt > : public INTERN_RET::Real_embeddable_traits_base< Lazy_exact_nt , CGAL::Tag_true > { // Every type ET of Lazy_exact_nt has to be real embeddable. - BOOST_STATIC_ASSERT((::boost::is_same< typename Real_embeddable_traits< ET > + CGAL_static_assertion((::boost::is_same< typename Real_embeddable_traits< ET > ::Is_real_embeddable, Tag_true >::value)); public: diff --git a/Number_types/include/CGAL/Root_of_traits.h b/Number_types/include/CGAL/Root_of_traits.h index cffb0341412..7a72251c11a 100644 --- a/Number_types/include/CGAL/Root_of_traits.h +++ b/Number_types/include/CGAL/Root_of_traits.h @@ -130,7 +130,7 @@ private: // We have the typedef as VC10 fails with // static_assert(FrT::Is_fraction::value) typedef typename FrT::Is_fraction ISF; - BOOST_STATIC_ASSERT((ISF::value)); + CGAL_static_assertion((ISF::value)); typedef typename FrT::Numerator_type RT; diff --git a/Number_types/include/CGAL/Test/test_root_of_traits.h b/Number_types/include/CGAL/Test/test_root_of_traits.h index 7dc7e43eb3a..87ed06fe30c 100644 --- a/Number_types/include/CGAL/Test/test_root_of_traits.h +++ b/Number_types/include/CGAL/Test/test_root_of_traits.h @@ -10,8 +10,8 @@ void test_root_of_traits(){ typedef typename RoT::Root_of_1 Root_of_1; typedef typename RoT::Root_of_2 Root_of_2; - BOOST_STATIC_ASSERT((::boost::is_same::value)); - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); typedef typename RoT::Make_root_of_2 Make_root_of_2; typedef typename RoT::Make_sqrt Make_sqrt; @@ -23,10 +23,10 @@ void test_root_of_traits(){ const Inverse& inverse = Inverse(); const Square& square = Square(); - BOOST_STATIC_ASSERT((::boost::is_same::value)); - BOOST_STATIC_ASSERT((::boost::is_same::value)); - BOOST_STATIC_ASSERT((::boost::is_same::value)); - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); { diff --git a/Number_types/include/CGAL/mpq_class.h b/Number_types/include/CGAL/mpq_class.h index 74a0db8291b..0b565b30ecf 100644 --- a/Number_types/include/CGAL/mpq_class.h +++ b/Number_types/include/CGAL/mpq_class.h @@ -38,7 +38,7 @@ // while ::__gmp_expr is the others "expressions". #define CGAL_CHECK_GMP_EXPR \ - BOOST_STATIC_ASSERT( \ + CGAL_static_assertion( \ (::boost::is_same< ::__gmp_expr< T , T >,Type>::value )); namespace CGAL { diff --git a/Number_types/include/CGAL/mpz_class.h b/Number_types/include/CGAL/mpz_class.h index 15da28bd30a..bae1ca32638 100644 --- a/Number_types/include/CGAL/mpz_class.h +++ b/Number_types/include/CGAL/mpz_class.h @@ -40,7 +40,7 @@ #define CGAL_CHECK_GMP_EXPR \ - BOOST_STATIC_ASSERT( \ + CGAL_static_assertion( \ (::boost::is_same< ::__gmp_expr< T , T >,Type>::value )); namespace CGAL { diff --git a/Number_types/include/CGAL/simplest_rational_in_interval.h b/Number_types/include/CGAL/simplest_rational_in_interval.h index e52f2e69415..b0b0056b2d9 100644 --- a/Number_types/include/CGAL/simplest_rational_in_interval.h +++ b/Number_types/include/CGAL/simplest_rational_in_interval.h @@ -48,9 +48,9 @@ simplest_rational_in_interval(double x, double y) { typedef typename FT::Compose Compose; // Must be a fraction - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); // Numerator_type,Denominator_type must be the same - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); if(x == y){ diff --git a/Number_types/include/CGAL/to_rational.h b/Number_types/include/CGAL/to_rational.h index 111f8e7aabd..6f160c730f5 100644 --- a/Number_types/include/CGAL/to_rational.h +++ b/Number_types/include/CGAL/to_rational.h @@ -41,8 +41,8 @@ to_rational(double x) typedef typename FT::Denominator_type Denominator_type; typename FT::Compose compose; - BOOST_STATIC_ASSERT((::boost::is_same::value)); - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); Numerator_type num(0),den(1); diff --git a/Number_types/test/Number_types/Coercion_traits.cpp b/Number_types/test/Number_types/Coercion_traits.cpp index d9b9ccbde6c..6fcfdacb56c 100644 --- a/Number_types/test/Number_types/Coercion_traits.cpp +++ b/Number_types/test/Number_types/Coercion_traits.cpp @@ -164,9 +164,9 @@ void AT_coercion_test_for_cgal_types_rat(){ typedef typename AT::Bigfloat_interval Bigfloat_interval; - BOOST_STATIC_ASSERT(!(::boost::is_same::value)); - BOOST_STATIC_ASSERT(!(::boost::is_same::value)); - BOOST_STATIC_ASSERT(!(::boost::is_same::value)); + CGAL_static_assertion(!(::boost::is_same::value)); + CGAL_static_assertion(!(::boost::is_same::value)); + CGAL_static_assertion(!(::boost::is_same::value)); CGAL::test_explicit_interoperable_from_to(); CGAL::test_explicit_interoperable_from_to(); @@ -222,10 +222,10 @@ void AT_coercion_test_for_cgal_types_fws(){ typedef typename AT::Bigfloat_interval Bigfloat_interval; typedef typename AT::Field_with_sqrt Real; - BOOST_STATIC_ASSERT(!(::boost::is_same::value)); - BOOST_STATIC_ASSERT(!(::boost::is_same::value)); - BOOST_STATIC_ASSERT(!(::boost::is_same::value)); - BOOST_STATIC_ASSERT(!(::boost::is_same::value)); + CGAL_static_assertion(!(::boost::is_same::value)); + CGAL_static_assertion(!(::boost::is_same::value)); + CGAL_static_assertion(!(::boost::is_same::value)); + CGAL_static_assertion(!(::boost::is_same::value)); typedef CGAL::Sqrt_extension Extn_1; diff --git a/Number_types/test/Number_types/Lazy_exact_nt_new.cpp b/Number_types/test/Number_types/Lazy_exact_nt_new.cpp index 5600adbc97b..c6aaf361767 100644 --- a/Number_types/test/Number_types/Lazy_exact_nt_new.cpp +++ b/Number_types/test/Number_types/Lazy_exact_nt_new.cpp @@ -78,9 +78,9 @@ void test_lazy_exact_nt() { typedef CGAL::Lazy_exact_nt< typename AK::Integer > LI; typedef CGAL::Lazy_exact_nt< typename AK::Rational > LR; typedef CGAL::Coercion_traits CT; - BOOST_STATIC_ASSERT((boost::is_same< typename CT::Are_implicit_interoperable,CGAL::Tag_true>::value)); - BOOST_STATIC_ASSERT((boost::is_same< typename CT::Are_explicit_interoperable,CGAL::Tag_true>::value)); - BOOST_STATIC_ASSERT((boost::is_same< typename CT::Type,LR>::value)); + CGAL_static_assertion((boost::is_same< typename CT::Are_implicit_interoperable,CGAL::Tag_true>::value)); + CGAL_static_assertion((boost::is_same< typename CT::Are_explicit_interoperable,CGAL::Tag_true>::value)); + CGAL_static_assertion((boost::is_same< typename CT::Type,LR>::value)); LI i(4); LR r(4); @@ -94,8 +94,8 @@ void test_lazy_exact_nt() { typedef CGAL::Lazy_exact_nt T1; typedef CGAL::Lazy_exact_nt T2; typedef CGAL::Coercion_traits CT; - BOOST_STATIC_ASSERT((boost::is_same< typename CT::Are_implicit_interoperable,CGAL::Tag_false>::value)); - BOOST_STATIC_ASSERT((boost::is_same< typename CT::Are_explicit_interoperable,CGAL::Tag_false>::value)); + CGAL_static_assertion((boost::is_same< typename CT::Are_implicit_interoperable,CGAL::Tag_false>::value)); + CGAL_static_assertion((boost::is_same< typename CT::Are_explicit_interoperable,CGAL::Tag_false>::value)); #endif #endif } diff --git a/Number_types/test/Number_types/Quotient_new.cpp b/Number_types/test/Number_types/Quotient_new.cpp index b0cedba2594..743d9beab32 100644 --- a/Number_types/test/Number_types/Quotient_new.cpp +++ b/Number_types/test/Number_types/Quotient_new.cpp @@ -60,9 +60,9 @@ void test_quotient() { typedef typename AT::Integer I ; typedef CGAL::Quotient QI; typedef CGAL::Coercion_traits CT; - BOOST_STATIC_ASSERT((boost::is_same< typename CT::Are_explicit_interoperable,CGAL::Tag_true>::value)); - BOOST_STATIC_ASSERT((boost::is_same< typename CT::Are_implicit_interoperable,CGAL::Tag_true>::value)); - BOOST_STATIC_ASSERT((boost::is_same< typename CT::Type,QI>::value)); + CGAL_static_assertion((boost::is_same< typename CT::Are_explicit_interoperable,CGAL::Tag_true>::value)); + CGAL_static_assertion((boost::is_same< typename CT::Are_implicit_interoperable,CGAL::Tag_true>::value)); + CGAL_static_assertion((boost::is_same< typename CT::Type,QI>::value)); } } diff --git a/Number_types/test/Number_types/Sqrt_extension.cpp b/Number_types/test/Number_types/Sqrt_extension.cpp index 3e7d01c7911..e2a5fb1847b 100644 --- a/Number_types/test/Number_types/Sqrt_extension.cpp +++ b/Number_types/test/Number_types/Sqrt_extension.cpp @@ -20,7 +20,7 @@ inline void convert_to(const NT& x, RT& r){ typedef CGAL::Coercion_traits CT; typedef typename CT::Type Type; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); r = typename CT::Cast()(x); } } //namespace CGAL @@ -696,15 +696,15 @@ void test_get_arithmetic_kernel(){ { typedef CGAL::Sqrt_extension EXT; typedef typename CGAL::Get_arithmetic_kernel::Arithmetic_kernel AT_; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); } { typedef CGAL::Sqrt_extension EXT; typedef typename CGAL::Get_arithmetic_kernel::Arithmetic_kernel AT_; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); } { typedef CGAL::Sqrt_extension EXT; typedef typename CGAL::Get_arithmetic_kernel::Arithmetic_kernel AT_; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); } } diff --git a/Number_types/test/Number_types/include/CGAL/Test/test_root_of_2_traits.h b/Number_types/test/Number_types/include/CGAL/Test/test_root_of_2_traits.h index 66186d7199c..6936429d8d7 100644 --- a/Number_types/test/Number_types/include/CGAL/Test/test_root_of_2_traits.h +++ b/Number_types/test/Number_types/include/CGAL/Test/test_root_of_2_traits.h @@ -7,12 +7,12 @@ void test_root_of_traits(){ typedef typename RoT::Root_of_1 Root_of_1; typedef typename RoT::Root_of_2 Root_of_2; - BOOST_STATIC_ASSERT((::boost::is_same::value)); - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); typedef typename RoT::Make_root_of_2 Make_root_of_2; typedef typename Make_root_of_2::result_type result_type; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); const Make_root_of_2& make_root_of_2 = Make_root_of_2(); Root_of_2 r = make_root_of_2(T(0),T(-1),T(2)); //-sqrt(2) diff --git a/Number_types/test/Number_types/known_bit_size_integers.cpp b/Number_types/test/Number_types/known_bit_size_integers.cpp index af4fb53447c..2085172687b 100644 --- a/Number_types/test/Number_types/known_bit_size_integers.cpp +++ b/Number_types/test/Number_types/known_bit_size_integers.cpp @@ -1,24 +1,24 @@ #include #include -#include +#include int main() { std::cout << "Verifying the sizes of boost::[u]int{8,16,32,64}_t" << std::endl; - BOOST_STATIC_ASSERT(sizeof(boost::int8_t) == 1); - BOOST_STATIC_ASSERT(sizeof(boost::int16_t) == 2); - BOOST_STATIC_ASSERT(sizeof(boost::int32_t) == 4); + CGAL_static_assertion(sizeof(boost::int8_t) == 1); + CGAL_static_assertion(sizeof(boost::int16_t) == 2); + CGAL_static_assertion(sizeof(boost::int32_t) == 4); #ifndef BOOST_NO_INT64_T - BOOST_STATIC_ASSERT(sizeof(boost::int64_t) == 8); + CGAL_static_assertion(sizeof(boost::int64_t) == 8); #endif - BOOST_STATIC_ASSERT(sizeof(boost::uint8_t) == 1); - BOOST_STATIC_ASSERT(sizeof(boost::uint16_t) == 2); - BOOST_STATIC_ASSERT(sizeof(boost::uint32_t) == 4); + CGAL_static_assertion(sizeof(boost::uint8_t) == 1); + CGAL_static_assertion(sizeof(boost::uint16_t) == 2); + CGAL_static_assertion(sizeof(boost::uint32_t) == 4); #ifndef BOOST_NO_INT64_T - BOOST_STATIC_ASSERT(sizeof(boost::uint64_t) == 8); + CGAL_static_assertion(sizeof(boost::uint64_t) == 8); #endif return 0; diff --git a/Polynomial/include/CGAL/Exponent_vector.h b/Polynomial/include/CGAL/Exponent_vector.h index 73c865df730..eaa67cb271e 100644 --- a/Polynomial/include/CGAL/Exponent_vector.h +++ b/Polynomial/include/CGAL/Exponent_vector.h @@ -63,7 +63,7 @@ public: Exponent_vector(InputIterator begin , InputIterator end) :v(begin,end){ typedef typename std::iterator_traits::value_type value_type; - BOOST_STATIC_ASSERT(( ::boost::is_same::value)); + CGAL_static_assertion(( ::boost::is_same::value)); } diff --git a/Polynomial/include/CGAL/Polynomial.h b/Polynomial/include/CGAL/Polynomial.h index cd523c07b1e..7fe1ee8b608 100644 --- a/Polynomial/include/CGAL/Polynomial.h +++ b/Polynomial/include/CGAL/Polynomial.h @@ -45,7 +45,7 @@ #include -#include +#include #ifdef CGAL_USE_LEDA #if CGAL_LEDA_VERSION >= 500 diff --git a/Polynomial/include/CGAL/Polynomial/Algebraic_structure_traits.h b/Polynomial/include/CGAL/Polynomial/Algebraic_structure_traits.h index a6c4490c3a1..b969c87a2d0 100644 --- a/Polynomial/include/CGAL/Polynomial/Algebraic_structure_traits.h +++ b/Polynomial/include/CGAL/Polynomial/Algebraic_structure_traits.h @@ -281,7 +281,7 @@ class Polynomial_algebraic_structure_traits_base< POLY, Field_tag > template < class NT1, class NT2 > void operator()( const NT1& x, const NT2& y, POLY& q, POLY& r ) const { - BOOST_STATIC_ASSERT((::boost::is_same< + CGAL_static_assertion((::boost::is_same< typename Coercion_traits< NT1, NT2 >::Type, POLY >::value)); diff --git a/Polynomial/include/CGAL/Polynomial/Polynomial_type.h b/Polynomial/include/CGAL/Polynomial/Polynomial_type.h index e9b73ad44ea..ea63f428704 100644 --- a/Polynomial/include/CGAL/Polynomial/Polynomial_type.h +++ b/Polynomial/include/CGAL/Polynomial/Polynomial_type.h @@ -540,7 +540,7 @@ public: * Also available as non-member function. */ CGAL::Sign sign() const { -// BOOST_STATIC_ASSERT( (boost::is_same< typename Real_embeddable_traits::Is_real_embeddable, +// CGAL_static_assertion( (boost::is_same< typename Real_embeddable_traits::Is_real_embeddable, // CGAL::Tag_true>::value) ); return CGAL::sign(lcoeff()); } diff --git a/Polynomial/include/CGAL/Polynomial/subresultants.h b/Polynomial/include/CGAL/Polynomial/subresultants.h index 301955a47de..6f906c25c6e 100644 --- a/Polynomial/include/CGAL/Polynomial/subresultants.h +++ b/Polynomial/include/CGAL/Polynomial/subresultants.h @@ -785,7 +785,7 @@ namespace CGAL { CGAL::Integral_domain_without_division_tag) { // polynomial_subresultants_with_cofactors requires // a model of IntegralDomain as coefficient type; - BOOST_STATIC_ASSERT(sizeof(Polynomial_traits_d)==0); + CGAL_static_assertion(sizeof(Polynomial_traits_d)==0); return sres_out; } diff --git a/Polynomial/include/CGAL/Polynomial_traits_d.h b/Polynomial/include/CGAL/Polynomial_traits_d.h index 12136244898..47cfbb16818 100644 --- a/Polynomial/include/CGAL/Polynomial_traits_d.h +++ b/Polynomial/include/CGAL/Polynomial_traits_d.h @@ -571,7 +571,7 @@ public: template Polynomial_d construct_value_type(Input_iterator begin, Input_iterator end, NT) const { typedef CGAL::Coercion_traits CT; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); typename CT::Cast cast; return Polynomial_d( boost::make_transform_iterator(begin,cast), @@ -672,7 +672,7 @@ public: typedef Polynomial_traits_d PT; typename PT::Construct_polynomial construct; - BOOST_STATIC_ASSERT(PT::d != 0); // Coefficient_type is a Polynomial + CGAL_static_assertion(PT::d != 0); // Coefficient_type is a Polynomial std::vector coefficients; Coefficient_type zero(0); diff --git a/Polynomial/include/CGAL/Test/_test_polynomial_traits_d.h b/Polynomial/include/CGAL/Test/_test_polynomial_traits_d.h index a15a0fff86b..7d984c0c7fc 100644 --- a/Polynomial/include/CGAL/Test/_test_polynomial_traits_d.h +++ b/Polynomial/include/CGAL/Test/_test_polynomial_traits_d.h @@ -34,7 +34,7 @@ static CGAL::Random my_rnd(346); // some seed #define ASSERT_IS_NULL_FUNCTOR(T) \ - BOOST_STATIC_ASSERT((boost::is_same::value)) + CGAL_static_assertion((boost::is_same::value)) @@ -154,10 +154,10 @@ void test_construct_polynomial(const Polynomial_traits_d&){ } { // Construct_polynomial typedef typename PT::Construct_polynomial Constructor; - BOOST_STATIC_ASSERT( + CGAL_static_assertion( !(boost::is_same< Constructor , CGAL::Null_functor >::value)); typedef typename Constructor::result_type result_type; - BOOST_STATIC_ASSERT( + CGAL_static_assertion( (boost::is_same< result_type , Polynomial_d >::value)); typedef typename PT::Shift Shift; typedef typename PT::Evaluate Evaluate; @@ -1778,23 +1778,23 @@ void test_rebind(const PT& /*traits*/){ { const int dimension = 1; typedef typename PT:: template Rebind::Other PT_IC_1; - BOOST_STATIC_ASSERT((boost::is_same< typename PT_IC_1::Innermost_coefficient_type, + CGAL_static_assertion((boost::is_same< typename PT_IC_1::Innermost_coefficient_type, IC>::value)); - BOOST_STATIC_ASSERT((PT_IC_1::d==dimension)); + CGAL_static_assertion((PT_IC_1::d==dimension)); } { const int dimension = 2; typedef typename PT:: template Rebind::Other PT_IC_2; - BOOST_STATIC_ASSERT((boost::is_same< typename PT_IC_2::Innermost_coefficient_type, + CGAL_static_assertion((boost::is_same< typename PT_IC_2::Innermost_coefficient_type, IC>::value)); - BOOST_STATIC_ASSERT((PT_IC_2::d==dimension)); + CGAL_static_assertion((PT_IC_2::d==dimension)); } { const int dimension = 3; typedef typename PT:: template Rebind::Other PT_IC_3; - BOOST_STATIC_ASSERT((boost::is_same< typename PT_IC_3::Innermost_coefficient_type, + CGAL_static_assertion((boost::is_same< typename PT_IC_3::Innermost_coefficient_type, IC>::value)); - BOOST_STATIC_ASSERT((PT_IC_3::d==dimension)); + CGAL_static_assertion((PT_IC_3::d==dimension)); } { typedef typename PT:: template Rebind::Other PT_IC_1; @@ -1804,11 +1804,11 @@ void test_rebind(const PT& /*traits*/){ typedef typename PT_IC_1::Polynomial_d Poly1; typedef typename PT_IC_2::Polynomial_d Poly2; - BOOST_STATIC_ASSERT((boost::is_same< typename PT_IC_1::Coefficient_type, + CGAL_static_assertion((boost::is_same< typename PT_IC_1::Coefficient_type, IC>::value)); - BOOST_STATIC_ASSERT((boost::is_same< typename PT_IC_2::Coefficient_type, + CGAL_static_assertion((boost::is_same< typename PT_IC_2::Coefficient_type, Poly1>::value)); - BOOST_STATIC_ASSERT((boost::is_same< typename PT_IC_3::Coefficient_type, + CGAL_static_assertion((boost::is_same< typename PT_IC_3::Coefficient_type, Poly2>::value)); } @@ -1821,12 +1821,12 @@ void test_rebind(const PT& /*traits*/){ const int dimension = 4; typedef typename PT:: template Rebind::Other PT_Integer_4; typedef typename PT:: template Rebind::Other PT_Rational_4; - BOOST_STATIC_ASSERT((boost::is_same< typename PT_Integer_4::Innermost_coefficient_type, + CGAL_static_assertion((boost::is_same< typename PT_Integer_4::Innermost_coefficient_type, Integer>::value)); - BOOST_STATIC_ASSERT((boost::is_same< typename PT_Rational_4::Innermost_coefficient_type, + CGAL_static_assertion((boost::is_same< typename PT_Rational_4::Innermost_coefficient_type, Rational>::value)); - BOOST_STATIC_ASSERT((PT_Integer_4::d==dimension)); - BOOST_STATIC_ASSERT((PT_Rational_4::d==dimension)); + CGAL_static_assertion((PT_Integer_4::d==dimension)); + CGAL_static_assertion((PT_Rational_4::d==dimension)); } #endif #ifdef CGAL_USE_CORE @@ -1837,24 +1837,24 @@ void test_rebind(const PT& /*traits*/){ const int dimension = 4; typedef typename PT:: template Rebind::Other PT_Integer_4; typedef typename PT:: template Rebind::Other PT_Rational_4; - BOOST_STATIC_ASSERT((boost::is_same< typename PT_Integer_4::Innermost_coefficient_type, + CGAL_static_assertion((boost::is_same< typename PT_Integer_4::Innermost_coefficient_type, Integer>::value)); - BOOST_STATIC_ASSERT((boost::is_same< typename PT_Rational_4::Innermost_coefficient_type, + CGAL_static_assertion((boost::is_same< typename PT_Rational_4::Innermost_coefficient_type, Rational>::value)); - BOOST_STATIC_ASSERT((PT_Integer_4::d==dimension)); - BOOST_STATIC_ASSERT((PT_Rational_4::d==dimension)); + CGAL_static_assertion((PT_Integer_4::d==dimension)); + CGAL_static_assertion((PT_Rational_4::d==dimension)); } #endif { const int dimension = 4; typedef typename PT:: template Rebind::Other PT_Integer_4; typedef typename PT:: template Rebind::Other PT_Rational_4; - BOOST_STATIC_ASSERT((boost::is_same< typename PT_Integer_4::Innermost_coefficient_type, + CGAL_static_assertion((boost::is_same< typename PT_Integer_4::Innermost_coefficient_type, int>::value)); - BOOST_STATIC_ASSERT((boost::is_same< typename PT_Rational_4::Innermost_coefficient_type, + CGAL_static_assertion((boost::is_same< typename PT_Rational_4::Innermost_coefficient_type, double>::value)); - BOOST_STATIC_ASSERT((PT_Integer_4::d==dimension)); - BOOST_STATIC_ASSERT((PT_Rational_4::d==dimension)); + CGAL_static_assertion((PT_Integer_4::d==dimension)); + CGAL_static_assertion((PT_Rational_4::d==dimension)); } } diff --git a/Polynomial/test/Polynomial/Coercion_traits.cpp b/Polynomial/test/Polynomial/Coercion_traits.cpp index 36c83b9b30b..a0555c79561 100644 --- a/Polynomial/test/Polynomial/Coercion_traits.cpp +++ b/Polynomial/test/Polynomial/Coercion_traits.cpp @@ -149,7 +149,7 @@ void test_coercion_traits(){ /* { typedef CGAL::Coercion_traits CT; - BOOST_STATIC_ASSERT(( + CGAL_static_assertion(( ::boost::is_same< typename CT::Are_implicit_interoperable, CGAL::Tag_false>::value)); } diff --git a/Polynomial/test/Polynomial/Get_arithmetic_kernel.cpp b/Polynomial/test/Polynomial/Get_arithmetic_kernel.cpp index 0b40e1f58c0..15f5cbdbd22 100644 --- a/Polynomial/test/Polynomial/Get_arithmetic_kernel.cpp +++ b/Polynomial/test/Polynomial/Get_arithmetic_kernel.cpp @@ -8,11 +8,11 @@ void test_get_arithmetic_kernel(){ { typedef CGAL::Polynomial POLY; typedef typename CGAL::Get_arithmetic_kernel::Arithmetic_kernel AK_; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); }{ typedef CGAL::Polynomial > POLY; typedef typename CGAL::Get_arithmetic_kernel::Arithmetic_kernel AK_; - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); } } diff --git a/Polynomial/test/Polynomial/Polynomial_type_generator.cpp b/Polynomial/test/Polynomial/Polynomial_type_generator.cpp index 8b8e6e62e58..e29a074151e 100644 --- a/Polynomial/test/Polynomial/Polynomial_type_generator.cpp +++ b/Polynomial/test/Polynomial/Polynomial_type_generator.cpp @@ -10,14 +10,14 @@ int main(){ { typedef CGAL::Polynomial_type_generator::Type Polynomial; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); } { typedef CGAL::Polynomial_type_generator::Type Polynomial; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); } { typedef CGAL::Polynomial_type_generator::Type Polynomial; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); } } diff --git a/Polynomial/test/Polynomial/test_polynomial.h b/Polynomial/test/Polynomial/test_polynomial.h index d7a97807dbd..57babaaac6a 100644 --- a/Polynomial/test/Polynomial/test_polynomial.h +++ b/Polynomial/test/Polynomial/test_polynomial.h @@ -35,7 +35,7 @@ inline void convert_to(const NT& x, RT& r){ typedef CGAL::Coercion_traits CT; typedef typename CT::Coercion_type RET; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); r = typename CT::Cast()(x); } } //namespace CGAL @@ -879,7 +879,7 @@ void test_scalar_factor_traits(){ typedef CGAL::Scalar_factor_traits SFT; typedef typename AT::Integer Scalar; typedef typename SFT::Scalar Scalar_; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); typename SFT::Scalar_factor sfac; @@ -905,7 +905,7 @@ void test_scalar_factor_traits(){ typedef CGAL::Scalar_factor_traits SFT; typedef typename AT::Integer Scalar; typedef typename SFT::Scalar Scalar_; - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); typename SFT::Scalar_factor sfac; diff --git a/Ridges_3/include/CGAL/Ridges.h b/Ridges_3/include/CGAL/Ridges.h index 9144593c5df..2fe457b7835 100644 --- a/Ridges_3/include/CGAL/Ridges.h +++ b/Ridges_3/include/CGAL/Ridges.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include namespace CGAL { @@ -201,10 +201,10 @@ class Ridge_approximation typedef typename TriangulatedSurfaceMesh::Facet_const_iterator Facet_const_iterator; //requirements for the templates TriangulatedSurfaceMesh and Vertex2FTPropertyMap or Vertex2VectorPropertyMap - BOOST_STATIC_ASSERT((boost::is_same::value)); - BOOST_STATIC_ASSERT((boost::is_same::value)); - BOOST_STATIC_ASSERT((boost::is_same::value)); - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); typedef std::pair< Halfedge_const_handle, FT> Ridge_halfhedge; typedef CGAL::Ridge_line Ridge_line; diff --git a/Ridges_3/include/CGAL/Umbilics.h b/Ridges_3/include/CGAL/Umbilics.h index e6d3d234e1f..d87871cc971 100644 --- a/Ridges_3/include/CGAL/Umbilics.h +++ b/Ridges_3/include/CGAL/Umbilics.h @@ -96,10 +96,10 @@ template < class TriangulatedSurfaceMesh, typedef typename TriangulatedSurfaceMesh::Vertex_const_iterator Vertex_const_iterator; //requirements for the templates TriangulatedSurfaceMesh and Vertex2FTPropertyMap or Vertex2VectorPropertyMap - BOOST_STATIC_ASSERT((boost::is_same::value)); - BOOST_STATIC_ASSERT((boost::is_same::value)); - BOOST_STATIC_ASSERT((boost::is_same::value)); - BOOST_STATIC_ASSERT((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); + CGAL_static_assertion((boost::is_same::value)); typedef CGAL::Umbilic Umbilic; diff --git a/STL_Extension/include/CGAL/Handle_with_policy.h b/STL_Extension/include/CGAL/Handle_with_policy.h index 8f89a75a5e5..64492a07654 100644 --- a/STL_Extension/include/CGAL/Handle_with_policy.h +++ b/STL_Extension/include/CGAL/Handle_with_policy.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include @@ -364,7 +364,7 @@ namespace Intern { typedef typename T::Allocator Alloc; typedef ::CGAL::Reference_counted_hierarchy_with_union Reference_counted_hierarchy_with_union; - BOOST_STATIC_ASSERT(( + CGAL_static_assertion(( ::CGAL::is_same_or_derived< Reference_counted_hierarchy_with_union, T >::value )); } typedef T Rep; @@ -768,7 +768,7 @@ private: static Rep_allocator allocator; static Rep* new_rep( const Rep& rep) { - BOOST_STATIC_ASSERT( !( + CGAL_static_assertion( !( ::CGAL::is_same_or_derived< Reference_counted_hierarchy_base, Handled_type >::value )); Rep* p = allocator.allocate(1); allocator.construct(p, rep); @@ -863,7 +863,7 @@ protected: //! argument, and the single argument template constructor no other //! constructor will work for class hierarchies of representations. Handle_with_policy( Rep* p) : ptr_( p) { - BOOST_STATIC_ASSERT(( + CGAL_static_assertion(( ::CGAL::is_same_or_derived< Reference_counted_hierarchy_base, Handled_type >::value )); //Bind bind_; // trigger compile-time check //(void)bind_; @@ -877,7 +877,7 @@ protected: //! version of \c initialize_with is applicable in this case except //! the template version with one argument. void initialize_with( Rep* p) { - BOOST_STATIC_ASSERT(( + CGAL_static_assertion(( ::CGAL::is_same_or_derived< Reference_counted_hierarchy_base, Handled_type >::value )); //Bind bind_; // trigger compile-time check //(void)bind_; diff --git a/STL_Extension/test/STL_Extension/test_Cache.cpp b/STL_Extension/test/STL_Extension/test_Cache.cpp index 61f1e209eb9..8b44a30cf1c 100644 --- a/STL_Extension/test/STL_Extension/test_Cache.cpp +++ b/STL_Extension/test/STL_Extension/test_Cache.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include struct Int_rep { @@ -57,14 +57,14 @@ struct Int_t : public CGAL::Handle_with_policy< Int_rep, Unify > { void test_typedefs(){ typedef CGAL::Cache Cache; - BOOST_STATIC_ASSERT(( ::boost::is_same< Cache::Input, int >::value )); - BOOST_STATIC_ASSERT(( ::boost::is_same< Cache::Output,double>::value )); + CGAL_static_assertion(( ::boost::is_same< Cache::Input, int >::value )); + CGAL_static_assertion(( ::boost::is_same< Cache::Output,double>::value )); typedef CGAL::Creator_1 Creator_double; - BOOST_STATIC_ASSERT(( ::boost::is_same::value )); + CGAL_static_assertion(( ::boost::is_same::value )); typedef CGAL::Creator_1 Creator_int; - BOOST_STATIC_ASSERT(( ::boost::is_same::value )); - BOOST_STATIC_ASSERT(( ::boost::is_same >::value )); - BOOST_STATIC_ASSERT(( ::boost::is_same >::value )); + CGAL_static_assertion(( ::boost::is_same::value )); + CGAL_static_assertion(( ::boost::is_same >::value )); + CGAL_static_assertion(( ::boost::is_same >::value )); } int main(){ { diff --git a/STL_Extension/test/STL_Extension/test_stl_extension.cpp b/STL_Extension/test/STL_Extension/test_stl_extension.cpp index 1e635007171..da3a20cdc27 100644 --- a/STL_Extension/test/STL_Extension/test_stl_extension.cpp +++ b/STL_Extension/test/STL_Extension/test_stl_extension.cpp @@ -8994,10 +8994,10 @@ void test_tuple(){ typedef CGAL::cpp0x::tuple T2; - BOOST_STATIC_ASSERT( CGAL::cpp0x::tuple_size::value == 0 ); - BOOST_STATIC_ASSERT( CGAL::cpp0x::tuple_size::value == 2 ); - BOOST_STATIC_ASSERT( CGAL::cpp0x::tuple_size::value == 4 ); - BOOST_STATIC_ASSERT( (boost::is_same::type,My_to_int>::value) ); + CGAL_static_assertion( CGAL::cpp0x::tuple_size::value == 0 ); + CGAL_static_assertion( CGAL::cpp0x::tuple_size::value == 2 ); + CGAL_static_assertion( CGAL::cpp0x::tuple_size::value == 4 ); + CGAL_static_assertion( (boost::is_same::type,My_to_int>::value) ); T1 t1=CGAL::cpp0x::make_tuple(1,2); int i1=-1,i2=-1; diff --git a/Surface_mesher/include/CGAL/Point_traits.h b/Surface_mesher/include/CGAL/Point_traits.h index 712dd2ae233..96879525193 100644 --- a/Surface_mesher/include/CGAL/Point_traits.h +++ b/Surface_mesher/include/CGAL/Point_traits.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include namespace CGAL { diff --git a/Surface_mesher/include/CGAL/Surface_mesher/Combining_oracle.h b/Surface_mesher/include/CGAL/Surface_mesher/Combining_oracle.h index 6d8e552cd21..81482e86483 100644 --- a/Surface_mesher/include/CGAL/Surface_mesher/Combining_oracle.h +++ b/Surface_mesher/include/CGAL/Surface_mesher/Combining_oracle.h @@ -26,7 +26,7 @@ #include -#include +#include #include namespace CGAL { @@ -53,7 +53,7 @@ namespace CGAL { typedef typename Oracle_a::Intersection_point Intersection_point; - BOOST_STATIC_ASSERT((::boost::is_same< + CGAL_static_assertion((::boost::is_same< Intersection_point, typename Oracle_b::Intersection_point>::value)); diff --git a/Surface_mesher/include/CGAL/Weighted_point_with_surface_index.h b/Surface_mesher/include/CGAL/Weighted_point_with_surface_index.h index 9dbfcc45c50..70269987ab5 100644 --- a/Surface_mesher/include/CGAL/Weighted_point_with_surface_index.h +++ b/Surface_mesher/include/CGAL/Weighted_point_with_surface_index.h @@ -21,7 +21,7 @@ #define CGAL_WEIGHTED_POINT_WITH_SURFACE_INDEX_H #include -#include +#include #include #include @@ -36,10 +36,10 @@ class Weighted_point_with_surface_index : public Weighted_point typedef typename Point_traits::Bare_point Bare_point; typedef typename Kernel_traits::Kernel::FT FT; - BOOST_STATIC_ASSERT((Is_weighted::value)); - BOOST_STATIC_ASSERT((::boost::is_same::value)); + CGAL_static_assertion((::boost::is_same::value)); - BOOST_STATIC_ASSERT((::boost::is_same::value)); public: