[core] add namespace comment to closing brace

This commit is contained in:
Konstantin Käfer
2015-12-01 17:30:44 +01:00
parent 6feb89cbbc
commit d5fb535058
239 changed files with 313 additions and 310 deletions

View File

@@ -167,4 +167,4 @@ double AnnotationManager::getTopOffsetPixelsForIcon(const std::string& name) {
return sprite ? -sprite->height / 2 : 0;
}
}
} // namespace mbgl

View File

@@ -59,6 +59,6 @@ private:
SpriteAtlas spriteAtlas;
};
}
} // namespace mbgl
#endif

View File

@@ -46,4 +46,4 @@ void AnnotationTileMonitor::update(std::unique_ptr<GeometryTile> tile) {
callback(nullptr, std::move(tile), Seconds::zero(), Seconds::zero());
}
}
} // namespace mbgl

View File

@@ -56,6 +56,6 @@ private:
GeometryTileMonitor::Callback callback;
};
}
} // namespace mbgl
#endif

View File

@@ -29,4 +29,4 @@ LatLngBounds PointAnnotationImpl::bounds() const {
return LatLngBounds(point.position, point.position);
}
}
} // namespace mbgl

View File

@@ -50,7 +50,7 @@ public:
const PointAnnotation point;
};
}
} // namespace mbgl
// Tell Boost Geometry how to access a std::shared_ptr<mbgl::PointAnnotation> object.
namespace boost {

View File

@@ -158,4 +158,4 @@ LatLngBounds ShapeAnnotationImpl::bounds() const {
return result;
}
}
} // namespace mbgl

View File

@@ -36,6 +36,6 @@ private:
std::unique_ptr<mapbox::util::geojsonvt::GeoJSONVT> shapeTiler;
};
}
} // namespace mbgl
#endif

View File

@@ -21,6 +21,6 @@ struct Anchor {
typedef std::vector<Anchor> Anchors;
}
} // namespace mbgl
#endif

View File

@@ -99,6 +99,6 @@ private:
std::list<Rect<T>> free;
};
}
} // namespace mbgl
#endif

View File

@@ -122,6 +122,6 @@ private:
GLuint buffer = 0;
};
}
} // namespace mbgl
#endif

View File

@@ -22,6 +22,6 @@ public:
void add(vertex_type x, vertex_type y, float ex, float ey);
};
}
} // namespace mbgl
#endif // MBGL_GEOMETRY_CIRCLE_BUFFER

View File

@@ -24,4 +24,4 @@ size_t CollisionBoxVertexBuffer::add(int16_t x, int16_t y, float ox, float oy, f
return idx;
}
}
} // namespace mbgl

View File

@@ -18,6 +18,6 @@ public:
};
}
} // namespace mbgl
#endif

View File

@@ -12,6 +12,6 @@ public:
void addText(const char *text, double left, double baseline, double scale = 1);
};
}
} // namespace mbgl
#endif

View File

@@ -44,6 +44,6 @@ public:
void add(element_type a, element_type b);
};
}
} // namespace mbgl
#endif

View File

@@ -16,6 +16,6 @@ public:
void add(vertex_type x, vertex_type y);
};
}
} // namespace mbgl
#endif

View File

@@ -56,6 +56,6 @@ private:
GLuint texture = 0;
};
};
} // namespace mbgl
#endif

View File

@@ -29,4 +29,4 @@ size_t IconVertexBuffer::add(int16_t x, int16_t y, float ox, float oy, int16_t t
return idx;
}
}
} // namespace mbgl

View File

@@ -15,6 +15,6 @@ namespace mbgl {
};
}
} // namespace mbgl
#endif

View File

@@ -41,6 +41,6 @@ private:
std::map<size_t, LinePatternPos> positions;
};
};
} // namespace mbgl
#endif

View File

@@ -34,6 +34,6 @@ public:
};
}
} // namespace mbgl
#endif

View File

@@ -11,4 +11,4 @@ StaticVertexBuffer::StaticVertexBuffer(std::initializer_list<std::pair<int16_t,
}
}
}
} // namespace mbgl

View File

@@ -21,6 +21,6 @@ public:
StaticVertexBuffer(std::initializer_list<std::pair<int16_t, int16_t>> init);
};
}
} // namespace mbgl
#endif

