Merge pull request #1 from cmastalli/master

florent-lamiraux · web-flow · commit b4e112331836 · 2017-12-14T16:06:18.000+01:00
Fixe warning and disable Werror
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,6 +5,7 @@
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
+SET (CXX_DISABLE_WERROR ON)
 INCLUDE(cmake/base.cmake)
 INCLUDE(cmake/boost.cmake)
 INCLUDE(cmake/lapack.cmake)
diff --git a/src/feedback-controller.cc b/src/feedback-controller.cc
@@ -79,7 +79,7 @@ double& FeedbackController::computeForceFeedback(double& force,
 					"state signal size is ",
 					"%d, should be 4.",
 					state.size());
-  Vector v = -gain_ * state;
+  Vector v (-gain_ * state);
   force = v(0);
   return force;
 }

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ double& FeedbackController::computeForceFeedback(double& force,`
`79`	`79`	`"state signal size is ",`
`80`	`80`	`"%d, should be 4.",`
`81`	`81`	`state.size());`
`82`		`- Vector v = -gain_ * state;`
	`82`	`+ Vector v (-gain_ * state);`
`83`	`83`	`force = v(0);`
`84`	`84`	`return force;`
`85`	`85`	`}`