Removes remaining initializer_list

include/sot/torque_control/admittance-controller.hh

@@ -41,7 +41,6 @@
 #include <sot/torque_control/utils/logger.hh>
 #include <sot/torque_control/common.hh>
 #include <map>
-#include <initializer_list>
 #include "boost/assign.hpp"
 
 #include <tsid/robots/robot-wrapper.hpp>

include/sot/torque_control/current-controller.hh

@@ -41,7 +41,6 @@
 #include <sot/torque_control/utils/logger.hh>
 #include <sot/torque_control/common.hh>
 #include <map>
-#include <initializer_list>
 #include "boost/assign.hpp"
 
 

include/sot/torque_control/nd-trajectory-generator.hh

@@ -36,10 +36,6 @@
 /* --- INCLUDE --------------------------------------------------------- */
 /* --------------------------------------------------------------------- */
 
-#include <sot/torque_control/signal-helper.hh>
-#include <sot/torque_control/utils/vector-conversions.hh>
-#include <sot/torque_control/utils/logger.hh>
-//#include <sot/torque_control/utils/trajectory-generators.hh>
 
 #include <parametric-curves/spline.hpp>
 #include <parametric-curves/constant.hpp>
@@ -49,6 +45,11 @@
 #include <parametric-curves/infinite-sinusoid.hpp>
 #include <parametric-curves/infinite-const-acc.hpp>
 
+#include <sot/torque_control/signal-helper.hh>
+#include <sot/torque_control/utils/vector-conversions.hh>
+#include <sot/torque_control/utils/logger.hh>
+//#include <sot/torque_control/utils/trajectory-generators.hh>
+
 #include <map>
 #include "boost/assign.hpp"
 

src/common.cpp

@@ -277,8 +277,8 @@ namespace dynamicgraph
       bool RobotUtil::
       joints_sot_to_urdf(Eigen::ConstRefVector q_sot, Eigen::RefVector q_urdf)
       {
-	assert(q_urdf.size()==static_cast<Eigen::Index>(m_nbJoints));
-	assert(q_sot.size()==static_cast<Eigen::Index>(m_nbJoints));
+	assert(q_urdf.size()==static_cast<Eigen::VectorXd::Index>(m_nbJoints));
+	assert(q_sot.size()==static_cast<Eigen::VectorXd::Index>(m_nbJoints));
 
 	if (m_nbJoints==0)
 	  {