[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

@@ -9,6 +9,6 @@ namespace mbgl {
using AnnotationID = uint32_t;
using AnnotationIDs = std::vector<AnnotationID>;
}
} // namespace mbgl
#endif

View File

@@ -17,6 +17,6 @@ public:
const std::string icon;
};
}
} // namespace mbgl
#endif

View File

@@ -40,6 +40,6 @@ public:
const Properties properties;
};
}
} // namespace mbgl
#endif

View File

@@ -22,6 +22,6 @@ struct CameraOptions {
std::function<void()> transitionFinishFn;
};
}
} // namespace mbgl
#endif /* MBGL_MAP_CAMERA */

View File

@@ -30,7 +30,7 @@ struct CameraOptions;
namespace util {
template <class T> class Thread;
}
} // namespace util
struct EdgeInsets {
double top = 0;
@@ -189,6 +189,6 @@ private:
RenderState renderState = RenderState::never;
};
}
} // namespace mbgl
#endif

View File

@@ -80,6 +80,6 @@ public:
protected:
mbgl::Map *map = nullptr;
};
}
} // namespace mbgl
#endif

View File

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

View File

@@ -76,6 +76,6 @@ private:
std::thread::id thread;
};
}
} // namespace mbgl
#endif

View File

@@ -22,6 +22,6 @@ public:
EnumType debug = 0;
};
}
} // namespace mbgl
#endif

View File

@@ -85,6 +85,6 @@ constexpr EventPermutation disabledEventPermutations[] = {
{ EventSeverity::Debug, Event::Shader }
};
}
} // namespace mbgl
#endif

View File

@@ -110,8 +110,8 @@ public:
using glProc = void (*)();
void InitializeExtensions(glProc (*getProcAddress)(const char *));
}
}
} // namespace gl
} // namespace mbgl
#ifdef GL_ES_VERSION_2_0
#define glClearDepth glClearDepthf

View File

@@ -72,6 +72,6 @@ private:
static void platformRecord(EventSeverity severity, const std::string &msg);
};
}
} // namespace mbgl
#endif

View File

@@ -29,7 +29,7 @@ void showDebugImage(std::string name, const char *data, size_t width, size_t hei
// Shows an alpha image with the specified dimensions in a named window.
void showColorDebugImage(std::string name, const char *data, size_t logical_width, size_t logical_height, size_t width, size_t height);
}
}
} // namespace platform
} // namespace mbgl
#endif

View File

@@ -35,6 +35,6 @@ public:
const bool sdf;
};
}
} // namespace mbgl
#endif

View File

@@ -8,7 +8,7 @@ namespace mbgl {
namespace util {
template <typename T> class Thread;
}
} // namespace util
class DefaultFileSource : public FileSource {
public:
@@ -29,6 +29,6 @@ private:
std::string accessToken;
};
}
} // namespace mbgl
#endif

View File

@@ -23,6 +23,6 @@ public:
virtual void put(const Resource &resource, std::shared_ptr<const Response> response, Hint hint) = 0;
};
}
} // namespace mbgl
#endif

View File

@@ -30,6 +30,6 @@ public:
virtual std::unique_ptr<FileRequest> request(const Resource&, Callback) = 0;
};
}
} // namespace mbgl
#endif

View File

@@ -8,7 +8,7 @@ namespace mbgl {
namespace util {
class AsyncTask;
}
} // namespace util
class NetworkStatus {
public:
@@ -22,6 +22,6 @@ private:
static std::set<util::AsyncTask*> observers;
};
}
} // namespace mbgl
#endif

View File

@@ -32,6 +32,6 @@ struct Resource {
};
}
} // namespace mbgl
#endif

View File

@@ -9,7 +9,7 @@ namespace mbgl {
namespace util {
template <typename T> class Thread;
}
} // namespace util
class SQLiteCache : public FileCache {
public:
@@ -36,6 +36,6 @@ private:
static std::weak_ptr<SQLiteCache> masterPtr;
};
}
} // namespace mbgl
#endif

View File

@@ -212,7 +212,7 @@ MBGL_DEFINE_ENUM_CLASS(TextTransformTypeClass, TextTransformType, {
{ TextTransformType::Lowercase, "lowercase" },
});
}
} // namespace mbgl
#endif

View File

@@ -42,6 +42,6 @@ Milliseconds toMilliseconds(std::chrono::time_point<_Clock, _Duration> time_poin
return asMilliseconds(toDuration<_Clock, _Duration>(time_point));
}
}
} // namespace mbgl
#endif

View File

@@ -17,7 +17,7 @@ extern const double M2PI;
extern const double EARTH_RADIUS_M;
extern const double LATITUDE_MAX;
}
} // namespace util
namespace debug {
@@ -32,8 +32,8 @@ extern const bool missingFontFaceWarning;
extern const bool glyphWarning;
extern const bool shapingWarning;
}
} // namespace debug
}
} // namespace mbgl
#endif

View File

@@ -49,7 +49,7 @@ public:
using name = ::mbgl::Enum<type, type##_names, sizeof(type##_names) / sizeof(::mbgl::EnumValue<type>)>; \
inline std::ostream& operator<<(std::ostream& os, type t) { return os << name(t).str(); }
}
} // namespace mbgl
#endif

View File

@@ -46,7 +46,7 @@ struct TileLoadingException : Exception {
inline TileLoadingException(const std::string &msg) : Exception(msg) {}
};
}
}
} // namespace util
} // namespace mbgl
#endif

View File

@@ -100,6 +100,6 @@ struct MetersBounds {
}
};
}
} // namespace mbgl
#endif

View File

@@ -84,7 +84,7 @@ using PreservePixelZoom = Preserve<std::array<double, 2>, getPixelZoom, setPixel
using PreserveRasterPos = Preserve<std::array<double, 4>, getRasterPos, setRasterPos>;
#endif
}
}
} // namespace gl
} // namespace mbgl
#endif

View File

@@ -36,6 +36,6 @@ using PremultipliedImage = Image<ImageAlphaMode::Premultiplied>;
PremultipliedImage decodeImage(const std::string&);
std::string encodePNG(const PremultipliedImage&);
}
} // namespace mbgl
#endif

View File

@@ -42,7 +42,7 @@ void rotate_z(mat4& out, const mat4& a, double rad);
void scale(mat4& out, const mat4& a, double x, double y, double z);
void multiply(mat4& out, const mat4& a, const mat4& b);
}
}
} // namespace matrix
} // namespace mbgl
#endif

View File

@@ -130,7 +130,7 @@ T smoothstep(T edge0, T edge1, T x) {
// (== number of bits required to store x)
uint32_t ceil_log2(uint64_t x);
}
}
} // namespace util
} // namespace mbgl
#endif

View File

@@ -14,10 +14,11 @@ protected:
noncopyable( noncopyable const& ) = delete;
noncopyable& operator=(noncopyable const& ) = delete;
};
}
} // namespace non_copyable_
typedef non_copyable_::noncopyable noncopyable;
}}
} // namespace util
} // namespace mbgl
#endif

View File

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

View File

@@ -23,7 +23,7 @@ public:
return ::std::shared_ptr<T>::operator*();
}
};
}
}
} // namespace util
} // namespace mbgl
#endif

View File

@@ -179,7 +179,7 @@ private:
std::unique_ptr<Impl> impl;
};
}
}
} // namespace util
} // namespace mbgl
#endif

View File

@@ -24,7 +24,7 @@ void erase_if(Container &container, Predicate pred) {
erase_if(container, container.begin(), container.end(), pred);
}
}
}
} // namespace util
} // namespace mbgl
#endif

View File

@@ -35,7 +35,7 @@ inline std::string sprintf(const std::string &msg, Args... args) {
return sprintf<max>(msg.c_str(), args...);
}
}
}
} // namespace util
} // namespace mbgl
#endif

View File

@@ -17,8 +17,8 @@ std::string rfc1123(std::time_t time);
// YYYY-mm-dd HH:MM:SS e.g. "2015-11-26 16:11:23"
std::string iso8601(std::time_t time);
}
} // namespace util
}
} // namespace mbgl
#endif

View File

@@ -115,7 +115,7 @@ private:
double cy;
};
}
}
} // namespace util
} // namespace mbgl
#endif

View File

@@ -19,6 +19,7 @@ class utf8_to_utf32 {
}
};
}}
} // namespace util
} // namespace mbgl
#endif

View File

@@ -122,6 +122,6 @@ struct vec4 {
using Coordinate = vec2<int16_t>;
}
} // namespace mbgl
#endif

View File

@@ -19,6 +19,6 @@ private:
std::shared_ptr<WorkTask> task;
};
}
} // namespace mbgl
#endif

View File

@@ -16,6 +16,6 @@ public:
virtual void cancel() = 0;
};
}
} // namespace mbgl
#endif

View File

@@ -57,7 +57,7 @@ public:
}
};
}
} // namespace
namespace mbgl {
@@ -233,4 +233,4 @@ std::unique_ptr<AssetContextBase> AssetContextBase::createContext() {
return std::make_unique<AssetFSContext>();
}
}
} // namespace mbgl

View File

@@ -76,5 +76,5 @@ void AsyncTask::unref() {
impl->unref();
}
}
}
} // namespace util
} // namespace mbgl

View File

@@ -536,5 +536,5 @@ void showColorDebugImage(std::string name, const char *data, size_t logicalWidth
}
#endif
}
}
} // namespace platform
} // namespace mbgl

View File

@@ -81,4 +81,4 @@ HeadlessDisplay::~HeadlessDisplay() {
#endif
}
}
} // namespace mbgl

View File

@@ -303,4 +303,4 @@ void HeadlessView::afterRender() {
// no-op
}
}
} // namespace mbgl

View File

@@ -8,4 +8,4 @@ void Log::platformRecord(EventSeverity severity, const std::string &msg) {
std::cerr << "[" << severity << "] " << msg << std::endl;
}
}
} // namespace mbgl

View File

@@ -13,7 +13,7 @@ namespace {
using namespace mbgl::util;
static ThreadLocal<RunLoop>& current = *new ThreadLocal<RunLoop>;
}
} // namespace
namespace mbgl {
namespace util {
@@ -203,5 +203,5 @@ void RunLoop::removeWatch(int fd) {
uv_close(reinterpret_cast<uv_handle_t*>(&watch->poll), &Watch::onClose);
}
}
}
} // namespace util
} // namespace mbgl

View File

@@ -184,5 +184,5 @@ void Statement::reset() {
sqlite3_reset(stmt);
}
}
}
} // namespace sqlite
} // namespace mapbox

View File

@@ -246,4 +246,4 @@ std::shared_ptr<SQLiteCache> SharedSQLiteCache::get(const std::string &path) {
std::weak_ptr<SQLiteCache> SharedSQLiteCache::masterPtr;
}
} // namespace mbgl

View File

@@ -83,5 +83,5 @@ void Timer::unref() {
impl->unref();
}
}
}
} // namespace util
} // namespace mbgl

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

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