Warning fixes for gcc 4 in iksolver and ghost.

This commit is contained in:
Brecht Van Lommel 2006-01-10 11:49:53 +00:00
parent dd7e0b6bfe
commit 25225dc959
8 changed files with 10 additions and 56 deletions

@ -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.

@ -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.

@ -39,11 +39,14 @@
#include <list>
using namespace std;
typedef struct {
class IK_QSolver {
public:
IK_QSolver() {};
IK_QJacobianSolver solver;
IK_QSegment *root;
std::list<IK_QTask*> tasks;
} IK_QSolver;
};
IK_QSegment *CreateSegment(int flag, bool translate)
{

@ -39,7 +39,6 @@
#include <stdlib.h>
#include <assert.h>
#include <iostream>
#include <strstream>
#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<M; i++)
for (j=0; j<N; j++)
ins >> row_[i][j];
}
// destructor
//
~Matrix()

@ -38,7 +38,6 @@
#include <cstdlib>
#include <cassert>
#include <iostream>
#include <strstream>
#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()
{

@ -39,7 +39,6 @@
#include <cstdlib>
#include <cassert>
#include <iostream>
#include <strstream>
using namespace std;

@ -37,7 +37,6 @@
#include <stdlib.h>
#include <assert.h>
#include <iostream>
#include <strstream>
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<N; i++)
ins >> v_[i];
}
// methods
//

@ -33,7 +33,6 @@
#include <cstdlib>
#include <iostream>
#include <strstream>
#include <cassert>
#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<N; i++)
ins >> 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<N; i++)