From 1ef35a7423f02dc6cc1b4f87a81e67e20b02e02d Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Sat, 5 Jun 2021 19:07:10 -0700 Subject: [PATCH] use more modern #pragma once guards in lib/pathplan --- lib/pathplan/pathgeom.h | 5 +---- lib/pathplan/pathplan.h | 6 +----- lib/pathplan/pathutil.h | 5 +---- lib/pathplan/solvers.h | 9 ++------- lib/pathplan/vis.h | 5 +---- lib/pathplan/vispath.h | 6 +----- 6 files changed, 7 insertions(+), 29 deletions(-) diff --git a/lib/pathplan/pathgeom.h b/lib/pathplan/pathgeom.h index 6d5eb4b29..24a0d415d 100644 --- a/lib/pathplan/pathgeom.h +++ b/lib/pathplan/pathgeom.h @@ -8,9 +8,7 @@ * Contributors: Details at https://graphviz.org *************************************************************************/ - -#ifndef _PATHGEOM_INCLUDE -#define _PATHGEOM_INCLUDE +#pragma once #ifdef __cplusplus extern "C" { @@ -46,4 +44,3 @@ extern "C" { #ifdef __cplusplus } #endif -#endif diff --git a/lib/pathplan/pathplan.h b/lib/pathplan/pathplan.h index a2e8773ea..c2648d60a 100644 --- a/lib/pathplan/pathplan.h +++ b/lib/pathplan/pathplan.h @@ -8,10 +8,7 @@ * Contributors: Details at https://graphviz.org *************************************************************************/ - - -#ifndef _PATH_INCLUDE -#define _PATH_INCLUDE +#pragma once #include "pathgeom.h" @@ -43,4 +40,3 @@ extern "C" { #ifdef __cplusplus } #endif -#endif diff --git a/lib/pathplan/pathutil.h b/lib/pathplan/pathutil.h index 354be12c4..e04bb1d9a 100644 --- a/lib/pathplan/pathutil.h +++ b/lib/pathplan/pathutil.h @@ -8,10 +8,8 @@ * Contributors: Details at https://graphviz.org *************************************************************************/ +#pragma once - -#ifndef _PATHUTIL_INCLUDE -#define _PATHUTIL_INCLUDE #define _BLD_pathplan 1 #include "pathplan.h" @@ -47,4 +45,3 @@ extern "C" { #ifdef __cplusplus } #endif -#endif diff --git a/lib/pathplan/solvers.h b/lib/pathplan/solvers.h index 1fff36dfd..010f44c8c 100644 --- a/lib/pathplan/solvers.h +++ b/lib/pathplan/solvers.h @@ -8,21 +8,16 @@ * Contributors: Details at https://graphviz.org *************************************************************************/ +#pragma once + #ifdef __cplusplus extern "C" { #endif - - -#ifndef _SOLVERS_INCLUDE -#define _SOLVERS_INCLUDE - extern int solve3(double *, double *); extern int solve2(double *, double *); extern int solve1(double *, double *); -#endif - #ifdef __cplusplus } #endif diff --git a/lib/pathplan/vis.h b/lib/pathplan/vis.h index 7e5f36acd..f637dcf27 100644 --- a/lib/pathplan/vis.h +++ b/lib/pathplan/vis.h @@ -8,9 +8,7 @@ * Contributors: Details at https://graphviz.org *************************************************************************/ - -#ifndef VISIBILITY_H -#define VISIBILITY_H +#pragma once #include #include @@ -58,4 +56,3 @@ extern "C" { #ifdef __cplusplus } #endif -#endif diff --git a/lib/pathplan/vispath.h b/lib/pathplan/vispath.h index 614504777..2ce73d28d 100644 --- a/lib/pathplan/vispath.h +++ b/lib/pathplan/vispath.h @@ -8,10 +8,7 @@ * Contributors: Details at https://graphviz.org *************************************************************************/ - - -#ifndef _VIS_INCLUDE -#define _VIS_INCLUDE +#pragma once #include @@ -46,4 +43,3 @@ extern "C" { #ifdef __cplusplus } #endif -#endif -- 2.50.1