Skip to content

Commit c3a5b23

Browse files
committed
Switch to #pragma once for include guard.
1 parent 3bc8a9a commit c3a5b23

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+58
-534
lines changed

libsrc/spatialdata/geocoords/CSCart.hh

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,11 @@
77
//
88
// See https://mit-license.org/ and LICENSE.md and for license information.
99
// =================================================================================================
10-
11-
/** @file libsrc/geocoords/CSCart.hh
12-
*
13-
* @brief C++ CSCart object
14-
*
15-
* C++ object for managing parameters defining Cartesian coordinate systems.
16-
*/
17-
18-
#if !defined(spatialdata_geocoords_cscart_hh)
19-
#define spatialdata_geocoords_cscart_hh
10+
#pragma once
2011

2112
#include "CoordSys.hh" // ISA CoordSys
2213

14+
/// C++ object for Cartesian coordinate system.
2315
class spatialdata::geocoords::CSCart : public CoordSys {
2416
friend class TestCSCart;
2517

@@ -81,6 +73,4 @@ private:
8173

8274
}; // class CSCart
8375

84-
#endif // spatialdata_geocoodrs_cscart_hh
85-
8676
// End of file

libsrc/spatialdata/geocoords/CSGeo.hh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,7 @@
77
//
88
// See https://mit-license.org/ and LICENSE.md and for license information.
99
// =================================================================================================
10-
11-
/** @file libsrc/geocoords/CSGeo.hh
12-
*
13-
* @brief C++ CSGeo object
14-
*
15-
* C++ object for managing parameters defining geographic coordinate systems.
16-
*/
17-
18-
#if !defined(spatialdata_geocoords_csgeo_hh)
19-
#define spatialdata_geocoords_csgeo_hh
10+
#pragma once
2011

2112
#include "CoordSys.hh" // ISA CoordSys
2213

@@ -136,6 +127,4 @@ private:
136127

137128
}; // class CSGeo
138129

139-
#endif // spatialdata_geocoords_csgeo_hh
140-
141130
// End of file

libsrc/spatialdata/geocoords/CSGeoLocal.hh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,7 @@
77
//
88
// See https://mit-license.org/ and LICENSE.md and for license information.
99
// =================================================================================================
10-
11-
/** @file libsrc/geocoords/CSGeoLocal.hh
12-
*
13-
* @brief C++ CSGeoLocal object
14-
*
15-
* C++ object for managing parameters defining geographic coordinate systems.
16-
*/
17-
18-
#if !defined(spatialdata_geocoords_csgeoLocallocal_hh)
19-
#define spatialdata_geocoords_csgeoLocallocal_hh
10+
#pragma once
2011

2112
#include "CSGeo.hh" // ISA CSGeo
2213

@@ -116,6 +107,4 @@ private:
116107

117108
}; // class CSGeoLocal
118109

119-
#endif // spatialdata_geocoords_csgeoLocallocal_hh
120-
121110
// End of file

libsrc/spatialdata/geocoords/CSPicklerAscii.hh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,7 @@
77
//
88
// See https://mit-license.org/ and LICENSE.md and for license information.
99
// =================================================================================================
10-
11-
/** @file libsrc/geocoords/CSPicklerAscii.hh
12-
*
13-
* @brief C++ CSPicklerAscii object
14-
*
15-
* C++ object for pickling/unpickling coordinate systems for ascii streams.
16-
*/
17-
18-
#if !defined(spatialdata_geocoords_cspicklerascii_hh)
19-
#define spatialdata_geocoords_cspicklerascii_hh
10+
#pragma once
2011

2112
#include "geocoordsfwd.hh"
2213

@@ -47,6 +38,4 @@ public:
4738

4839
}; // class CSPicklerAscii
4940

50-
#endif // spatialdata_geocoords_cspicklerascii_hh
51-
5241
// End of file

libsrc/spatialdata/geocoords/Converter.hh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,7 @@
77
//
88
// See https://mit-license.org/ and LICENSE.md and for license information.
99
// =================================================================================================
10-
11-
/** @file libsrc/geocoords/Converter.hh
12-
*
13-
* @brief C++ Converter object
14-
*
15-
* C++ object for converting between coordinate systems.
16-
*/
17-
18-
#if !defined(spatialdata_geocoords_converter_hh)
19-
#define spatialdata_geocoords_converter_hh
10+
#pragma once
2011

