From 23a857aa4af02efa891ef3fbf0dfbb1558d0db87 Mon Sep 17 00:00:00 2001 From: Shunichi Nozawa Date: Sun, 29 Mar 2015 20:05:24 +0900 Subject: [PATCH] Check boost version in TorqueController. sign.hpp is added at 1.35 --- rtc/TorqueController/MotorTorqueController.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rtc/TorqueController/MotorTorqueController.cpp b/rtc/TorqueController/MotorTorqueController.cpp index 72c537f873a..e9fac7eef0b 100644 --- a/rtc/TorqueController/MotorTorqueController.cpp +++ b/rtc/TorqueController/MotorTorqueController.cpp @@ -12,7 +12,10 @@ // #include "util/Hrpsys.h" #include #include +#include +#if BOOST_VERSION >= 103500 #include +#endif #include #define TRANSITION_TIME 2.0 // [sec] @@ -187,7 +190,11 @@ double MotorTorqueController::execute (double _tau, double _tauMax) updateController(_tau, limitedTauRef, m_normalController); dq = m_normalController.getMotorControllerDq(); if (m_emergencyController.state != INACTIVE) { // overwrite by tauMax control when emergency mode +#if BOOST_VERSION >= 103500 limitedTauRef = boost::math::copysign(_tauMax, _tau); +#else + limitedTauRef = std::fabs(_tauMax) * ((_tau == 0) ? 0 : (_tau > 0) ? 1 : -1); +#endif updateController(_tau, limitedTauRef, m_emergencyController); dq = m_emergencyController.getMotorControllerDq(); }