Use anonymous namespaces for internal linkage

Author: joto

Diff for: src/coastline_polygons.cpp

@@ -36,7 +36,9 @@ class OGRSpatialReference;
 extern SRS srs;
 extern bool debug;
 
-static std::unique_ptr<OGRPolygon> create_rectangular_polygon(double x1, double y1, double x2, double y2, double expand) {
+namespace {
+
+std::unique_ptr<OGRPolygon> create_rectangular_polygon(double x1, double y1, double x2, double y2, double expand) {
     OGREnvelope e;
 
     e.MinX = x1 - expand;
@@ -61,7 +63,7 @@ static std::unique_ptr<OGRPolygon> create_rectangular_polygon(double x1, double
     return polygon;
 }
 
-static bool add_segment_to_line(OGRLineString* line, OGRPoint* point1, OGRPoint* point2) {
+bool add_segment_to_line(OGRLineString* line, OGRPoint* point1, OGRPoint* point2) {
     // segments along southern edge of the map are not added to line output
     if (point1->getY() < srs.min_y() && point2->getY() < srs.min_y()) {
         if (debug) {
@@ -86,6 +88,8 @@ static bool add_segment_to_line(OGRLineString* line, OGRPoint* point1, OGRPoint*
     return true;
 }
 
+} // anonymous namespace
+
 unsigned int CoastlinePolygons::fix_direction() {
     unsigned int warnings = 0;
 

Diff for: src/coastline_ring_collection.cpp

@@ -129,6 +129,8 @@ unsigned int CoastlineRingCollection::check_locations(bool output_missing) {
     return missing_locations;
 }
 
+namespace {
+
 bool is_valid_polygon(const OGRGeometry* geometry) {
     if (geometry && geometry->getGeometryType() == wkbPolygon && !geometry->IsEmpty()) {
         const auto *const polygon = static_cast<const OGRPolygon*>(geometry);
@@ -137,6 +139,8 @@ bool is_valid_polygon(const OGRGeometry* geometry) {
     return false;
 }
 
+} // anonymous namespace
+
 std::vector<OGRGeometry*> CoastlineRingCollection::add_polygons_to_vector() {
     std::vector<OGRGeometry*> vector;
     vector.reserve(m_list.size());
@@ -189,6 +193,8 @@ unsigned int CoastlineRingCollection::output_rings(OutputDatabase& output) {
     return warnings;
 }
 
+namespace {
+
 osmium::Location intersection(const osmium::Segment& s1, const osmium::Segment&s2) {
     if (s1.first()  == s2.first()  ||
         s1.first()  == s2.second() ||
@@ -242,6 +248,8 @@ std::unique_ptr<OGRLineString> create_ogr_linestring(const osmium::Segment& segm
     return line;
 }
 
+} // anonymous namespace
+
 /**
  * Checks if there are intersections between any coastline segments.
  * Returns the number of intersections and overlaps.

Diff for: src/nodegrid2opl.cpp

@@ -56,7 +56,9 @@
 
 const int id_offset = 100;
 
-static bool add_node(std::vector<std::string>& nodes, char c, double x, double y) {
+namespace {
+
+bool add_node(std::vector<std::string>& nodes, char c, double x, double y) {
     static std::set<int> ids;
     int id = id_offset;
 
@@ -76,6 +78,8 @@ static bool add_node(std::vector<std::string>& nodes, char c, double x, double y
     return true;
 }
 
+} // anonymous namespace
+
 int main() {
     const double scale = 0.01;
     const double offset = 1;

Diff for: src/options.cpp

@@ -35,7 +35,9 @@
 
 #include <osmium/io/pbf.hpp>
 
-static void print_help() {
+namespace {
+
+void print_help() {
     std::cout << "Usage: osmcoastline [OPTIONS] OSMFILE\n"
               << "\nOptions:\n"
               << "  -h, --help                 - This help message\n"
@@ -61,7 +63,7 @@ static void print_help() {
               << "\n";
 }
 
-static void print_version() {
+void print_version() {
     std::cout << "osmcoastline " << get_osmcoastline_long_version() << "\n"
               << get_libosmium_version() << '\n'
               << "Supported PBF compression types:";
@@ -79,7 +81,7 @@ static void print_version() {
  * of specifying WGS84 or the "Web Mercator" SRS. More are currently
  * not supported.
  */
-static int get_epsg(const char* text) {
+int get_epsg(const char* text) {
     if (!strcasecmp(text, "WGS84") || !std::strcmp(text, "4326")) {
         return 4326;
     }
@@ -94,6 +96,8 @@ static int get_epsg(const char* text) {
     std::exit(return_code_cmdline);
 }
 
+} // anonymous namespace
+
 int Options::parse(int argc, char* argv[]) {
     static struct option long_options[] = {
         {"bbox-overlap",    required_argument, nullptr, 'b'},

Diff for: src/osmcoastline.cpp

@@ -64,6 +64,8 @@ SRS srs;
 // Global debug marker
 bool debug;
 
+namespace {
+
 // If there are more than this many warnings, the program exit code will indicate an error.
 const unsigned int max_warnings = 500;
 
@@ -166,6 +168,8 @@ std::unique_ptr<OutputDatabase> open_output_database(const std::string& driver,
     return nullptr;
 }
 
+} // anonymous namespace
+
 /* ================================================== */
 
 int main(int argc, char *argv[]) {

Diff for: src/osmcoastline_filter.cpp

@@ -46,6 +46,8 @@
 #include <string>
 #include <vector>
 
+namespace {
+
 void print_help() {
     std::cout << "Usage: osmcoastline_filter [OPTIONS] OSMFILE\n"
               << "\nOptions:\n"
@@ -57,6 +59,8 @@ void print_help() {
               << "\n";
 }
 
+} // anonymous namespace
+
 int main(int argc, char* argv[]) {
     std::string output_filename;
     std::string output_file_format{"pbf"};

Diff for: src/osmcoastline_segments.cpp

@@ -79,6 +79,8 @@ class InputFile {
 
 }; // class InputFile
 
+namespace {
+
 void print_help() {
 }
 
@@ -110,6 +112,8 @@ void output_ogr(const std::string& filename, const std::string& driver_name, con
     layer.commit_transaction();
 }
 
+} // anonymous namespace
+
 int main(int argc, char *argv[]) {
     bool dump = false;
     std::string format = "ESRI Shapefile";