manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removed a weird "#define static_assert assert" that was surviving since 2004...

This commit is contained in:
Paolo Cignoni 2013-03-22 16:43:59 +00:00
parent b51ee87470
commit 246345bf19
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vcg/math/base.h
View File

@ -91,10 +91,6 @@ Edited Comments and GPL license
#include <assert.h>
#include <limits>
/// static_assert: implemented as a macro for "assert", but it is separated for clarity.
/// Should be used for checking integrity constraints that can be tested at complile time,
/// as the ones involving templated constants in templated classes.
#define static_assert assert
#ifdef __BORLANDC__
float sqrtf (float v) {return sqrt(v);}
@ -114,7 +110,7 @@ namespace math {
class MagnitudoComparer
{
public:
inline bool operator() ( const SCALAR a, const SCALAR b ) { return fabs(a)>fabs(b); }
inline bool operator() ( const SCALAR a, const SCALAR b ) { return fabs(a)>fabs(b); }
};
inline float Sqrt(const short v) { return sqrtf(v); }
@ -136,7 +132,7 @@ namespace math {
inline double Asin(const double v) { return asin(v); }
inline double Atan2(const double v0,const double v1) { return atan2(v0,v1); }
template <typename T> inline static T Sqr(T a) { return a*a; }
template <typename T> inline static T Sqr(T a) { return a*a; }
template<class T> inline const T & Min(const T &a, const T &b,const T &c){
if (a<b) {
@ -146,7 +142,7 @@ namespace math {
if(b<c) return b;
else return c;
}
}
}
template<class T> inline const T & Max(const T &a, const T &b, const T &c){
if (a>b) {
if(a>c) return a;
@ -212,7 +208,7 @@ template<class T> int IsNAN(T t)
/// a type that stands for "void". Useful for Parameter type of a point.
class VoidType{ public:
VoidType(){};
VoidType(){};
};
} // End vcg namespace