navigator: use '#pragma once' as include guard

This commit is contained in:
Beat Küng
2018-03-13 17:35:15 +01:00
parent f2dddc65a5
commit 2e6904b8a4
16 changed files with 16 additions and 58 deletions
+1 -3
View File
@@ -37,8 +37,7 @@
* @author Thomas Gubler <thomasgubler@gmail.com> * @author Thomas Gubler <thomasgubler@gmail.com>
*/ */
#ifndef NAVIGATOR_DATALINKLOSS_H #pragma once
#define NAVIGATOR_DATALINKLOSS_H
#include <px4_module_params.h> #include <px4_module_params.h>
@@ -91,4 +90,3 @@ private:
void advance_dll(); void advance_dll();
}; };
#endif
+1 -3
View File
@@ -37,8 +37,7 @@
* @author Thomas Gubler <thomasgubler@gmail.com> * @author Thomas Gubler <thomasgubler@gmail.com>
*/ */
#ifndef NAVIGATOR_ENGINEFAILURE_H #pragma once
#define NAVIGATOR_ENGINEFAILURE_H
#include "navigator_mode.h" #include "navigator_mode.h"
#include "mission_block.h" #include "mission_block.h"
@@ -72,4 +71,3 @@ private:
void advance_ef(); void advance_ef();
}; };
#endif
+1 -4
View File
@@ -38,8 +38,7 @@
* @author Thomas Gubler <thomasgubler@gmail.com> * @author Thomas Gubler <thomasgubler@gmail.com>
*/ */
#ifndef GEOFENCE_H_ #pragma once
#define GEOFENCE_H_
#include <cfloat> #include <cfloat>
@@ -210,5 +209,3 @@ private:
*/ */
bool insideCircle(const PolygonInfo &polygon, double lat, double lon, float altitude); bool insideCircle(const PolygonInfo &polygon, double lat, double lon, float altitude);
}; };
#endif /* GEOFENCE_H_ */
+1 -3
View File
@@ -37,8 +37,7 @@
* @author Thomas Gubler <thomasgubler@gmail.com> * @author Thomas Gubler <thomasgubler@gmail.com>
*/ */
#ifndef NAVIGATOR_GPSFAILURE_H #pragma once
#define NAVIGATOR_GPSFAILURE_H
#include <px4_module_params.h> #include <px4_module_params.h>
@@ -86,4 +85,3 @@ private:
void advance_gpsf(); void advance_gpsf();
}; };
#endif
+1 -4
View File
@@ -38,8 +38,7 @@
* @author Andreas Antener <andreas@uaventure.com> * @author Andreas Antener <andreas@uaventure.com>
*/ */
#ifndef NAVIGATOR_LAND_H #pragma once
#define NAVIGATOR_LAND_H
#include "navigator_mode.h" #include "navigator_mode.h"
#include "mission_block.h" #include "mission_block.h"
@@ -53,5 +52,3 @@ public:
void on_activation() override; void on_activation() override;
void on_active() override; void on_active() override;
}; };
#endif
+1 -4
View File
@@ -38,8 +38,7 @@
* @author Julian Oes <julian@oes.ch> * @author Julian Oes <julian@oes.ch>
*/ */
#ifndef NAVIGATOR_LOITER_H #pragma once
#define NAVIGATOR_LOITER_H
#include "navigator_mode.h" #include "navigator_mode.h"
#include "mission_block.h" #include "mission_block.h"
@@ -83,5 +82,3 @@ private:
bool _loiter_pos_set{false}; bool _loiter_pos_set{false};
}; };
#endif
+1 -4
View File
@@ -42,8 +42,7 @@
* @author Lorenz Meier <lorenz@px4.io> * @author Lorenz Meier <lorenz@px4.io>
*/ */
#ifndef NAVIGATOR_MISSION_H #pragma once
#define NAVIGATOR_MISSION_H
#include "mission_block.h" #include "mission_block.h"
#include "mission_feasibility_checker.h" #include "mission_feasibility_checker.h"
@@ -271,5 +270,3 @@ private:
WORK_ITEM_TYPE_PRECISION_LAND WORK_ITEM_TYPE_PRECISION_LAND
} _work_item_type{WORK_ITEM_TYPE_DEFAULT}; /**< current type of work to do (sub mission item) */ } _work_item_type{WORK_ITEM_TYPE_DEFAULT}; /**< current type of work to do (sub mission item) */
}; };
#endif
+1 -4
View File
@@ -38,8 +38,7 @@
* @author Julian Oes <julian@oes.ch> * @author Julian Oes <julian@oes.ch>
*/ */
#ifndef NAVIGATOR_MISSION_BLOCK_H #pragma once
#define NAVIGATOR_MISSION_BLOCK_H
#include "navigator_mode.h" #include "navigator_mode.h"
#include "navigation.h" #include "navigation.h"
@@ -128,5 +127,3 @@ protected:
orb_advert_t _actuator_pub{nullptr}; orb_advert_t _actuator_pub{nullptr};
}; };
#endif
@@ -39,8 +39,7 @@
* @author Sander Smeets <sander@droneslab.com> * @author Sander Smeets <sander@droneslab.com>
*/ */
#ifndef MISSION_FEASIBILITY_CHECKER_H_ #pragma once
#define MISSION_FEASIBILITY_CHECKER_H_
#include <dataman/dataman.h> #include <dataman/dataman.h>
#include <uORB/topics/mission.h> #include <uORB/topics/mission.h>
@@ -88,4 +87,3 @@ public:
}; };
#endif /* MISSION_FEASIBILITY_CHECKER_H_ */
+1 -3
View File
@@ -39,8 +39,7 @@
* @author Lorenz Meier <lm@inf.ethz.ch> * @author Lorenz Meier <lm@inf.ethz.ch>
*/ */
#ifndef NAVIGATION_H_ #pragma once
#define NAVIGATION_H_
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
@@ -215,4 +214,3 @@ struct mission_save_point_s {
*/ */
#endif
+1 -3
View File
@@ -39,8 +39,7 @@
* @author Lorenz Meier <lorenz@px4.io> * @author Lorenz Meier <lorenz@px4.io>
*/ */
#ifndef NAVIGATOR_H #pragma once
#define NAVIGATOR_H
#include "datalinkloss.h" #include "datalinkloss.h"
#include "enginefailure.h" #include "enginefailure.h"
@@ -389,4 +388,3 @@ private:
void publish_vehicle_command_ack(const vehicle_command_s &cmd, uint8_t result); void publish_vehicle_command_ack(const vehicle_command_s &cmd, uint8_t result);
}; };
#endif
+1 -4
View File
@@ -39,8 +39,7 @@
* @author Anton Babushkin <anton.babushkin@me.com> * @author Anton Babushkin <anton.babushkin@me.com>
*/ */
#ifndef NAVIGATOR_MODE_H #pragma once
#define NAVIGATOR_MODE_H
class Navigator; class Navigator;
@@ -80,5 +79,3 @@ protected:
private: private:
bool _active{false}; bool _active{false};
}; };
#endif
+1 -4
View File
@@ -38,8 +38,7 @@
* @author Nicolas de Palezieux (Sunflower Labs) <ndepal@gmail.com> * @author Nicolas de Palezieux (Sunflower Labs) <ndepal@gmail.com>
*/ */
#ifndef NAVIGATOR_PRECLAND_H #pragma once
#define NAVIGATOR_PRECLAND_H
#include <matrix/math.hpp> #include <matrix/math.hpp>
#include <geo/geo.h> #include <geo/geo.h>
@@ -133,5 +132,3 @@ private:
) )
}; };
#endif
+1 -3
View File
@@ -37,8 +37,7 @@
* @author Thomas Gubler <thomasgubler@gmail.com> * @author Thomas Gubler <thomasgubler@gmail.com>
*/ */
#ifndef NAVIGATOR_RCLOSS_H #pragma once
#define NAVIGATOR_RCLOSS_H
#include <px4_module_params.h> #include <px4_module_params.h>
@@ -80,4 +79,3 @@ private:
void advance_rcl(); void advance_rcl();
}; };
#endif
+1 -4
View File
@@ -38,8 +38,7 @@
* @author Anton Babushkin <anton.babushkin@me.com> * @author Anton Babushkin <anton.babushkin@me.com>
*/ */
#ifndef NAVIGATOR_RTL_H #pragma once
#define NAVIGATOR_RTL_H
#include <px4_module_params.h> #include <px4_module_params.h>
@@ -94,5 +93,3 @@ private:
(ParamInt<px4::params::RTL_LAND_TYPE>) _param_rtl_land_type (ParamInt<px4::params::RTL_LAND_TYPE>) _param_rtl_land_type
) )
}; };
#endif
+1 -5
View File
@@ -38,9 +38,7 @@
* @author Lorenz Meier <lorenz@px4.io> * @author Lorenz Meier <lorenz@px4.io>
*/ */
#ifndef NAVIGATOR_TAKEOFF_H #pragma once
#define NAVIGATOR_TAKEOFF_H
#include "navigator_mode.h" #include "navigator_mode.h"
#include "mission_block.h" #include "mission_block.h"
@@ -58,5 +56,3 @@ private:
void set_takeoff_position(); void set_takeoff_position();
}; };
#endif