Commit 656554c7 authored by Olivier Stasse's avatar Olivier Stasse Committed by Guilhem Saurel
Browse files

Switch back to C++98.

parent 92a14296
...@@ -339,16 +339,17 @@ int PLDPSolver::BackwardSubstitution() { ...@@ -339,16 +339,17 @@ int PLDPSolver::BackwardSubstitution() {
// LL^t v2 = v1 <-> L y = v1 with L^t v2 = y // LL^t v2 = v1 <-> L y = v1 with L^t v2 = y
// y solved with first phase. // y solved with first phase.
// So now we are looking for v2. // So now we are looking for v2.
auto SizeOfL = m_ActivatedConstraints.size(); std::vector<unsigned int>::size_type SizeOfL = m_ActivatedConstraints.size();
if (SizeOfL == 0) if (SizeOfL == 0)
return 0; return 0;
ODEBUG("BackwardSubstitution " << m_ItNb); ODEBUG("BackwardSubstitution " << m_ItNb);
for(auto i = SizeOfL - 1;; i--) { for (std::vector<unsigned int>::size_type i = SizeOfL - 1;; i--) {
double tmp = 0.0; double tmp = 0.0;
m_v2[i] = m_y[i]; m_v2[i] = m_y[i];
for (auto k = i + 1; k < SizeOfL; k++) { for (std::vector<unsigned int>::size_type k = i + 1;
k < SizeOfL; k++) {
if (k == SizeOfL - 1) if (k == SizeOfL - 1)
tmp = m_v2[i]; tmp = m_v2[i];
......
...@@ -93,8 +93,8 @@ void UpperBodyMotion::ReadDataFile(string aFileName, ...@@ -93,8 +93,8 @@ void UpperBodyMotion::ReadDataFile(string aFileName,
std::ifstream aif; std::ifstream aif;
auto NumberRows = UpperBodyAngles.rows(); Eigen::MatrixXd::Index NumberRows = UpperBodyAngles.rows();
auto NumberColumns = UpperBodyAngles.cols(); Eigen::MatrixXd::Index NumberColumns = UpperBodyAngles.cols();
double r; double r;
...@@ -114,8 +114,8 @@ void UpperBodyMotion::ReadDataFile(string aFileName, ...@@ -114,8 +114,8 @@ void UpperBodyMotion::ReadDataFile(string aFileName,
void UpperBodyMotion::WriteDataFile(string aFileName, void UpperBodyMotion::WriteDataFile(string aFileName,
Eigen::MatrixXd &UpperBodyAngles) { Eigen::MatrixXd &UpperBodyAngles) {
ofstream aof; ofstream aof;
auto NumberRows = UpperBodyAngles.rows(); Eigen::MatrixXd::Index NumberRows = UpperBodyAngles.rows();
auto NumberColumns = UpperBodyAngles.cols(); Eigen::MatrixXd::Index NumberColumns = UpperBodyAngles.cols();
aof.open(aFileName.c_str(), ofstream::out); aof.open(aFileName.c_str(), ofstream::out);
if (aof.is_open()) { if (aof.is_open()) {
......
...@@ -114,12 +114,12 @@ bool SimplePluginManager::CallMethod(string &MethodName, istringstream &istrm) { ...@@ -114,12 +114,12 @@ bool SimplePluginManager::CallMethod(string &MethodName, istringstream &istrm) {
stringbuf *pbuf; stringbuf *pbuf;
pbuf = istrm.rdbuf(); pbuf = istrm.rdbuf();
auto size = pbuf->in_avail(); std::streamsize size = pbuf->in_avail();
char aBuffer[65636]; char aBuffer[65636];
assert(size < 65635); assert(size < 65635);
memset(aBuffer, 0, size + 1); memset(aBuffer, 0, size + 1);
for (int i = 0; i < size; i++) for (std::streamsize i = 0; i < size; i++)
aBuffer[i] = (char)pbuf->sbumpc(); aBuffer[i] = (char)pbuf->sbumpc();
ODEBUG5(aBuffer, "PgDebug.txt"); ODEBUG5(aBuffer, "PgDebug.txt");
......
Markdown is supported
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