mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-07-04 21:00:35 +08:00
Fixed so that when working with ROS the same err.h is included
This commit is contained in:
@@ -45,13 +45,11 @@
|
||||
#include <geo/geo.h>
|
||||
#include <ecl/ecl.h>
|
||||
#include <mathlib/mathlib.h>
|
||||
#include <systemlib/err.h>
|
||||
|
||||
#ifdef CONFIG_ARCH_ARM
|
||||
#include <systemlib/err.h>
|
||||
#else
|
||||
#include<ros_error.h>
|
||||
#include <cmath>
|
||||
//#define isfinite std::isfinite
|
||||
using namespace std;
|
||||
#endif
|
||||
|
||||
|
||||
@@ -45,11 +45,10 @@
|
||||
#include <geo/geo.h>
|
||||
#include <ecl/ecl.h>
|
||||
#include <mathlib/mathlib.h>
|
||||
#include <systemlib/err.h>
|
||||
|
||||
#ifdef CONFIG_ARCH_ARM
|
||||
#include <systemlib/err.h>
|
||||
#else
|
||||
#include<ros_error.h>
|
||||
#include <cmath>
|
||||
using namespace std;
|
||||
#endif
|
||||
|
||||
@@ -44,11 +44,10 @@
|
||||
#include <geo/geo.h>
|
||||
#include <ecl/ecl.h>
|
||||
#include <mathlib/mathlib.h>
|
||||
#include <systemlib/err.h>
|
||||
|
||||
#ifdef CONFIG_ARCH_ARM
|
||||
#include <systemlib/err.h>
|
||||
#else
|
||||
#include<ros_error.h>
|
||||
#include <cmath>
|
||||
using namespace std;
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user