2112
#include "geocoordsfwd.hh"
2213

@@ -100,6 +91,4 @@ private:
10091

10192
}; // class Converter
10293

103-
#endif // spatialdata_geocoords_converter_hh
104-
10594
// End of file

libsrc/spatialdata/geocoords/CoordSys.hh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,7 @@
55
//
66
// See https://mit-license.org/ and LICENSE.md and for license information.
77
// =================================================================================================
8-
9-
/** @file libsrc/geocoords/CoordSys.hh
10-
*
11-
* @brief C++ CoordSys object
12-
*
13-
* C++ object for managing parameters defining a coordinate system.
14-
*/
15-
16-
#if !defined(spatialdata_geocoords_coordsys_hh)
17-
#define spatialdata_geocoords_coordsys_hh
8+
#pragma once
189

1910
#include "geocoordsfwd.hh"
2011

@@ -100,6 +91,4 @@ private:
10091

10192
}; // class CoordSys
10293

103-
#endif // spatialdata_geocoords_coordsys_hh
104-
10594
// End of file

libsrc/spatialdata/geocoords/geocoordsfwd.hh

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,7 @@
77
//
88
// See https://mit-license.org/ and LICENSE.md and for license information.
99
// =================================================================================================
10-
11-
/** @file libsrc/geocoords/geocoordsfwd.hh
12-
*
13-
* @brief Forward declarations for spatialdata::geocoords objects.
14-
*
15-
* Including this header file eliminates the need to use separate
16-
* forward declarations.
17-
*/
18-
19-
#if !defined(spatialdata_geocoords_geocoordsfwd_hh)
20-
#define spatialdata_geocoords_geocoordsfwd_hh
10+
#pragma once
2111

2212
namespace spatialdata {
2313
namespace geocoords {
@@ -30,6 +20,4 @@ namespace spatialdata {
3020
} // geocoords
3121
} // spatialdata
3222

33-
#endif // spatialdata_geocoords_geocoordsfwd_hh
34-
3523
// End of file

libsrc/spatialdata/muparser/muparserfwd.hh

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,7 @@
77
//
88
// See https://mit-license.org/ and LICENSE.md and for license information.
99
// =================================================================================================
10-
11-
/** @file libsrc/muparser/muparserfwd.hh
12-
*
13-
* @brief Forward declarations for mu::parser object.
14-
*
15-
* Including this header file eliminates the need to use separate
16-
* forward declarations.
17-
*/
18-
19-
#if !defined(spatialdata_muparser_muparserfwd_hh)
20-
#define spatialdata_muparser_muparserfwd_hh
10+
#pragma once
2111

2212
#define MUP_BASETYPE double
2313

@@ -28,6 +18,4 @@ namespace mu {
2818

2919
} // mu
3020

31-
#endif // spatialdata_muparser_muparserfwd_hh
32-
3321
// End of file

libsrc/spatialdata/spatialdb/AnalyticDB.hh

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,7 @@
77
//
88
// See https://mit-license.org/ and LICENSE.md and for license information.
99
// =================================================================================================
10-
11-
/** @file libsrc/spatialdb/AnalyticDB.hh
12-
*
13-
* @brief C++ manager for analytic spatial database.
14-
*/
15-
16-
#if !defined(spatialdata_spatialdb_analyticdb_hh)
17-
#define spatialdata_spatialdb_analyticdb_hh
10+
#pragma once
1811

1912
#include "SpatialDB.hh"
2013

@@ -133,6 +126,4 @@ private:
133126

134127
#include "AnalyticDB.icc"
135128

136-
#endif // spatialdata_spatialdb_analyticdb_hh
137-
138129
// End of file

libsrc/spatialdata/spatialdb/AnalyticDB.icc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
//
88
// See https://mit-license.org/ and LICENSE.md and for license information.
99
// =================================================================================================
10-
11-
#if !defined(spatialdata_spatialdb_analyticdb_hh)
12-
#error "AnalyticDB.icc must only be included from AnalyticDB.hh"
13-
#endif
10+
#pragma once
1411

1512
// Open the database and prepare for querying.
1613
inline

0 commit comments

Comments
 (0)