From ce93c69fa379e925509598b57397e02a5ab7a105 Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Wed, 8 Mar 2006 23:02:28 +0000 Subject: [PATCH] minor syntax corrections to comply with ansi c++ --- include/geometry.hpp | 2 +- include/math_expr.hpp | 2 +- plugins/input/postgis/postgis.cpp | 2 +- plugins/input/raster/raster_datasource.cpp | 2 +- plugins/input/shape/shape.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/geometry.hpp b/include/geometry.hpp index 429d8a200..c901d9122 100644 --- a/include/geometry.hpp +++ b/include/geometry.hpp @@ -33,7 +33,7 @@ namespace mapnik enum { Point = 1, LineString = 2, - Polygon = 3, + Polygon = 3 }; template diff --git a/include/math_expr.hpp b/include/math_expr.hpp index 68d672b5b..caee08417 100644 --- a/include/math_expr.hpp +++ b/include/math_expr.hpp @@ -120,7 +120,7 @@ namespace mapnik expression* left_; expression* right_; }; -}; +} #endif // diff --git a/plugins/input/postgis/postgis.cpp b/plugins/input/postgis/postgis.cpp index 16f2aae4a..d2e8dd3b7 100644 --- a/plugins/input/postgis/postgis.cpp +++ b/plugins/input/postgis/postgis.cpp @@ -25,7 +25,7 @@ #include #include "connection_manager.hpp" -DATASOURCE_PLUGIN(postgis_datasource); +DATASOURCE_PLUGIN(postgis_datasource) const std::string postgis_datasource::GEOMETRY_COLUMNS="geometry_columns"; const std::string postgis_datasource::SPATIAL_REF_SYS="spatial_ref_system"; diff --git a/plugins/input/raster/raster_datasource.cpp b/plugins/input/raster/raster_datasource.cpp index 4b8fd57c9..1ca5a2b7f 100644 --- a/plugins/input/raster/raster_datasource.cpp +++ b/plugins/input/raster/raster_datasource.cpp @@ -24,7 +24,7 @@ #include "raster_info.hpp" #include -DATASOURCE_PLUGIN(raster_datasource); +DATASOURCE_PLUGIN(raster_datasource) using std::cerr; using std::endl; diff --git a/plugins/input/shape/shape.cpp b/plugins/input/shape/shape.cpp index 3af2f69d4..8269ee3eb 100644 --- a/plugins/input/shape/shape.cpp +++ b/plugins/input/shape/shape.cpp @@ -24,7 +24,7 @@ #include #include -DATASOURCE_PLUGIN(shape_datasource); +DATASOURCE_PLUGIN(shape_datasource) shape_datasource::shape_datasource(const parameters ¶ms) : shape_name_(params.get("file")),