View File

@@ -29,4 +29,4 @@ size_t TextVertexBuffer::add(int16_t x, int16_t y, float ox, float oy, uint16_t
return idx;
}
}
} // namespace mbgl

View File

@@ -18,6 +18,6 @@ public:
};
}
} // namespace mbgl
#endif

View File

@@ -92,4 +92,4 @@ void VertexArrayObject::storeBinding(Shader &shader, GLuint vertexBuffer, GLuint
bound_elements_buffer = elementsBuffer;
}
}
} // namespace mbgl

View File

@@ -66,6 +66,6 @@ private:
GLbyte *bound_offset = 0;
};
}
} // namespace mbgl
#endif

View File

@@ -185,6 +185,6 @@ group::~group() {
}
}
}
}
}
} // namespace debugging
} // namespace gl
} // namespace mbgl

View File

@@ -22,8 +22,8 @@ struct group {
~group();
};
}
}
}
} // namespace debugging
} // namespace gl
} // namespace mbgl
#endif

View File

@@ -38,4 +38,4 @@ std::unique_ptr<Bucket> BackgroundLayer::createBucket(StyleBucketParameters&) co
return nullptr;
}
}
} // namespace mbgl

View File

@@ -28,6 +28,6 @@ public:
BackgroundPaintProperties paint;
};
}
} // namespace mbgl
#endif

View File

@@ -54,4 +54,4 @@ std::unique_ptr<Bucket> CircleLayer::createBucket(StyleBucketParameters& paramet
return std::move(bucket);
}
}
} // namespace mbgl

View File

@@ -35,6 +35,6 @@ public:
CirclePaintProperties paint;
};
}
} // namespace mbgl
#endif

View File

@@ -67,4 +67,4 @@ std::unique_ptr<Bucket> FillLayer::createBucket(StyleBucketParameters& parameter
return std::move(bucket);
}
}
} // namespace mbgl

View File

@@ -32,6 +32,6 @@ public:
FillPaintProperties paint;
};
}
} // namespace mbgl
#endif

View File

@@ -86,4 +86,4 @@ std::unique_ptr<Bucket> LineLayer::createBucket(StyleBucketParameters& parameter
return std::move(bucket);
}
}
} // namespace mbgl

View File

@@ -51,6 +51,6 @@ public:
LinePaintProperties paint;
};
}
} // namespace mbgl
#endif

View File

@@ -50,4 +50,4 @@ std::unique_ptr<Bucket> RasterLayer::createBucket(StyleBucketParameters&) const
return nullptr;
}
}
} // namespace mbgl

View File

@@ -32,6 +32,6 @@ public:
RasterPaintProperties paint;
};
}
} // namespace mbgl
#endif

View File

@@ -188,4 +188,4 @@ std::unique_ptr<Bucket> SymbolLayer::createBucket(StyleBucketParameters& paramet
return std::move(bucket);
}
}
} // namespace mbgl

View File

@@ -100,6 +100,6 @@ public:
SpriteAtlas* spriteAtlas;
};
}
} // namespace mbgl
#endif

View File

@@ -14,4 +14,4 @@ mapbox::util::optional<Value> GeometryTileFeatureExtractor::getValue(const std::
template bool evaluate(const FilterExpression&, const GeometryTileFeatureExtractor&);
}
} // namespace mbgl

View File

@@ -79,6 +79,6 @@ private:
const GeometryTileFeature& feature;
};
}
} // namespace mbgl
#endif

View File

@@ -500,4 +500,4 @@ void Map::dumpDebugLogs() const {
context->invokeSync(&MapContext::dumpDebugLogs);
}
}
} // namespace mbgl

View File

@@ -320,4 +320,4 @@ void MapContext::dumpDebugLogs() const {
Log::Info(Event::General, "--------------------------------------------------------------------------------");
}
}
} // namespace mbgl

View File

@@ -95,6 +95,6 @@ private:
FrameData frameData;
};
}
} // namespace mbgl
#endif

View File

@@ -41,4 +41,4 @@ std::vector<std::string> MapData::getClasses() const {
return classes;
}
}
} // namespace mbgl

View File

@@ -152,6 +152,6 @@ public:
bool loading = false;
};
}
} // namespace mbgl
#endif

View File

