summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/mbgl/map/map.hpp2
-rw-r--r--platform/default/mbgl/storage/offline_database.hpp4
-rw-r--r--platform/default/mbgl/storage/offline_download.hpp2
-rwxr-xr-xscripts/build-version.py2
-rw-r--r--src/mbgl/annotation/annotation_manager.hpp2
-rw-r--r--src/mbgl/annotation/annotation_tile.hpp2
-rw-r--r--src/mbgl/annotation/shape_annotation_impl.hpp2
-rw-r--r--src/mbgl/geometry/feature_index.hpp4
-rw-r--r--src/mbgl/renderer/bucket.hpp4
-rw-r--r--src/mbgl/renderer/circle_bucket.cpp2
-rw-r--r--src/mbgl/renderer/debug_bucket.hpp2
-rw-r--r--src/mbgl/renderer/fill_bucket.cpp6
-rw-r--r--src/mbgl/renderer/line_bucket.cpp2
-rw-r--r--src/mbgl/renderer/painter.cpp2
-rw-r--r--src/mbgl/renderer/painter.hpp4
-rw-r--r--src/mbgl/renderer/painter_background.cpp2
-rw-r--r--src/mbgl/renderer/painter_circle.cpp2
-rw-r--r--src/mbgl/renderer/painter_fill.cpp2
-rw-r--r--src/mbgl/renderer/painter_line.cpp2
-rw-r--r--src/mbgl/renderer/painter_raster.cpp2
-rw-r--r--src/mbgl/renderer/painter_symbol.cpp2
-rw-r--r--src/mbgl/renderer/raster_bucket.cpp2
-rw-r--r--src/mbgl/renderer/render_item.hpp2
-rw-r--r--src/mbgl/storage/resource.cpp2
-rw-r--r--src/mbgl/style/filter_evaluator.hpp2
-rw-r--r--src/mbgl/style/property_evaluator.hpp2
-rw-r--r--src/mbgl/text/quads.hpp2
-rw-r--r--src/mbgl/text/shaping.hpp2
-rw-r--r--src/mbgl/tile/geojson_tile.hpp2
-rw-r--r--src/mbgl/tile/geometry_tile.hpp2
-rw-r--r--src/mbgl/tile/raster_tile.hpp2
-rw-r--r--src/mbgl/tile/tile.hpp2
-rw-r--r--src/mbgl/tile/tile_source.hpp2
-rw-r--r--src/mbgl/tile/tile_worker.cpp2
-rw-r--r--src/mbgl/tile/tile_worker.hpp2
-rw-r--r--src/mbgl/tile/vector_tile.hpp2
-rw-r--r--src/mbgl/util/grid_index.cpp2
-rw-r--r--src/mbgl/util/grid_index.hpp2
-rw-r--r--src/mbgl/util/intersection_tests.cpp4
-rw-r--r--src/mbgl/util/intersection_tests.hpp2
-rw-r--r--src/mbgl/util/utf.hpp2
-rw-r--r--test/include/mbgl/test.hpp2
-rw-r--r--test/src/mbgl/test/test.cpp2
-rw-r--r--test/src/mbgl/test/util.hpp4
-rw-r--r--test/storage/offline_database.cpp2
45 files changed, 53 insertions, 53 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index f805680b7b..d50aac1c09 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -27,7 +27,7 @@ struct AnimationOptions;
namespace style {
class Layer;
-}
+} // namespace style
class Map : private util::noncopyable {
public:
diff --git a/platform/default/mbgl/storage/offline_database.hpp b/platform/default/mbgl/storage/offline_database.hpp
index 1706c6ba5a..3f5df3509b 100644
--- a/platform/default/mbgl/storage/offline_database.hpp
+++ b/platform/default/mbgl/storage/offline_database.hpp
@@ -15,8 +15,8 @@ namespace mapbox {
namespace sqlite {
class Database;
class Statement;
-}
-}
+} // namespace sqlite
+} // namespace mapbox
namespace mbgl {
diff --git a/platform/default/mbgl/storage/offline_download.hpp b/platform/default/mbgl/storage/offline_download.hpp
index 1a0d7536d8..27c5f0b139 100644
--- a/platform/default/mbgl/storage/offline_download.hpp
+++ b/platform/default/mbgl/storage/offline_download.hpp
@@ -17,7 +17,7 @@ class Tileset;
namespace style {
class Parser;
-}
+} // namespace style
/**
* Coordinates the request and storage of all resources for an offline region.
diff --git a/scripts/build-version.py b/scripts/build-version.py
index 800d3f6220..f4a8abb88e 100755
--- a/scripts/build-version.py
+++ b/scripts/build-version.py
@@ -67,8 +67,8 @@ extern const char *revision;
extern const char *string;
extern const unsigned int number;
-}} // namespace mbgl
}} // namespace version
+}} // namespace mbgl
""".format(
major = tag[0],
minor = tag[1],
diff --git a/src/mbgl/annotation/annotation_manager.hpp b/src/mbgl/annotation/annotation_manager.hpp
index 73b6a00a4f..d2e0813be2 100644
--- a/src/mbgl/annotation/annotation_manager.hpp
+++ b/src/mbgl/annotation/annotation_manager.hpp
@@ -21,7 +21,7 @@ class ShapeAnnotationImpl;
namespace style {
class Style;
-}
+} // namespace style
class AnnotationManager : private util::noncopyable {
public:
diff --git a/src/mbgl/annotation/annotation_tile.hpp b/src/mbgl/annotation/annotation_tile.hpp
index 1a0ae1b7ef..26a0d36f91 100644
--- a/src/mbgl/annotation/annotation_tile.hpp
+++ b/src/mbgl/annotation/annotation_tile.hpp
@@ -9,7 +9,7 @@ class AnnotationManager;
namespace style {
class UpdateParameters;
-}
+} // namespace style
class AnnotationTile : public GeometryTile {
public:
diff --git a/src/mbgl/annotation/shape_annotation_impl.hpp b/src/mbgl/annotation/shape_annotation_impl.hpp
index 60762f248d..1b8fcd5777 100644
--- a/src/mbgl/annotation/shape_annotation_impl.hpp
+++ b/src/mbgl/annotation/shape_annotation_impl.hpp
@@ -14,7 +14,7 @@ class CanonicalTileID;
namespace style {
class Style;
-}
+} // namespace style
class ShapeAnnotationImpl {
public:
diff --git a/src/mbgl/geometry/feature_index.hpp b/src/mbgl/geometry/feature_index.hpp
index 2825cce69b..0fddcb4700 100644
--- a/src/mbgl/geometry/feature_index.hpp
+++ b/src/mbgl/geometry/feature_index.hpp
@@ -13,7 +13,7 @@ namespace mbgl {
namespace style {
class Style;
-}
+} // namespace style
class CollisionTile;
class CanonicalTileID;
@@ -73,4 +73,4 @@ private:
std::unordered_map<std::string, std::vector<std::string>> bucketLayerIDs;
};
-}
+} // namespace mbgl
diff --git a/src/mbgl/renderer/bucket.hpp b/src/mbgl/renderer/bucket.hpp
index f12ed1fb96..c491d7172c 100644
--- a/src/mbgl/renderer/bucket.hpp
+++ b/src/mbgl/renderer/bucket.hpp
@@ -17,11 +17,11 @@ class CollisionTile;
namespace gl {
class ObjectStore;
-}
+} // namespace gl
namespace style {
class Layer;
-}
+} // namespace style
class Bucket : private util::noncopyable {
public:
diff --git a/src/mbgl/renderer/circle_bucket.cpp b/src/mbgl/renderer/circle_bucket.cpp
index 4ae63fed46..d86fbda489 100644
--- a/src/mbgl/renderer/circle_bucket.cpp
+++ b/src/mbgl/renderer/circle_bucket.cpp
@@ -100,4 +100,4 @@ void CircleBucket::drawCircles(CircleShader& shader, gl::ObjectStore& store) {
}
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/renderer/debug_bucket.hpp b/src/mbgl/renderer/debug_bucket.hpp
index 737b58112e..7097ae0735 100644
--- a/src/mbgl/renderer/debug_bucket.hpp
+++ b/src/mbgl/renderer/debug_bucket.hpp
@@ -12,7 +12,7 @@ class PlainShader;
namespace gl {
class ObjectStore;
-}
+} // namespace gl
class DebugBucket : private util::noncopyable {
public:
diff --git a/src/mbgl/renderer/fill_bucket.cpp b/src/mbgl/renderer/fill_bucket.cpp
index 02f346decb..f45d0ae6ae 100644
--- a/src/mbgl/renderer/fill_bucket.cpp
+++ b/src/mbgl/renderer/fill_bucket.cpp
@@ -21,8 +21,8 @@ template <> struct nth<0, mbgl::GeometryCoordinate> {
template <> struct nth<1, mbgl::GeometryCoordinate> {
inline static int64_t get(const mbgl::GeometryCoordinate& t) { return t.y; };
};
-}
-}
+} // namespace util
+} // namespace mapbox
namespace mbgl {
@@ -168,4 +168,4 @@ void FillBucket::drawVertices(OutlinePatternShader& shader, gl::ObjectStore& sto
}
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/renderer/line_bucket.cpp b/src/mbgl/renderer/line_bucket.cpp
index d207cdb8c5..611c2d685d 100644
--- a/src/mbgl/renderer/line_bucket.cpp
+++ b/src/mbgl/renderer/line_bucket.cpp
@@ -508,4 +508,4 @@ void LineBucket::drawLinePatterns(LinepatternShader& shader, gl::ObjectStore& st
}
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp
index 817cf9502d..5dfced7fe6 100644
--- a/src/mbgl/renderer/painter.cpp
+++ b/src/mbgl/renderer/painter.cpp
@@ -310,4 +310,4 @@ void Painter::setDepthSublayer(int n) {
config.depthRange = { nearDepth, farDepth };
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp
index 7fe0405627..4c51543bde 100644
--- a/src/mbgl/renderer/painter.hpp
+++ b/src/mbgl/renderer/painter.hpp
@@ -61,7 +61,7 @@ struct ClipID;
namespace util {
class ObjectStore;
-}
+} // namespace util
namespace style {
class Style;
@@ -72,7 +72,7 @@ class CircleLayer;
class SymbolLayer;
class RasterLayer;
class BackgroundLayer;
-}
+} // namespace style
struct FrameData {
std::array<uint16_t, 2> framebufferSize;
diff --git a/src/mbgl/renderer/painter_background.cpp b/src/mbgl/renderer/painter_background.cpp
index 07e5821ce8..634eed67a7 100644
--- a/src/mbgl/renderer/painter_background.cpp
+++ b/src/mbgl/renderer/painter_background.cpp
@@ -110,4 +110,4 @@ void Painter::renderBackground(const BackgroundLayer& layer) {
}
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/renderer/painter_circle.cpp b/src/mbgl/renderer/painter_circle.cpp
index 9f2cd17f7f..9953921954 100644
--- a/src/mbgl/renderer/painter_circle.cpp
+++ b/src/mbgl/renderer/painter_circle.cpp
@@ -46,4 +46,4 @@ void Painter::renderCircle(CircleBucket& bucket,
bucket.drawCircles(*circleShader, store);
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/renderer/painter_fill.cpp b/src/mbgl/renderer/painter_fill.cpp
index 4c6ad1ba0f..5317555727 100644
--- a/src/mbgl/renderer/painter_fill.cpp
+++ b/src/mbgl/renderer/painter_fill.cpp
@@ -198,4 +198,4 @@ void Painter::renderFill(FillBucket& bucket,
}
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/renderer/painter_line.cpp b/src/mbgl/renderer/painter_line.cpp
index 199fb49a58..d21497d459 100644
--- a/src/mbgl/renderer/painter_line.cpp
+++ b/src/mbgl/renderer/painter_line.cpp
@@ -164,4 +164,4 @@ void Painter::renderLine(LineBucket& bucket,
}
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/renderer/painter_raster.cpp b/src/mbgl/renderer/painter_raster.cpp
index cce71e8ce2..f3a0b720e7 100644
--- a/src/mbgl/renderer/painter_raster.cpp
+++ b/src/mbgl/renderer/painter_raster.cpp
@@ -69,4 +69,4 @@ std::array<float, 3> Painter::spinWeights(float spin) {
return spin_weights;
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/renderer/painter_symbol.cpp b/src/mbgl/renderer/painter_symbol.cpp
index d4d580e78d..1a248d494b 100644
--- a/src/mbgl/renderer/painter_symbol.cpp
+++ b/src/mbgl/renderer/painter_symbol.cpp
@@ -271,4 +271,4 @@ void Painter::renderSymbol(SymbolBucket& bucket,
config.activeTexture = GL_TEXTURE0;
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/renderer/raster_bucket.cpp b/src/mbgl/renderer/raster_bucket.cpp
index 39f8dacd92..67202e57be 100644
--- a/src/mbgl/renderer/raster_bucket.cpp
+++ b/src/mbgl/renderer/raster_bucket.cpp
@@ -43,4 +43,4 @@ bool RasterBucket::needsClipping() const {
return false;
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/renderer/render_item.hpp b/src/mbgl/renderer/render_item.hpp
index 9d650606ac..d452fb7759 100644
--- a/src/mbgl/renderer/render_item.hpp
+++ b/src/mbgl/renderer/render_item.hpp
@@ -13,7 +13,7 @@ class Bucket;
namespace style {
class Layer;
class Source;
-}
+} // namespace style
class RenderItem {
public:
diff --git a/src/mbgl/storage/resource.cpp b/src/mbgl/storage/resource.cpp
index 3f5b4a3f71..8019e4aeb7 100644
--- a/src/mbgl/storage/resource.cpp
+++ b/src/mbgl/storage/resource.cpp
@@ -86,4 +86,4 @@ Resource Resource::tile(const std::string& urlTemplate,
};
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/style/filter_evaluator.hpp b/src/mbgl/style/filter_evaluator.hpp
index 12da379241..9d5919ced1 100644
--- a/src/mbgl/style/filter_evaluator.hpp
+++ b/src/mbgl/style/filter_evaluator.hpp
@@ -159,5 +159,5 @@ private:
const GeometryTileFeature& feature;
};
-} // namespace mbgl
+} // namespace style
} // namespace mbgl
diff --git a/src/mbgl/style/property_evaluator.hpp b/src/mbgl/style/property_evaluator.hpp
index 77100bda46..0d23a44c05 100644
--- a/src/mbgl/style/property_evaluator.hpp
+++ b/src/mbgl/style/property_evaluator.hpp
@@ -61,6 +61,6 @@ namespace util {
template <typename T>
struct Interpolator<style::Faded<T>>
: Uninterpolated {};
-}
+} // namespace util
} // namespace mbgl
diff --git a/src/mbgl/text/quads.hpp b/src/mbgl/text/quads.hpp
index 9bc4f3ebb3..814e4edb73 100644
--- a/src/mbgl/text/quads.hpp
+++ b/src/mbgl/text/quads.hpp
@@ -12,7 +12,7 @@ class PositionedIcon;
namespace style {
class SymbolLayoutProperties;
-}
+} // namespace style
struct SymbolQuad {
explicit SymbolQuad(const Point<float> &tl_, const Point<float> &tr_,
diff --git a/src/mbgl/text/shaping.hpp b/src/mbgl/text/shaping.hpp
index f81230acec..c33b3788d5 100644
--- a/src/mbgl/text/shaping.hpp
+++ b/src/mbgl/text/shaping.hpp
@@ -11,7 +11,7 @@ struct SpriteAtlasElement;
namespace style {
class SymbolLayoutProperties;
-}
+} // namespace style
class PositionedIcon {
public:
diff --git a/src/mbgl/tile/geojson_tile.hpp b/src/mbgl/tile/geojson_tile.hpp
index 9cdc705d32..8cccda77b8 100644
--- a/src/mbgl/tile/geojson_tile.hpp
+++ b/src/mbgl/tile/geojson_tile.hpp
@@ -12,7 +12,7 @@ namespace mbgl {
namespace style {
class UpdateParameters;
-}
+} // namespace style
class GeoJSONTile : public GeometryTile {
public:
diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp
index 3ad54b6a95..d80b036a76 100644
--- a/src/mbgl/tile/geometry_tile.hpp
+++ b/src/mbgl/tile/geometry_tile.hpp
@@ -17,7 +17,7 @@ class FeatureIndex;
namespace style {
class Style;
-}
+} // namespace style
class GeometryTile : public Tile {
public:
diff --git a/src/mbgl/tile/raster_tile.hpp b/src/mbgl/tile/raster_tile.hpp
index eebfbe6b9c..7de5247a12 100644
--- a/src/mbgl/tile/raster_tile.hpp
+++ b/src/mbgl/tile/raster_tile.hpp
@@ -14,7 +14,7 @@ namespace gl { class TexturePool; }
namespace style {
class Layer;
class UpdateParameters;
-}
+} // namespace style
class RasterTile : public Tile {
public:
diff --git a/src/mbgl/tile/tile.hpp b/src/mbgl/tile/tile.hpp
index 058e41a024..78228e431d 100644
--- a/src/mbgl/tile/tile.hpp
+++ b/src/mbgl/tile/tile.hpp
@@ -23,7 +23,7 @@ class TileObserver;
namespace style {
class Layer;
-}
+} // namespace style
class Tile : private util::noncopyable {
public:
diff --git a/src/mbgl/tile/tile_source.hpp b/src/mbgl/tile/tile_source.hpp
index b4aff4492f..3ba3ab2704 100644
--- a/src/mbgl/tile/tile_source.hpp
+++ b/src/mbgl/tile/tile_source.hpp
@@ -12,7 +12,7 @@ class Tileset;
namespace style {
class UpdateParameters;
-}
+} // namespace style
template <typename T>
class TileSource : private util::noncopyable {
diff --git a/src/mbgl/tile/tile_worker.cpp b/src/mbgl/tile/tile_worker.cpp
index 358cfd3ca9..b47477015d 100644
--- a/src/mbgl/tile/tile_worker.cpp
+++ b/src/mbgl/tile/tile_worker.cpp
@@ -188,4 +188,4 @@ void TileWorker::insertBucket(const std::string& name, std::unique_ptr<Bucket> b
}
}
-}
+} // namespace mbgl
diff --git a/src/mbgl/tile/tile_worker.hpp b/src/mbgl/tile/tile_worker.hpp
index b325459682..f51e47b5bb 100644
--- a/src/mbgl/tile/tile_worker.hpp
+++ b/src/mbgl/tile/tile_worker.hpp
@@ -27,7 +27,7 @@ class Bucket;
namespace style {
class Layer;
class SymbolLayer;
-}
+} // namespace style
// We're using this class to shuttle the resulting buckets from the worker thread to the MapContext
// thread. This class is movable-only because the vector contains movable-only value elements.
diff --git a/src/mbgl/tile/vector_tile.hpp b/src/mbgl/tile/vector_tile.hpp
index a7e808af4e..89fb51ebcd 100644
--- a/src/mbgl/tile/vector_tile.hpp
+++ b/src/mbgl/tile/vector_tile.hpp
@@ -9,7 +9,7 @@ class Tileset;
namespace style {
class UpdateParameters;
-}
+} // namespace style
class VectorTile : public GeometryTile {
public:
diff --git a/src/mbgl/util/grid_index.cpp b/src/mbgl/util/grid_index.cpp
index cc31faeee1..cf1fcd68c9 100644
--- a/src/mbgl/util/grid_index.cpp
+++ b/src/mbgl/util/grid_index.cpp
@@ -79,4 +79,4 @@ int32_t GridIndex<T>::convertToCellCoord(int32_t x) const {
}
template class GridIndex<IndexedSubfeature>;
-}
+} // namespace mbgl
diff --git a/src/mbgl/util/grid_index.hpp b/src/mbgl/util/grid_index.hpp
index 656a4bdbd8..8ef8fb35b7 100644
--- a/src/mbgl/util/grid_index.hpp
+++ b/src/mbgl/util/grid_index.hpp
@@ -35,4 +35,4 @@ private:
};
-}
+} // namespace mbgl
diff --git a/src/mbgl/util/intersection_tests.cpp b/src/mbgl/util/intersection_tests.cpp
index 3e4ae27cd8..74b3bec388 100644
--- a/src/mbgl/util/intersection_tests.cpp
+++ b/src/mbgl/util/intersection_tests.cpp
@@ -143,5 +143,5 @@ bool multiPolygonIntersectsMultiPolygon(const GeometryCollection& multiPolygonA,
return false;
}
-}
-}
+} // namespace util
+} // namespace mbgl
diff --git a/src/mbgl/util/intersection_tests.hpp b/src/mbgl/util/intersection_tests.hpp
index 6922c6afb6..be89d14ed6 100644
--- a/src/mbgl/util/intersection_tests.hpp
+++ b/src/mbgl/util/intersection_tests.hpp
@@ -9,5 +9,5 @@ bool multiPolygonIntersectsBufferedMultiPoint(const GeometryCollection&, const G
bool multiPolygonIntersectsBufferedMultiLine(const GeometryCollection&, const GeometryCollection&, float radius);
bool multiPolygonIntersectsMultiPolygon(const GeometryCollection&, const GeometryCollection&);
-}
+} // namespace util
} // namespace mbgl
diff --git a/src/mbgl/util/utf.hpp b/src/mbgl/util/utf.hpp
index 02aabfc4c2..560ca3ba7f 100644
--- a/src/mbgl/util/utf.hpp
+++ b/src/mbgl/util/utf.hpp
@@ -17,5 +17,5 @@ class utf8_to_utf32 {
}
};
-} // namespace mbgl
} // namespace util
+} // namespace mbgl
diff --git a/test/include/mbgl/test.hpp b/test/include/mbgl/test.hpp
index e398174ef7..ad5b868f30 100644
--- a/test/include/mbgl/test.hpp
+++ b/test/include/mbgl/test.hpp
@@ -4,4 +4,4 @@ namespace mbgl {
int runTests(int argc, char* argv[]);
-}
+} // namespace mbgl
diff --git a/test/src/mbgl/test/test.cpp b/test/src/mbgl/test/test.cpp
index 39afcc97e4..4c3dad1727 100644
--- a/test/src/mbgl/test/test.cpp
+++ b/test/src/mbgl/test/test.cpp
@@ -14,4 +14,4 @@ int runTests(int argc, char *argv[]) {
return RUN_ALL_TESTS();
}
-}
+} // namespace mbgl
diff --git a/test/src/mbgl/test/util.hpp b/test/src/mbgl/test/util.hpp
index 76c00d8434..30108a8866 100644
--- a/test/src/mbgl/test/util.hpp
+++ b/test/src/mbgl/test/util.hpp
@@ -73,5 +73,5 @@ void checkImage(const std::string& base,
double imageThreshold = 0,
double pixelThreshold = 0);
-}
-}
+} // namespace test
+} // namespace mbgl
diff --git a/test/storage/offline_database.cpp b/test/storage/offline_database.cpp
index 327dd924b2..6a3262abf6 100644
--- a/test/storage/offline_database.cpp
+++ b/test/storage/offline_database.cpp
@@ -78,7 +78,7 @@ private:
bool locked = false;
};
-}
+} // namespace
TEST(OfflineDatabase, TEST_REQUIRES_WRITE(Create)) {
using namespace mbgl;