forked from bartvdbraak/blender
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.
This commit is contained in:
parent
ae32a538dd
commit
2f5df4631d
@ -67,19 +67,19 @@ public:
|
|||||||
* Returns the timer callback.
|
* Returns the timer callback.
|
||||||
* @return The timer callback.
|
* @return The timer callback.
|
||||||
*/
|
*/
|
||||||
inline virtual GHOST_TimerProcPtr getTimerProc() const = 0;
|
virtual GHOST_TimerProcPtr getTimerProc() const = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Changes the timer callback.
|
* Changes the timer callback.
|
||||||
* @param timerProc 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.
|
* Returns the timer user data.
|
||||||
* @return 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.
|
* Changes the time user data.
|
||||||
|
@ -79,7 +79,7 @@ public:
|
|||||||
* Returns the type of drawing context used in this window.
|
* Returns the type of drawing context used in this window.
|
||||||
* @return The current type of drawing context.
|
* @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.
|
* Tries to install a rendering context in this window.
|
||||||
@ -193,7 +193,7 @@ public:
|
|||||||
* Returns the window user data.
|
* Returns the window user data.
|
||||||
* @return 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.
|
* Changes the window user data.
|
||||||
|
@ -39,11 +39,14 @@
|
|||||||
#include <list>
|
#include <list>
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
typedef struct {
|
class IK_QSolver {
|
||||||
|
public:
|
||||||
|
IK_QSolver() {};
|
||||||
|
|
||||||
IK_QJacobianSolver solver;
|
IK_QJacobianSolver solver;
|
||||||
IK_QSegment *root;
|
IK_QSegment *root;
|
||||||
std::list<IK_QTask*> tasks;
|
std::list<IK_QTask*> tasks;
|
||||||
} IK_QSolver;
|
};
|
||||||
|
|
||||||
IK_QSegment *CreateSegment(int flag, bool translate)
|
IK_QSegment *CreateSegment(int flag, bool translate)
|
||||||
{
|
{
|
||||||
|
@ -39,7 +39,6 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <strstream>
|
|
||||||
#ifdef TNT_USE_REGIONS
|
#ifdef TNT_USE_REGIONS
|
||||||
#include "region2d.h"
|
#include "region2d.h"
|
||||||
#endif
|
#endif
|
||||||
@ -204,19 +203,7 @@ class Matrix
|
|||||||
copy(v);
|
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
|
// destructor
|
||||||
//
|
//
|
||||||
~Matrix()
|
~Matrix()
|
||||||
|
@ -38,7 +38,6 @@
|
|||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <strstream>
|
|
||||||
#ifdef TNT_USE_REGIONS
|
#ifdef TNT_USE_REGIONS
|
||||||
#include "region2d.h"
|
#include "region2d.h"
|
||||||
#endif
|
#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
|
// destructor
|
||||||
~Fortran_Matrix()
|
~Fortran_Matrix()
|
||||||
{
|
{
|
||||||
|
@ -39,7 +39,6 @@
|
|||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <strstream>
|
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
|
@ -37,7 +37,6 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <strstream>
|
|
||||||
|
|
||||||
namespace TNT
|
namespace TNT
|
||||||
{
|
{
|
||||||
@ -186,17 +185,6 @@ class Vector
|
|||||||
copy(v);
|
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
|
// methods
|
||||||
//
|
//
|
||||||
|
@ -33,7 +33,6 @@
|
|||||||
|
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <strstream>
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
|
||||||
#include "subscript.h"
|
#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)
|
Vector_Adaptor(Subscript N, const T& value = T()) : v_(N)
|
||||||
{
|
{
|
||||||
for (Subscript i=0; i<N; i++)
|
for (Subscript i=0; i<N; i++)
|
||||||
|
@ -54,11 +54,11 @@ struct MEM_Allocator
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
MEM_Allocator() throw() {}
|
MEM_Allocator() throw() {}
|
||||||
MEM_Allocator(const MEM_Allocator& __a) throw() {}
|
MEM_Allocator(const MEM_Allocator&) throw() {}
|
||||||
|
|
||||||
#ifndef MS_VISUALC_6_0_WORKAROUND
|
#ifndef MS_VISUALC_6_0_WORKAROUND
|
||||||
template<typename _Tp1>
|
template<typename _Tp1>
|
||||||
MEM_Allocator(const MEM_Allocator<_Tp1> __a) throw() { }
|
MEM_Allocator(const MEM_Allocator<_Tp1>) throw() { }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
~MEM_Allocator() throw() {}
|
~MEM_Allocator() throw() {}
|
||||||
|
@ -140,7 +140,7 @@ protected :
|
|||||||
};
|
};
|
||||||
|
|
||||||
MEM_RefCountable (
|
MEM_RefCountable (
|
||||||
const MEM_RefCountable & other
|
const MEM_RefCountable &
|
||||||
) :
|
) :
|
||||||
m_count (0)
|
m_count (0)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user