@@ -37,6 +37,6 @@ private:
std::unique_ptr<WorkRequest> workRequest;
};
}
} // namespace mbgl
#endif

View File

@@ -600,4 +600,4 @@ void Source::dumpDebugLogs() const {
}
}
}
} // namespace mbgl

View File

@@ -122,6 +122,6 @@ private:
Observer* observer_ = nullptr;
};
}
} // namespace mbgl
#endif

View File

@@ -23,6 +23,6 @@ public:
util::ptr<TileData> data;
};
}
} // namespace mbgl
#endif

View File

@@ -61,4 +61,4 @@ void TileCache::clear() {
tiles.clear();
}
};
} // namespace mbgl

View File

@@ -25,6 +25,6 @@ private:
size_t size;
};
};
} // namespace mbgl
#endif

View File

@@ -63,4 +63,4 @@ TileID::operator std::string() const {
return util::toString(z) + "/" + util::toString(x) + "/" + util::toString(y);
}
}
} // namespace mbgl

View File

@@ -54,6 +54,6 @@ public:
};
}
} // namespace mbgl
#endif

View File

@@ -88,6 +88,6 @@ private:
std::function<void()> transitionFinishFn;
};
}
} // namespace mbgl
#endif

View File

@@ -205,4 +205,4 @@ std::unique_ptr<FileRequest> VectorTileMonitor::monitorTile(const GeometryTileMo
});
}
}
} // namespace mbgl

View File

@@ -70,6 +70,6 @@ private:
std::shared_ptr<const std::string> data;
};
}
} // namespace mbgl
#endif

View File

@@ -191,4 +191,4 @@ void VectorTileData::cancel() {
workRequest.reset();
}
}
} // namespace mbgl

View File

@@ -19,4 +19,4 @@ void View::notifyMapChange(MapChange) {
}
}
} // namespace mbgl

View File

@@ -62,8 +62,8 @@ void checkError(const char *cmd, const char *file, int line) {
throw ::mbgl::gl::Error(err, std::string(cmd) + ": Error GL_" + error + " - " + file + ":" + util::toString(line));
}
}
}
}
} // namespace gl
} // namespace mbgl
#ifdef GL_TRACK
#undef glBindTexture

View File

@@ -12,7 +12,7 @@ namespace {
static std::unique_ptr<Log::Observer> currentObserver;
}
} // namespace
void Log::setObserver(std::unique_ptr<Observer> observer) {
currentObserver = std::move(observer);
@@ -63,4 +63,4 @@ void Log::record(EventSeverity severity, Event event, int64_t code, const std::s
platformRecord(severity, logStream.str());
}
}
} // namespace mbgl

View File

@@ -46,6 +46,6 @@ protected:
};
}
} // namespace mbgl
#endif

View File

@@ -28,6 +28,6 @@ private:
VertexArrayObject array;
};
}
} // namespace mbgl
#endif

View File

@@ -63,6 +63,6 @@ private:
static const int vertices_per_group = 3;
};
}
} // namespace mbgl
#endif

View File

@@ -35,6 +35,6 @@ public:
std::deque<FrameSnapshot> history;
};
}
} // namespace mbgl
#endif

View File

@@ -21,5 +21,5 @@ const Program::Type Program::Default = 0;
const LineWidth::Type LineWidth::Default = 1;
const Viewport::Type Viewport::Default = { 0, 0, 0, 0 };
}
}
} // namespace gl
} // namespace mbgl

View File

@@ -64,6 +64,6 @@ private:
std::vector<std::unique_ptr<TriangleGroup>> triangleGroups;
};
}
} // namespace mbgl
#endif

View File

@@ -236,6 +236,6 @@ public:
VertexArrayObject tileBorderArray;
};
}
} // namespace mbgl
#endif

View File

@@ -25,6 +25,6 @@ public:
Raster raster;
};
}
} // namespace mbgl
#endif

View File

@@ -26,6 +26,6 @@ constexpr inline RenderPass operator&(RenderPass a, RenderPass b) {
static_cast<std::underlying_type<RenderPass>::type>(b));
}
}
} // namespace mbgl
#endif

View File

@@ -616,4 +616,4 @@ void SymbolBucket::drawCollisionBoxes(CollisionBoxShader &shader) {
MBGL_CHECK_ERROR(glDrawArrays(GL_LINES, 0, group->vertex_length));
}
}
}
} // namespace mbgl

