songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Drop the include guard and remove assert_equal_types 

The include guard is unnecessary (tags.h is part of basic and no one
else defines it anymore) and it shouldn't be used anyway.

assert_equal_types doesn't do it's job completely and it's usage in
Nef_2 has been replaced.
This commit is contained in:
Philipp Möller 2012-11-17 01:56:05 +01:00
parent e2502e5b16
commit 09e65b9c40
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Nef_2/include/CGAL/Nef_2/PM_overlayer.h
View File

@ -34,6 +34,9 @@
#define CGAL_NEF_DEBUG 13 #define CGAL_NEF_DEBUG 13
#include <CGAL/Nef_2/debug.h> #include <CGAL/Nef_2/debug.h>
#include <boost/static_assert.hpp>
#include <boost/type_traits/is_same.hpp>
#ifndef CGAL_USE_LEDA #ifndef CGAL_USE_LEDA
#define LEDA_MEMORY(t) #define LEDA_MEMORY(t)
#endif #endif
@ -958,7 +961,8 @@ bool is_forward_edge(const Const_decorator& N,
void assert_type_precondition() const void assert_type_precondition() const
{ typename PM_decorator_::Point p1; Point p2; { typename PM_decorator_::Point p1; Point p2;
assert_equal_types(p1,p2); } BOOST_STATIC_ASSERT((boost::is_same<typename PM_decorator_::Point, Point>::value)); }

2
Nef_2/noweb/PM_overlayer.lw
View File

@ -1794,7 +1794,7 @@ the input properties of the overlay calculation operation from Section
<<helping operations>>= <<helping operations>>=
void assert_type_precondition() const void assert_type_precondition() const
{ typename PM_decorator_::Point p1; Point p2; { typename PM_decorator_::Point p1; Point p2;
assert_equal_types(p1,p2); } BOOST_STATIC_ASSERT((boost::is_same<typename PM_decorator_::Point, Point>::value)); }
<<PM_overlayer.h>>= <<PM_overlayer.h>>=

10
STL_Extension/include/CGAL/tags.h
View File

@ -57,10 +57,6 @@ struct Null_functor {
// A function that asserts a specific compile time tag // A function that asserts a specific compile time tag
// forcing its two arguments to have equal type. // forcing its two arguments to have equal type.
// It is encapsulated with #ifdef since it will be defined also elsewhere.
// ======================================================
#ifndef CGAL_ASSERT_COMPILE_TIME_TAG
#define CGAL_ASSERT_COMPILE_TIME_TAG 1
template <class Base> template <class Base>
struct Assert_tag_class struct Assert_tag_class
{ {
@ -75,12 +71,6 @@ Assert_compile_time_tag( const Tag&, const Derived& b)
Assert_tag_class<Tag> x; Assert_tag_class<Tag> x;
x.match_compile_time_tag(b); x.match_compile_time_tag(b);
} }
#endif // CGAL_ASSERT_COMPILE_TIME_TAG
template < class T>
inline
void
assert_equal_types( const T&, const T&) {}
} //namespace CGAL } //namespace CGAL