Browse Source

navigator: use '#pragma once' as include guard

sbg
Beat Küng 7 years ago
parent
commit
2e6904b8a4
  1. 4
      src/modules/navigator/datalinkloss.h
  2. 4
      src/modules/navigator/enginefailure.h
  3. 5
      src/modules/navigator/geofence.h
  4. 4
      src/modules/navigator/gpsfailure.h
  5. 5
      src/modules/navigator/land.h
  6. 5
      src/modules/navigator/loiter.h
  7. 5
      src/modules/navigator/mission.h
  8. 5
      src/modules/navigator/mission_block.h
  9. 4
      src/modules/navigator/mission_feasibility_checker.h
  10. 4
      src/modules/navigator/navigation.h
  11. 4
      src/modules/navigator/navigator.h
  12. 5
      src/modules/navigator/navigator_mode.h
  13. 5
      src/modules/navigator/precland.h
  14. 4
      src/modules/navigator/rcloss.h
  15. 5
      src/modules/navigator/rtl.h
  16. 6
      src/modules/navigator/takeoff.h

4
src/modules/navigator/datalinkloss.h

@ -37,8 +37,7 @@ @@ -37,8 +37,7 @@
* @author Thomas Gubler <thomasgubler@gmail.com>
*/
#ifndef NAVIGATOR_DATALINKLOSS_H
#define NAVIGATOR_DATALINKLOSS_H
#pragma once
#include <px4_module_params.h>
@ -91,4 +90,3 @@ private: @@ -91,4 +90,3 @@ private:
void advance_dll();
};
#endif

4
src/modules/navigator/enginefailure.h

@ -37,8 +37,7 @@ @@ -37,8 +37,7 @@
* @author Thomas Gubler <thomasgubler@gmail.com>
*/
#ifndef NAVIGATOR_ENGINEFAILURE_H
#define NAVIGATOR_ENGINEFAILURE_H
#pragma once
#include "navigator_mode.h"
#include "mission_block.h"
@ -72,4 +71,3 @@ private: @@ -72,4 +71,3 @@ private:
void advance_ef();
};
#endif

5
src/modules/navigator/geofence.h

@ -38,8 +38,7 @@ @@ -38,8 +38,7 @@
* @author Thomas Gubler <thomasgubler@gmail.com>
*/
#ifndef GEOFENCE_H_
#define GEOFENCE_H_
#pragma once
#include <cfloat>
@ -210,5 +209,3 @@ private: @@ -210,5 +209,3 @@ private:
*/
bool insideCircle(const PolygonInfo &polygon, double lat, double lon, float altitude);
};
#endif /* GEOFENCE_H_ */

4
src/modules/navigator/gpsfailure.h

@ -37,8 +37,7 @@ @@ -37,8 +37,7 @@
* @author Thomas Gubler <thomasgubler@gmail.com>
*/
#ifndef NAVIGATOR_GPSFAILURE_H
#define NAVIGATOR_GPSFAILURE_H
#pragma once
#include <px4_module_params.h>
@ -86,4 +85,3 @@ private: @@ -86,4 +85,3 @@ private:
void advance_gpsf();
};
#endif

5
src/modules/navigator/land.h

@ -38,8 +38,7 @@ @@ -38,8 +38,7 @@
* @author Andreas Antener <andreas@uaventure.com>
*/
#ifndef NAVIGATOR_LAND_H
#define NAVIGATOR_LAND_H
#pragma once
#include "navigator_mode.h"
#include "mission_block.h"
@ -53,5 +52,3 @@ public: @@ -53,5 +52,3 @@ public:
void on_activation() override;
void on_active() override;
};
#endif

5
src/modules/navigator/loiter.h

@ -38,8 +38,7 @@ @@ -38,8 +38,7 @@
* @author Julian Oes <julian@oes.ch>
*/
#ifndef NAVIGATOR_LOITER_H
#define NAVIGATOR_LOITER_H
#pragma once
#include "navigator_mode.h"
#include "mission_block.h"
@ -83,5 +82,3 @@ private: @@ -83,5 +82,3 @@ private:
bool _loiter_pos_set{false};
};
#endif

5
src/modules/navigator/mission.h

@ -42,8 +42,7 @@ @@ -42,8 +42,7 @@
* @author Lorenz Meier <lorenz@px4.io>
*/
#ifndef NAVIGATOR_MISSION_H
#define NAVIGATOR_MISSION_H
#pragma once
#include "mission_block.h"
#include "mission_feasibility_checker.h"
@ -271,5 +270,3 @@ private: @@ -271,5 +270,3 @@ private:
WORK_ITEM_TYPE_PRECISION_LAND
} _work_item_type{WORK_ITEM_TYPE_DEFAULT}; /**< current type of work to do (sub mission item) */
};
#endif

