Warning fixes for gcc 4 in iksolver and ghost.

diff --git a/intern/ghost/GHOST_ITimerTask.h b/intern/ghost/GHOST_ITimerTask.h
index 61a2b83011b662cf77901471248a873e89fb7431..fa2f788823fba3413ecda2176f53200cf5cd4b50 100644 (file)
--- 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 bd15df3dba8580bc0a15ac6a8cae826c7a2820d0..903d1e4498da24c566326eb54c849bf4ba0b7226 100644 (file)
--- 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 23960a9550b0eeedb6902209c4f44b670d8ab643..919eeb739ce08ef48160e82fa4959fce2be17e48 100644 (file)
--- a/intern/iksolver/intern/IK_Solver.cpp
+++ b/intern/iksolver/intern/IK_Solver.cpp
@@ -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)
 {

diff --git a/intern/iksolver/intern/TNT/cmat.h b/intern/iksolver/intern/TNT/cmat.h
index 46eb11004757853ee677eb1584a72759a43c5cf3..c6d701b30fcdc0a9eb70087a4ca8599c8f73e578 100644 (file)
--- a/intern/iksolver/intern/TNT/cmat.h
+++ b/intern/iksolver/intern/TNT/cmat.h
@@ -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()

diff --git a/intern/iksolver/intern/TNT/fmat.h b/intern/iksolver/intern/TNT/fmat.h
index eb5531815eb161ef2a12fd675f00d7762a872055..daba50c993f9774a9c981a8a2501ed6d4b6e2b2a 100644 (file)
--- a/intern/iksolver/intern/TNT/fmat.h
+++ b/intern/iksolver/intern/TNT/fmat.h
@@ -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()
     {

diff --git a/intern/iksolver/intern/TNT/fspvec.h b/intern/iksolver/intern/TNT/fspvec.h
index 7ebba6f882d1931cf41f9398e5b0654dbc9c331f..1fafccdfe935b52448f5f2eede87eecf167a1530 100644 (file)
--- a/intern/iksolver/intern/TNT/fspvec.h
+++ b/intern/iksolver/intern/TNT/fspvec.h
@@ -39,7 +39,6 @@
 #include <cstdlib>
 #include <cassert>
 #include <iostream>
-#include <strstream>
 
 using namespace std;
 

diff --git a/intern/iksolver/intern/TNT/vec.h b/intern/iksolver/intern/TNT/vec.h
index d4f7c2f40210a2ab7481aa7635c31061b36edea3..1729d83ca107ca23a765891009a56eb43fa3e38c 100644 (file)
--- a/intern/iksolver/intern/TNT/vec.h
+++ b/intern/iksolver/intern/TNT/vec.h
@@ -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
     // 

diff --git a/intern/iksolver/intern/TNT/vecadaptor.h b/intern/iksolver/intern/TNT/vecadaptor.h
index fc5930c1b4faa1730c69bf3d0f86145bd8e5ac6c..ef2e66f19e0056613ba3f6ef806f46c3782d1dfa 100644 (file)
--- a/intern/iksolver/intern/TNT/vecadaptor.h
+++ b/intern/iksolver/intern/TNT/vecadaptor.h
@@ -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++)