Warning fixes for ITASC. Also, use <stdlib.h> instead of <malloc.h>,

it works everywhere.

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;
 					}
 				}
 			}