Skip to content

Commit c8526ea

Browse files
jotojoto
committed
Consistent naming and format for include guards in all hpp files
1 parent 8226611 commit c8526ea

35 files changed

Lines changed: 118 additions & 140 deletions

‎db-copy.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef DB_COPY_HPP
2-
#define DB_COPY_HPP
1+
#ifndef OSM2PGSQL_DB_COPY_HPP
2+
#define OSM2PGSQL_DB_COPY_HPP
33

44
#include <condition_variable>
55
#include <deque>
@@ -461,4 +461,4 @@ class db_copy_mgr_t
461461
std::unique_ptr<db_cmd_copy_t> m_current;
462462
};
463463

464-
#endif
464+
#endif // OSM2PGSQL_DB_COPY_HPP

‎expire-tiles.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef EXPIRE_TILES_H
2-
#define EXPIRE_TILES_H
1+
#ifndef OSM2PGSQL_EXPIRE_TILES_HPP
2+
#define OSM2PGSQL_EXPIRE_TILES_HPP
33

44
#include <memory>
55
#include <unordered_set>
@@ -191,4 +191,4 @@ struct expire_tiles
191191
std::unordered_set<uint64_t> m_dirty_tiles;
192192
};
193193

194-
#endif
194+
#endif // OSM2PGSQL_EXPIRE_TILES_HPP

‎gazetteer-style.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef GAZETTEER_STYLE_HPP
2-
#define GAZETTEER_STYLE_HPP
1+
#ifndef OSM2PGSQL_GAZETTEER_STYLE_HPP
2+
#define OSM2PGSQL_GAZETTEER_STYLE_HPP
33

44
#include <string>
55
#include <tuple>
@@ -104,4 +104,4 @@ class gazetteer_style_t
104104
osmium::metadata_options m_metadata_fields{"none"};
105105
};
106106

107-
#endif
107+
#endif // OSM2PGSQL_GAZETTEER_STYLE_HPP

‎geometry-processor.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef GEOMETRY_PROCESSOR_HPP
2-
#define GEOMETRY_PROCESSOR_HPP
1+
#ifndef OSM2PGSQL_GEOMETRY_PROCESSOR_HPP
2+
#define OSM2PGSQL_GEOMETRY_PROCESSOR_HPP
33

44
#include <cstddef>
55
#include <string>
@@ -92,4 +92,4 @@ class relation_helper
9292
osmium::memory::Buffer data;
9393
};
9494

95-
#endif /* GEOMETRY_PROCESSOR_HPP */
95+
#endif // OSM2PGSQL_GEOMETRY_PROCESSOR_HPP

‎id-tracker.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef ID_TRACKER_HPP
2-
#define ID_TRACKER_HPP
1+
#ifndef OSM2PGSQL_ID_TRACKER_HPP
2+
#define OSM2PGSQL_ID_TRACKER_HPP
33

44
#include "osmtypes.hpp"
55
#include <memory>
@@ -48,4 +48,4 @@ struct id_tracker
4848
std::unique_ptr<pimpl> impl;
4949
};
5050

51-
#endif /* ID_TRACKER_HPP */
51+
#endif // OSM2PGSQL_ID_TRACKER_HPP

‎middle-pgsql.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#ifndef OSM2PGSQL_MIDDLE_PGSQL_HPP
2+
#define OSM2PGSQL_MIDDLE_PGSQL_HPP
3+
14
/* Implements the mid-layer processing for osm2pgsql
25
* using several PostgreSQL tables
36
*
@@ -6,9 +9,6 @@
69
* emit the final geometry-enabled output formats
710
*/
811

9-
#ifndef MIDDLE_PGSQL_H
10-
#define MIDDLE_PGSQL_H
11-
1212
#include <memory>
1313

1414
#include "db-copy.hpp"
@@ -131,4 +131,4 @@ struct middle_pgsql_t : public slim_middle_t
131131
db_copy_mgr_t m_db_copy;
132132
};
133133

134-
#endif
134+
#endif // OSM2PGSQL_MIDDLE_PGSQL_HPP

‎middle-ram.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#ifndef OSM2PGSQL_MIDDLE_RAM_HPP
2+
#define OSM2PGSQL_MIDDLE_RAM_HPP
3+
14
/* Implements the mid-layer processing for osm2pgsql
25
* using data structures in RAM.
36
*
@@ -6,9 +9,6 @@
69
* emit the final geometry-enabled output formats
710
*/
811

9-
#ifndef MIDDLE_RAM_H
10-
#define MIDDLE_RAM_H
11-
1212
#include <array>
1313
#include <memory>
1414
#include <vector>
@@ -163,4 +163,4 @@ struct middle_ram_t : public middle_t, public middle_query_t
163163
bool simulate_ways_deleted;
164164
};
165165

166-
#endif
166+
#endif // OSM2PGSQL_MIDDLE_RAM_HPP

‎middle.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1+
#ifndef OSM2PGSQL_MIDDLE_HPP
2+
#define OSM2PGSQL_MIDDLE_HPP
3+
14
/**
25
* Common middle layer interface
36
* Each middle layer data store must provide methods for
47
* storing and retrieving node and way data.
58
*/
69

7-
#ifndef MIDDLE_H
8-
#define MIDDLE_H
9-
1010
#include <osmium/memory/buffer.hpp>
1111

1212
#include <cstddef>
@@ -132,4 +132,4 @@ struct slim_middle_t : public middle_t {
132132

133133
inline slim_middle_t::~slim_middle_t() = default;
134134

135-
#endif
135+
#endif // OSM2PGSQL_MIDDLE_HPP

‎node-persistent-cache.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef NODE_PERSISTENT_CACHE_H
2-
#define NODE_PERSISTENT_CACHE_H
1+
#ifndef OSM2PGSQL_NODE_PERSISTENT_CACHE_HPP
2+
#define OSM2PGSQL_NODE_PERSISTENT_CACHE_HPP
33

44
#include <memory>
55

@@ -36,4 +36,4 @@ class node_persistent_cache
3636
const char *m_fname;
3737
};
3838

39-
#endif
39+
#endif // OSM2PGSQL_NODE_PERSISTENT_CACHE_HPP

‎node-ram-cache.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1+
#ifndef OSM2PGSQL_NODE_RAM_CACHE_HPP
2+
#define OSM2PGSQL_NODE_RAM_CACHE_HPP
3+
14
/* Implements the node cache in ram.
25
*
36
* There are two different storage strategies, either optimised
47
* for dense storage of node ids, or for sparse storage as well as
58
* a strategy to combine both in an optimal way.
69
*/
710

8-
#ifndef NODE_RAM_CACHE_H
9-
#define NODE_RAM_CACHE_H
10-
1111
#include <climits>
1212
#include <cstddef>
1313
#include <cstdint>
@@ -91,4 +91,4 @@ struct node_ram_cache
9191
int warn_node_order = 0;
9292
};
9393

94-
#endif
94+
#endif // OSM2PGSQL_NODE_RAM_CACHE_HPP

0 commit comments

Comments
 (0)