Skip to content
Snippets Groups Projects
Commit 24d08da4 authored by Arnaud Degroote's avatar Arnaud Degroote
Browse files

[wip/jafar-rtslam] Add a patch to workaroud against boost issue 7364

See https://svn.boost.org/trac/boost/ticket/7364 for the discussion
Bump PKGREVISION
parent f3e932a0
No related branches found
No related tags found
No related merge requests found
......@@ -3,7 +3,7 @@
#
JAFAR_PKG= rtslam-0.2
PKGREVISION= 1
PKGREVISION= 2
CATEGORIES= wip
JAFAR_COMMENT= Jafar module to do fast and generic EKF Slam.
......
......@@ -2,3 +2,4 @@ SHA1 (jafar-rtslam-0.2.tar.gz) = 1b4c9ef2fbc8c32259a48ef297a8baf6dd7d10f5
RMD160 (jafar-rtslam-0.2.tar.gz) = b6840c5170beef8b4c409c86da74ac3cf9841353
Size (jafar-rtslam-0.2.tar.gz) = 733290 bytes
SHA1 (patch-aa) = f5e95671e0ded99b9f2207ac93764da44bffda3c
SHA1 (patch-ab) = fdaab1bc3511fdbb78b201782b8a0ffc76ed22ce
Workaround against boost issue 7364
https://svn.boost.org/trac/boost/ticket/7364
--- include/rtslam/sensorAbstract.hpp.orig 2013-03-19 22:13:31.000000000 +0000
+++ include/rtslam/sensorAbstract.hpp 2013-03-19 22:31:29.000000000 +0000
@@ -36,6 +36,7 @@
class ObservationAbstract;
class DataManagerAbstract;
+ static std::vector<RobotAbstract::Quantity> workaround_7364;
/**
Base class for all types of sensors.
\ingroup rtslam
@@ -70,7 +71,7 @@
* \param poseInFilter flag indicating if the sensor pose is part of the filter (REMOTE).
*/
SensorAbstract(const robot_ptr_t & _robPtr, const filtered_obj_t poseInFilter = UNFILTERED, int extraStateFilterSize = 0,
- std::vector<RobotAbstract::Quantity> robQuant = boost::assign::list_of(RobotAbstract::qPos)(RobotAbstract::qOriQuat));
+ std::vector<RobotAbstract::Quantity> robQuant = boost::assign::list_of(RobotAbstract::qPos)(RobotAbstract::qOriQuat).to_container(workaround_7364));
/**
* Mandatory virtual destructor.
@@ -170,7 +171,7 @@
hardware::hardware_sensorprop_ptr_t hardwareSensorPtr;
public:
SensorProprioAbstract(const robot_ptr_t & robPtr, const filtered_obj_t poseInFilter = UNFILTERED, int extraStateFilterSize = 0,
- std::vector<RobotAbstract::Quantity> robQuant = boost::assign::list_of(RobotAbstract::qPos)(RobotAbstract::qOriQuat)):
+ std::vector<RobotAbstract::Quantity> robQuant = boost::assign::list_of(RobotAbstract::qPos)(RobotAbstract::qOriQuat).to_container(workaround_7364)):
SensorAbstract(robPtr, poseInFilter, extraStateFilterSize, robQuant) { kind = PROPRIOCEPTIVE; }
void setHardwareSensor(hardware::hardware_sensorprop_ptr_t hardwareSensorPtr_)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment