From 2f5df4631d2e72afe54380148335f1b6d2fb2ed2 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sat, 4 Mar 2006 16:23:15 +0000 Subject: [PATCH] Fixes for some gcc 4 warnings in intern/. More than 100 lines of warnings for 2 unused parameters in templated c++ code, that's just ridiculous. --- intern/ghost/GHOST_ITimerTask.h | 6 +++--- intern/ghost/GHOST_IWindow.h | 4 ++-- intern/iksolver/intern/IK_Solver.cpp | 7 +++++-- intern/iksolver/intern/TNT/cmat.h | 13 ------------- intern/iksolver/intern/TNT/fmat.h | 13 ------------- intern/iksolver/intern/TNT/fspvec.h | 1 - intern/iksolver/intern/TNT/vec.h | 12 ------------ intern/iksolver/intern/TNT/vecadaptor.h | 10 ---------- intern/memutil/MEM_Allocator.h | 4 ++-- intern/memutil/MEM_RefCountPtr.h | 2 +- 10 files changed, 13 insertions(+), 59 deletions(-) diff --git a/intern/ghost/GHOST_ITimerTask.h b/intern/ghost/GHOST_ITimerTask.h index 61a2b83011b..fa2f788823f 100644 --- a/intern/ghost/GHOST_ITimerTask.h +++ b/intern/ghost/GHOST_ITimerTask.h @@ -67,19 +67,19 @@ public: * Returns the timer callback. * @return The timer callback. */ - inline virtual GHOST_TimerProcPtr getTimerProc() const = 0; + virtual GHOST_TimerProcPtr getTimerProc() const = 0; /** * Changes the timer callback. * @param timerProc The timer callback. */ - inline virtual void setTimerProc(const GHOST_TimerProcPtr timerProc) = 0; + virtual void setTimerProc(const GHOST_TimerProcPtr timerProc) = 0; /** * Returns the timer user data. * @return The timer user data. */ - inline virtual GHOST_TUserDataPtr getUserData() const = 0; + virtual GHOST_TUserDataPtr getUserData() const = 0; /** * Changes the time user data. diff --git a/intern/ghost/GHOST_IWindow.h b/intern/ghost/GHOST_IWindow.h index bd15df3dba8..903d1e4498d 100644 --- a/intern/ghost/GHOST_IWindow.h +++ b/intern/ghost/GHOST_IWindow.h @@ -79,7 +79,7 @@ public: * Returns the type of drawing context used in this window. * @return The current type of drawing context. */ - inline virtual GHOST_TDrawingContextType getDrawingContextType() = 0; + virtual GHOST_TDrawingContextType getDrawingContextType() = 0; /** * Tries to install a rendering context in this window. @@ -193,7 +193,7 @@ public: * Returns the window user data. * @return The window user data. */ - inline virtual GHOST_TUserDataPtr getUserData() const = 0; + virtual GHOST_TUserDataPtr getUserData() const = 0; /** * Changes the window user data. diff --git a/intern/iksolver/intern/IK_Solver.cpp b/intern/iksolver/intern/IK_Solver.cpp index 23960a9550b..919eeb739ce 100644 --- a/intern/iksolver/intern/IK_Solver.cpp +++ b/intern/iksolver/intern/IK_Solver.cpp @@ -39,11 +39,14 @@ #include using namespace std; -typedef struct { +class IK_QSolver { +public: + IK_QSolver() {}; + IK_QJacobianSolver solver; IK_QSegment *root; std::list tasks; -} IK_QSolver; +}; IK_QSegment *CreateSegment(int flag, bool translate) { diff --git a/intern/iksolver/intern/TNT/cmat.h b/intern/iksolver/intern/TNT/cmat.h index 46eb1100475..c6d701b30fc 100644 --- a/intern/iksolver/intern/TNT/cmat.h +++ b/intern/iksolver/intern/TNT/cmat.h @@ -39,7 +39,6 @@ #include #include #include -#include #ifdef TNT_USE_REGIONS #include "region2d.h" #endif @@ -204,19 +203,7 @@ class Matrix copy(v); } - Matrix(Subscript M, Subscript N, const char *s) - { - initialize(M,N); - std::istrstream ins(s); - Subscript i, j; - - for (i=0; i> row_[i][j]; - } - - // destructor // ~Matrix() diff --git a/intern/iksolver/intern/TNT/fmat.h b/intern/iksolver/intern/TNT/fmat.h index eb5531815eb..daba50c993f 100644 --- a/intern/iksolver/intern/TNT/fmat.h +++ b/intern/iksolver/intern/TNT/fmat.h @@ -38,7 +38,6 @@ #include #include #include -#include #ifdef TNT_USE_REGIONS #include "region2d.h" #endif @@ -198,18 +197,6 @@ class Fortran_Matrix } - Fortran_Matrix(Subscript M, Subscript N, char *s) - { - initialize(M,N); - std::istrstream ins(s); - - Subscript i, j; - - for (i=1; i<=M; i++) - for (j=1; j<=N; j++) - ins >> (*this)(i,j); - } - // destructor ~Fortran_Matrix() { diff --git a/intern/iksolver/intern/TNT/fspvec.h b/intern/iksolver/intern/TNT/fspvec.h index 7ebba6f882d..1fafccdfe93 100644 --- a/intern/iksolver/intern/TNT/fspvec.h +++ b/intern/iksolver/intern/TNT/fspvec.h @@ -39,7 +39,6 @@ #include #include #include -#include using namespace std; diff --git a/intern/iksolver/intern/TNT/vec.h b/intern/iksolver/intern/TNT/vec.h index d4f7c2f4021..1729d83ca10 100644 --- a/intern/iksolver/intern/TNT/vec.h +++ b/intern/iksolver/intern/TNT/vec.h @@ -37,7 +37,6 @@ #include #include #include -#include namespace TNT { @@ -186,17 +185,6 @@ class Vector copy(v); } - Vector(Subscript N, char *s) : v_(0), vm1_(0), n_(0) - { - initialize(N); - std::istrstream ins(s); - - Subscript i; - - for (i=0; i> v_[i]; - } - // methods // diff --git a/intern/iksolver/intern/TNT/vecadaptor.h b/intern/iksolver/intern/TNT/vecadaptor.h index fc5930c1b4f..ef2e66f19e0 100644 --- a/intern/iksolver/intern/TNT/vecadaptor.h +++ b/intern/iksolver/intern/TNT/vecadaptor.h @@ -33,7 +33,6 @@ #include #include -#include #include #include "subscript.h" @@ -117,15 +116,6 @@ class Vector_Adaptor } - Vector_Adaptor(Subscript N, /*const*/ char *s) : v_(N) - { - istrstream ins(s); - for (Subscript i=0; i> v_[i] ; - - vm1_ = ( v_.size() > 0 ? &(v_[0]) -1 : NULL); - }; - Vector_Adaptor(Subscript N, const T& value = T()) : v_(N) { for (Subscript i=0; i - MEM_Allocator(const MEM_Allocator<_Tp1> __a) throw() { } + MEM_Allocator(const MEM_Allocator<_Tp1>) throw() { } #endif ~MEM_Allocator() throw() {} diff --git a/intern/memutil/MEM_RefCountPtr.h b/intern/memutil/MEM_RefCountPtr.h index f71d9902a05..042c90fa0cb 100644 --- a/intern/memutil/MEM_RefCountPtr.h +++ b/intern/memutil/MEM_RefCountPtr.h @@ -140,7 +140,7 @@ protected : }; MEM_RefCountable ( - const MEM_RefCountable & other + const MEM_RefCountable & ) : m_count (0) {