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

Removed excess ';' from end of template functions, for gcc compiling

This commit is contained in:
Paolo Cignoni 2005-12-01 01:03:37 +00:00
parent 0863ff9364
commit 6d5c0cd0f7
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vcg/math/base.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.18 2004/08/31 15:42:59 fasano
Aggiunte macro sin/cos/atan per C++ Builder
Revision 1.17 2004/05/10 13:00:14 ganovelli Revision 1.17 2004/05/10 13:00:14 ganovelli
limits function cancelled limits function cancelled
@ -123,21 +126,21 @@ namespace math {
template<class T> inline const T & Min(const T &a, const T &b){ template<class T> inline const T & Min(const T &a, const T &b){
if (a<b) return a; else return b; if (a<b) return a; else return b;
}; }
template<class T> inline const T & Max(const T &a, const T &b){ template<class T> inline const T & Max(const T &a, const T &b){
if (a<b) return b; else return a; if (a<b) return b; else return a;
}; }
template<class T> inline void Swap(T &a, T &b){ template<class T> inline void Swap(T &a, T &b){
T tmp=a; a=b; b=tmp; T tmp=a; a=b; b=tmp;
}; }
template<class T> inline void Sort(T &a, T &b){ template<class T> inline void Sort(T &a, T &b){
if (a>b) Swap(a,b); if (a>b) Swap(a,b);
}; }
template<class T> inline void Sort(T &a, T &b, T &c){ template<class T> inline void Sort(T &a, T &b, T &c){
if (a>b) Swap(a,b); if (a>b) Swap(a,b);
if (b>c) {Swap(b,c); if (a>b) Swap(a,b);} if (b>c) {Swap(b,c); if (a>b) Swap(a,b);}
}; }
/* Some <math.h> files do not define M_PI... */ /* Some <math.h> files do not define M_PI... */
#ifndef M_PI #ifndef M_PI

5
vcg/math/camera.h
View File

@ -23,6 +23,9 @@
/**************************************************************************** /****************************************************************************
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.23 2005/10/12 16:43:32 ponchio
Added IsOrtho...
Revision 1.22 2005/07/11 13:12:34 cignoni Revision 1.22 2005/07/11 13:12:34 cignoni
small gcc-related compiling issues (typenames,ending cr, initialization order) small gcc-related compiling issues (typenames,ending cr, initialization order)
@ -324,7 +327,7 @@ template<class S>
fr = farend; fr = farend;
} }
}; }
#endif #endif

5
vcg/math/shot.h
View File

@ -23,6 +23,9 @@
/**************************************************************************** /****************************************************************************
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.14 2005/11/23 14:18:35 ganovelli
added access to similarity (just for symmetry with Camera() )
Revision 1.13 2005/11/23 11:58:52 ganovelli Revision 1.13 2005/11/23 11:58:52 ganovelli
Empty constructor added, untemplated class Shotf and Shotd added Empty constructor added, untemplated class Shotf and Shotd added
usage: Shotf myShot; usage: Shotf myShot;
@ -224,7 +227,7 @@ S Shot<S>::Depth(const vcg::Point3<S> & p)const {
class Shotf: public Shot<float>{}; class Shotf: public Shot<float>{};
class Shotd: public Shot<double>{}; class Shotd: public Shot<double>{};
}; } // end name space
#endif #endif