5
src/modules/navigator/mission_block.h

@ -38,8 +38,7 @@ @@ -38,8 +38,7 @@
* @author Julian Oes <julian@oes.ch>
*/
#ifndef NAVIGATOR_MISSION_BLOCK_H
#define NAVIGATOR_MISSION_BLOCK_H
#pragma once
#include "navigator_mode.h"
#include "navigation.h"
@ -128,5 +127,3 @@ protected: @@ -128,5 +127,3 @@ protected:
orb_advert_t _actuator_pub{nullptr};
};
#endif

4
src/modules/navigator/mission_feasibility_checker.h

@ -39,8 +39,7 @@ @@ -39,8 +39,7 @@
* @author Sander Smeets <sander@droneslab.com>
*/
#ifndef MISSION_FEASIBILITY_CHECKER_H_
#define MISSION_FEASIBILITY_CHECKER_H_
#pragma once
#include <dataman/dataman.h>
#include <uORB/topics/mission.h>
@ -88,4 +87,3 @@ public: @@ -88,4 +87,3 @@ public:
};
#endif /* MISSION_FEASIBILITY_CHECKER_H_ */

4
src/modules/navigator/navigation.h

@ -39,8 +39,7 @@ @@ -39,8 +39,7 @@
* @author Lorenz Meier <lm@inf.ethz.ch>
*/
#ifndef NAVIGATION_H_
#define NAVIGATION_H_
#pragma once
#include <stdint.h>
#include <stdbool.h>
@ -215,4 +214,3 @@ struct mission_save_point_s { @@ -215,4 +214,3 @@ struct mission_save_point_s {
*/
#endif

4
src/modules/navigator/navigator.h

@ -39,8 +39,7 @@ @@ -39,8 +39,7 @@
* @author Lorenz Meier <lorenz@px4.io>
*/
#ifndef NAVIGATOR_H
#define NAVIGATOR_H
#pragma once
#include "datalinkloss.h"
#include "enginefailure.h"
@ -389,4 +388,3 @@ private: @@ -389,4 +388,3 @@ private:
void publish_vehicle_command_ack(const vehicle_command_s &cmd, uint8_t result);
};
#endif

5
src/modules/navigator/navigator_mode.h

@ -39,8 +39,7 @@ @@ -39,8 +39,7 @@
* @author Anton Babushkin <anton.babushkin@me.com>
*/
#ifndef NAVIGATOR_MODE_H
#define NAVIGATOR_MODE_H
#pragma once
class Navigator;
@ -80,5 +79,3 @@ protected: @@ -80,5 +79,3 @@ protected:
private:
bool _active{false};
};
#endif

5
src/modules/navigator/precland.h

@ -38,8 +38,7 @@ @@ -38,8 +38,7 @@
* @author Nicolas de Palezieux (Sunflower Labs) <ndepal@gmail.com>
*/
#ifndef NAVIGATOR_PRECLAND_H
#define NAVIGATOR_PRECLAND_H
#pragma once
#include <matrix/math.hpp>
#include <geo/geo.h>
@ -133,5 +132,3 @@ private: @@ -133,5 +132,3 @@ private:
)
};
#endif

4
src/modules/navigator/rcloss.h

@ -37,8 +37,7 @@ @@ -37,8 +37,7 @@
* @author Thomas Gubler <thomasgubler@gmail.com>
*/
#ifndef NAVIGATOR_RCLOSS_H
#define NAVIGATOR_RCLOSS_H
#pragma once
#include <px4_module_params.h>
@ -80,4 +79,3 @@ private: @@ -80,4 +79,3 @@ private:
void advance_rcl();
};
#endif

5
src/modules/navigator/rtl.h

@ -38,8 +38,7 @@ @@ -38,8 +38,7 @@
* @author Anton Babushkin <anton.babushkin@me.com>
*/
#ifndef NAVIGATOR_RTL_H
#define NAVIGATOR_RTL_H
#pragma once
#include <px4_module_params.h>
@ -94,5 +93,3 @@ private: @@ -94,5 +93,3 @@ private:
(ParamInt<px4::params::RTL_LAND_TYPE>) _param_rtl_land_type
)
};
#endif

6
src/modules/navigator/takeoff.h

@ -38,9 +38,7 @@ @@ -38,9 +38,7 @@
* @author Lorenz Meier <lorenz@px4.io>
*/
#ifndef NAVIGATOR_TAKEOFF_H
#define NAVIGATOR_TAKEOFF_H
#pragma once
#include "navigator_mode.h"
#include "mission_block.h"
@ -58,5 +56,3 @@ private: @@ -58,5 +56,3 @@ private:
void set_takeoff_position();
};
#endif

Loading…
Cancel
Save