Merge pull request #122 from bchretien/fix/build-gcc-8

Fix build for gcc 8
roboptim · Jul 1, 2018 · 8c6e84a · 8c6e84a
2 parents b57fe17 + 1be9921
commit 8c6e84a
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/.travis b/.travis
diff --git a/.travis.yml b/.travis.yml
@@ -33,12 +33,12 @@ script:
   - if [ "${COVERITY_SCAN_BRANCH}" != "1" ]; then ./.travis/run build; fi
 after_success:
   - ./.travis/run after_success
-  - codecov --gcov-root=/tmp/_ci/build
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then codecov --gcov-root=/tmp/_ci/build ; fi
 after_failure: ./.travis/run after_failure
 before_install:
   # Avoid bug on CI with OSX, see https://github.com/travis-ci/travis-ci/issues/8552
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
-  - pip install --user codecov
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pip install --user codecov ; fi
   - ./.travis/run  before_install
   - ./.travis/dependencies/eigen-${EIGEN_MAJOR}
 

diff --git a/cmake b/cmake
diff --git a/include/roboptim/core/detail/structured-input.hxx b/include/roboptim/core/detail/structured-input.hxx
@@ -58,7 +58,9 @@ namespace roboptim
     {
       assert(blockInd < BlockProvider::blocks.size());
 
-      return input.segment(static_cast<long>(BlockProvider::blocks[blockInd].first), static_cast<long>(BlockProvider::blocks[blockInd].second));
+      const std::pair<size_t, size_t>& block = this->BlockProvider::blocks[blockInd];
+      return input.segment(static_cast<typename U::argument_t::Index>(block.first),
+                           static_cast<typename U::argument_t::Index>(block.second));
     }
 
     template<typename FuncType>

diff --git a/include/roboptim/core/differentiable-function.hxx b/include/roboptim/core/differentiable-function.hxx
@@ -52,7 +52,7 @@ namespace roboptim
         for (gradient_t::InnerIterator it (grad); it; ++it)
           {
             const index_t
-              idx = static_cast<const jacobian_t::Index> (it.index ());
+              idx = static_cast<jacobian_t::Index> (it.index ());
             coefficients.push_back
               (triplet_t (i, idx, it.value ()));
           }

diff --git a/include/roboptim/core/problem.hxx b/include/roboptim/core/problem.hxx
@@ -518,7 +518,7 @@ namespace roboptim
   }
 
   template <>
-  inline typename Problem<EigenMatrixSparse>::jacobian_t
+  inline Problem<EigenMatrixSparse>::jacobian_t
   Problem<EigenMatrixSparse>::jacobian (const_argument_ref x) const
   {
     typedef GenericDifferentiableFunction<EigenMatrixSparse>

diff --git a/include/roboptim/core/result-analyzer.hxx b/include/roboptim/core/result-analyzer.hxx
@@ -289,7 +289,7 @@ namespace roboptim
   }
 
   template <>
-  inline typename ResultAnalyzer<EigenMatrixSparse>::size_type
+  inline ResultAnalyzer<EigenMatrixSparse>::size_type
   ResultAnalyzer<EigenMatrixSparse>::computeRank (jacobian_t& jac) const
   {
     if (jac.nonZeros () == 0)
@@ -428,7 +428,7 @@ namespace roboptim
   }
 
   template <>
-  typename ResultAnalyzer<EigenMatrixSparse>::gradient_t
+  ResultAnalyzer<EigenMatrixSparse>::gradient_t
   inline ResultAnalyzer<EigenMatrixSparse>::gradLagrangian () const
   {
     gradient_t grad_L;
+177 −0		.docs/Makefile
+4 −0		.docs/_static/css/cmake.css
+407 −0		.docs/cmake.py
+317 −0		.docs/conf.py
+16 −0		.docs/examples/minimal.cmake
+37 −0		.docs/index.rst
+18 −0		.docs/pages/base.rst
+54 −0		.docs/pages/dependencies.rst
+70 −0		.docs/pages/developers.rst
+8 −0		.docs/pages/internal.rst
+27 −0		.docs/pages/other.rst
+6 −0		README.md
+36 −0		apple.cmake
+66 −28		base.cmake
+102 −30		boost.cmake
+21 −12		config.h.cmake
+21 −12		config.hh.cmake
+20 −11		deprecated.hh.cmake
+10 −8		dist.cmake
+19 −16		distcheck.cmake
+17 −0		doxygen.cmake
+3 −3		doxygen/Doxyfile.in
+7 −7		eigen.cmake
+43 −30		header.cmake
+46 −1		ide.cmake
+55 −36		idl.cmake
+160 −110		pkg-config.cmake
+58 −36		python.cmake
+30 −17		release.cmake
+53 −16		test.cmake
+32 −30		version.cmake
+20 −11		warning.hh.cmake
+11 −10		xacro.cmake