Commit d9766b8f authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

[Format] set Standard to C++03

avoid this error when compiling in C++ < 11
> error: '>>' should be '> >' within a nested template argument list
parent 3b29ac4e
Pipeline #7156 failed with stage
in 17 minutes and 8 seconds
---
ColumnLimit: 80
Standard: C++03
...
......@@ -73,7 +73,7 @@ public:
void rewind(void);
protected:
typedef std::list<std::vector<double>> DataType;
typedef std::list<std::vector<double> > DataType;
DataType dataSet;
DataType::const_iterator currentData;
bool iteratorSet;
......
......@@ -35,7 +35,7 @@ using namespace dynamicgraph::sot;
typedef pinocchio::CartesianProductOperation<
pinocchio::VectorSpaceOperationTpl<3, double>,
pinocchio::SpecialOrthogonalOperationTpl<3, double>>
pinocchio::SpecialOrthogonalOperationTpl<3, double> >
R3xSO3_t;
typedef pinocchio::SpecialEuclideanOperationTpl<3, double> SE3_t;
template <Representation_t representation> struct LG_t {
......
......@@ -598,7 +598,8 @@ const double sotHouseholdMatrices::THRESHOLD = 1e-9;
/* ---------------------------------------------------------- */
typedef bub::triangular_adaptor<
bub::matrix_range<bub::matrix<double, boost::numeric::ublas::column_major>>,
bub::matrix_range<
bub::matrix<double, boost::numeric::ublas::column_major> >,
bub::upper>
MatrixTriSquare;
......@@ -733,11 +734,11 @@ dynamicgraph::Vector &SotQr::computeControlLaw(dynamicgraph::Vector &control,
if (rank1 < m1) // Rank deficiency
{
bub::matrix_range<
bub::matrix<double, boost::numeric::ublas::column_major>>
bub::matrix<double, boost::numeric::ublas::column_major> >
QR1sup(QR1, bub::range(0, rank1), bub::range(0, m1));
invGeneralizeCholeskiUpdate(QR1sup);
}
bub::matrix_range<bub::matrix<double, boost::numeric::ublas::column_major>>
bub::matrix_range<bub::matrix<double, boost::numeric::ublas::column_major> >
QR1sup(QR1, bub::range(0, rank1), bub::range(0, rank1));
const MatrixTriSquare R1(QR1sup);
......@@ -829,11 +830,11 @@ dynamicgraph::Vector &SotQr::computeControlLaw(dynamicgraph::Vector &control,
if (rank2 < m2) // Rank deficiency
{
bub::matrix_range<
bub::matrix<double, boost::numeric::ublas::column_major>>
bub::matrix<double, boost::numeric::ublas::column_major> >
QR2sup(QR2, bub::range(0, rank2), bub::range(0, m2));
invGeneralizeCholeskiUpdate(QR2sup);
}
bub::matrix_range<bub::matrix<double, boost::numeric::ublas::column_major>>
bub::matrix_range<bub::matrix<double, boost::numeric::ublas::column_major> >
QR2sup(QR2, bub::range(0, rank2), bub::range(0, rank2));
const MatrixTriSquare R2(QR2sup);
......
......@@ -55,12 +55,12 @@ BOOST_PYTHON_MODULE(robot_utils_sot_py) {
//.def("get_id_from_name",&RobotUtil::get_id_from_name)
;
class_<std::map<Index, ForceLimits>>("IndexForceLimits")
.def(map_indexing_suite<std::map<Index, ForceLimits>>());
class_<std::map<Index, ForceLimits> >("IndexForceLimits")
.def(map_indexing_suite<std::map<Index, ForceLimits> >());
class_<std::map<std::string, Index>>("stringIndex")
.def(map_indexing_suite<std::map<std::string, Index>>());
class_<std::map<std::string, Index> >("stringIndex")
.def(map_indexing_suite<std::map<std::string, Index> >());
class_<std::map<Index, std::string>>("Indexstring")
.def(map_indexing_suite<std::map<Index, std::string>>());
class_<std::map<Index, std::string> >("Indexstring")
.def(map_indexing_suite<std::map<Index, std::string> >());
}
......@@ -273,7 +273,7 @@ typedef pinocchio::SE3 SE3;
typedef pinocchio::SpecialEuclideanOperationTpl<3, double> SE3_t;
typedef pinocchio::CartesianProductOperation<
pinocchio::VectorSpaceOperationTpl<3, double>,
pinocchio::SpecialOrthogonalOperationTpl<3, double>>
pinocchio::SpecialOrthogonalOperationTpl<3, double> >
R3xSO3_t;
template <Representation_t representation> struct LG_t {
typedef typename boost::mpl::if_c<representation == SE3Representation, SE3_t,
......
......@@ -245,7 +245,8 @@ int main(int argc, char **argv) {
if (!ib) {
// sotDEBUG(15) << dynamicgraph::MATLAB <<"M = "<< M <<endl;
// sotDEBUG(15) << dynamicgraph::MATLAB <<"Mcreuse = "<< Mcreuse
//<<endl; sotDEBUG(15) << dynamicgraph::MATLAB <<"Minvnc = "<< Minv
//<<endl; sotDEBUG(15) << dynamicgraph::MATLAB <<"Minvnc = "<<
// Minv
//<<endl;
}
}
......@@ -296,7 +297,8 @@ int main(int argc, char **argv) {
{
// sotDEBUG(15) << dynamicgraph::MATLAB <<"M = "<< M <<endl;
// sotDEBUG(15) << dynamicgraph::MATLAB <<"Mcreuse = "<< Mcreuse
//<<endl; sotDEBUG(15) << dynamicgraph::MATLAB <<"Minvnc = "<< Minv
//<<endl; sotDEBUG(15) << dynamicgraph::MATLAB <<"Minvnc = "<<
// Minv
//<<endl;
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment