diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-09-25 13:33:46 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-09-25 13:33:46 +0400 |
commit | 5eecb2ab48547449cfd9d668b92cb257bbd8da86 (patch) | |
tree | 62600c1a0cf6c64266e324264c5d25dc80e5b188 /intern/itasc/Armature.cpp | |
parent | 7c9bb3c40aecbb6e8e8045637c501433eed251f0 (diff) |
Warning fixes for ITASC. Also, use <stdlib.h> instead of <malloc.h>,
it works everywhere.
Diffstat (limited to 'intern/itasc/Armature.cpp')
-rw-r--r-- | intern/itasc/Armature.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/intern/itasc/Armature.cpp b/intern/itasc/Armature.cpp index 6ae60089cd8..7776b6aa3b6 100644 --- a/intern/itasc/Armature.cpp +++ b/intern/itasc/Armature.cpp @@ -8,9 +8,7 @@ #include "Armature.hpp" #include <algorithm> #include <string.h> -#ifndef __STDC__ -#include <malloc.h> -#endif +#include <stdlib.h> namespace iTaSC { @@ -37,9 +35,9 @@ Armature::Armature(): m_newqKdl(), m_qdotKdl(), m_jac(NULL), + m_armlength(0.0), m_jacsolver(NULL), - m_fksolver(NULL), - m_armlength(0.0) + m_fksolver(NULL) { } @@ -119,6 +117,8 @@ Armature::JointConstraint_struct::JointConstraint_struct(SegmentMap::const_itera values[1].id = value[1].id = ID_JOINT_RZ; v_nr = 2; break; + case Joint::None: + break; } } @@ -734,6 +734,8 @@ bool Armature::setControlParameter(unsigned int constraintId, unsigned int value case ACT_ALPHA: pConstraint->values[i].alpha = value; break; + default: + break; } } } else { @@ -755,6 +757,8 @@ bool Armature::setControlParameter(unsigned int constraintId, unsigned int value case ACT_ALPHA: pConstraint->values[i].alpha = value; break; + case ACT_NONE: + break; } } } |