View File

@@ -147,6 +147,6 @@ private:
std::unique_ptr<SymbolRenderData> renderDataInProgress;
};
}
} // namespace mbgl
#endif

View File

@@ -19,6 +19,6 @@ public:
Uniform<GLfloat> u_blur = {"u_blur", *this};
};
}
} // namespace mbgl
#endif // MBGL_SHADER_CIRCLE_SHADER

View File

@@ -18,6 +18,6 @@ public:
Uniform<GLfloat> u_blur = {"u_blur", *this};
};
}
} // namespace mbgl
#endif

View File

@@ -30,6 +30,6 @@ protected:
GLint a_data2 = -1;
};
}
} // namespace mbgl
#endif

View File

@@ -26,6 +26,6 @@ private:
};
}
} // namespace mbgl
#endif

View File

@@ -32,6 +32,6 @@ public:
private:
GLint a_data = -1;
};
}
} // namespace mbgl
#endif

View File

@@ -33,6 +33,6 @@ private:
};
}
} // namespace mbgl
#endif

View File

@@ -17,6 +17,6 @@ public:
Uniform<std::array<GLfloat, 2>> u_world = {"u_world", *this};
};
}
} // namespace mbgl
#endif

View File

@@ -24,6 +24,6 @@ public:
UniformMatrix<3> u_patternmatrix_b = {"u_patternmatrix_b", *this};
};
}
} // namespace mbgl
#endif

View File

@@ -16,6 +16,6 @@ public:
Uniform<std::array<GLfloat, 4>> u_color = {"u_color", *this};
};
}
} // namespace mbgl
#endif

View File

@@ -23,6 +23,6 @@ public:
Uniform<std::array<GLfloat, 3>> u_spin_weights = {"u_spin_weights", *this};
};
}
} // namespace mbgl
#endif

View File

@@ -40,6 +40,6 @@ public:
void bind(GLbyte *offset) final;
};
}
} // namespace mbgl
#endif

View File

@@ -34,6 +34,6 @@ private:
GLuint fragShader = 0;
};
}
} // namespace mbgl
#endif

View File

@@ -44,4 +44,4 @@ void UniformMatrix<4>::bind(const std::array<GLfloat, 16>& t) {
// Add more as needed.
}
} // namespace mbgl

View File

@@ -56,6 +56,6 @@ private:
GLint location;
};
}
} // namespace mbgl
#endif

View File

@@ -99,6 +99,6 @@ private:
static const int buffer = 1;
};
};
} // namespace mbgl
#endif

View File

@@ -110,6 +110,6 @@ private:
util::AsyncTask reachability;
};
}
} // namespace mbgl
#endif

View File

@@ -2,4 +2,4 @@
namespace mbgl {
}
} // namespace mbgl

View File

@@ -16,4 +16,4 @@ Seconds HTTPRequestBase::parseCacheControl(const char *value) {
return Seconds::zero();
}
}
} // namespace mbgl

View File

@@ -29,4 +29,4 @@ void NetworkStatus::Reachable() {
}
}
}
} // namespace mbgl

View File

@@ -46,4 +46,4 @@ ClassID ClassDictionary::normalize(ClassID id) {
}
}
}
} // namespace mbgl

View File

@@ -32,6 +32,6 @@ private:
uint32_t offset = 0;
};
}
} // namespace mbgl
#endif

View File

@@ -125,4 +125,4 @@ FilterExpression parseFilterExpression(const rapidjson::Value& value) {
}
}
}
} // namespace mbgl

View File

@@ -120,6 +120,6 @@ struct NoneExpression {
bool evaluate(const Extractor&) const;
};
}
} // namespace mbgl
#endif

View File

@@ -116,4 +116,4 @@ bool NoneExpression::evaluate(const Extractor& extractor) const {
return true;
}
}
} // namespace mbgl

View File

@@ -136,4 +136,4 @@ Faded<T> Function<Faded<T>>::evaluate(const StyleCalculationParameters& paramete
template class Function<Faded<std::string>>;
template class Function<Faded<std::vector<float>>>;
}
} // namespace mbgl

Some files were not shown because too many files have changed in this diff Show More