rm one more using namespace and use typedef to deal with diff mrpt version

This commit is contained in:
Jeremie Deray
2017-06-22 21:21:32 +02:00
parent 5893d1a3e9
commit 7333f65490
2 changed files with 4 additions and 3 deletions

View File

@@ -25,10 +25,11 @@
#if MRPT_VERSION>=0x130
# include <mrpt/obs/CObservation2DRangeScan.h>
# include <mrpt/obs/CObservationOdometry.h>
using namespace mrpt::obs;
typedef mrpt::obs::CObservation2DRangeScan CObservation2DRangeScan;
#else
# include <mrpt/slam/CObservation2DRangeScan.h>
# include <mrpt/slam/CObservationOdometry.h>
typedef mrpt::poses::CObservation2DRangeScan CObservation2DRangeScan;
#endif
@@ -166,7 +167,7 @@ protected:
void solveSystemNonLinear();
void filterLevelSolution();
void PoseUpdate();
void Reset(mrpt::poses::CPose3D ini_pose, mrpt::poses::CObservation2DRangeScan scan);
void Reset(mrpt::poses::CPose3D ini_pose, CObservation2DRangeScan scan);
};
#endif