From 6d5c0cd0f7fcb2a5d72a2a2a77d60b59253345ef Mon Sep 17 00:00:00 2001 From: cignoni Date: Thu, 1 Dec 2005 01:03:37 +0000 Subject: [PATCH] Removed excess ';' from end of template functions, for gcc compiling --- vcg/math/base.h | 13 ++++++++----- vcg/math/camera.h | 5 ++++- vcg/math/shot.h | 5 ++++- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/vcg/math/base.h b/vcg/math/base.h index ff27a0c8..8d353db2 100644 --- a/vcg/math/base.h +++ b/vcg/math/base.h @@ -24,6 +24,9 @@ History $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 limits function cancelled @@ -123,21 +126,21 @@ namespace math { template inline const T & Min(const T &a, const T &b){ if (a inline const T & Max(const T &a, const T &b){ if (a inline void Swap(T &a, T &b){ T tmp=a; a=b; b=tmp; - }; + } template inline void Sort(T &a, T &b){ if (a>b) Swap(a,b); - }; + } template inline void Sort(T &a, T &b, T &c){ if (a>b) Swap(a,b); if (b>c) {Swap(b,c); if (a>b) Swap(a,b);} - }; + } /* Some files do not define M_PI... */ #ifndef M_PI diff --git a/vcg/math/camera.h b/vcg/math/camera.h index 5c85f1bf..9c53f2a3 100644 --- a/vcg/math/camera.h +++ b/vcg/math/camera.h @@ -23,6 +23,9 @@ /**************************************************************************** History $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 small gcc-related compiling issues (typenames,ending cr, initialization order) @@ -324,7 +327,7 @@ template fr = farend; } -}; +} #endif diff --git a/vcg/math/shot.h b/vcg/math/shot.h index 727d2840..1225f54e 100644 --- a/vcg/math/shot.h +++ b/vcg/math/shot.h @@ -23,6 +23,9 @@ /**************************************************************************** History $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 Empty constructor added, untemplated class Shotf and Shotd added usage: Shotf myShot; @@ -224,7 +227,7 @@ S Shot::Depth(const vcg::Point3 & p)const { class Shotf: public Shot{}; class Shotd: public Shot{}; -}; +} // end name space #endif