diff options
239 files changed, 313 insertions, 310 deletions
diff --git a/include/mbgl/annotation/annotation.hpp b/include/mbgl/annotation/annotation.hpp index b3e3ab52b6..00b2446e40 100644 --- a/include/mbgl/annotation/annotation.hpp +++ b/include/mbgl/annotation/annotation.hpp @@ -9,6 +9,6 @@ namespace mbgl { using AnnotationID = uint32_t; using AnnotationIDs = std::vector<AnnotationID>; -} +} // namespace mbgl #endif diff --git a/include/mbgl/annotation/point_annotation.hpp b/include/mbgl/annotation/point_annotation.hpp index 17b6fe5369..e226673997 100644 --- a/include/mbgl/annotation/point_annotation.hpp +++ b/include/mbgl/annotation/point_annotation.hpp @@ -17,6 +17,6 @@ public: const std::string icon; }; -} +} // namespace mbgl #endif diff --git a/include/mbgl/annotation/shape_annotation.hpp b/include/mbgl/annotation/shape_annotation.hpp index b220ef50cb..fffa7dab6e 100644 --- a/include/mbgl/annotation/shape_annotation.hpp +++ b/include/mbgl/annotation/shape_annotation.hpp @@ -40,6 +40,6 @@ public: const Properties properties; }; -} +} // namespace mbgl #endif diff --git a/include/mbgl/map/camera.hpp b/include/mbgl/map/camera.hpp index d787a39e11..18e7dbf96c 100644 --- a/include/mbgl/map/camera.hpp +++ b/include/mbgl/map/camera.hpp @@ -22,6 +22,6 @@ struct CameraOptions { std::function<void()> transitionFinishFn; }; -} +} // namespace mbgl #endif /* MBGL_MAP_CAMERA */ diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 5ea8c6f877..ad13d24eb6 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -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 diff --git a/include/mbgl/map/view.hpp b/include/mbgl/map/view.hpp index ecdd93377f..6f481c4458 100644 --- a/include/mbgl/map/view.hpp +++ b/include/mbgl/map/view.hpp @@ -80,6 +80,6 @@ public: protected: mbgl::Map *map = nullptr; }; -} +} // namespace mbgl #endif diff --git a/include/mbgl/platform/default/headless_display.hpp b/include/mbgl/platform/default/headless_display.hpp index bf67e3c3b3..4b160ddc68 100644 --- a/include/mbgl/platform/default/headless_display.hpp +++ b/include/mbgl/platform/default/headless_display.hpp @@ -20,6 +20,6 @@ public: #endif }; -} +} // namespace mbgl #endif diff --git a/include/mbgl/platform/default/headless_view.hpp b/include/mbgl/platform/default/headless_view.hpp index 4b25b81bb9..07226b5f9b 100644 --- a/include/mbgl/platform/default/headless_view.hpp +++ b/include/mbgl/platform/default/headless_view.hpp @@ -76,6 +76,6 @@ private: std::thread::id thread; }; -} +} // namespace mbgl #endif diff --git a/include/mbgl/platform/default/settings_json.hpp b/include/mbgl/platform/default/settings_json.hpp index ceec1e7fde..707d05eb18 100644 --- a/include/mbgl/platform/default/settings_json.hpp +++ b/include/mbgl/platform/default/settings_json.hpp @@ -22,6 +22,6 @@ public: EnumType debug = 0; }; -} +} // namespace mbgl #endif diff --git a/include/mbgl/platform/event.hpp b/include/mbgl/platform/event.hpp index c80186da27..5c59dc69c7 100644 --- a/include/mbgl/platform/event.hpp +++ b/include/mbgl/platform/event.hpp @@ -85,6 +85,6 @@ constexpr EventPermutation disabledEventPermutations[] = { { EventSeverity::Debug, Event::Shader } }; -} +} // namespace mbgl #endif diff --git a/include/mbgl/platform/gl.hpp b/include/mbgl/platform/gl.hpp index 6c1229f6d1..1e98ea7f3b 100644 --- a/include/mbgl/platform/gl.hpp +++ b/include/mbgl/platform/gl.hpp @@ -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 diff --git a/include/mbgl/platform/log.hpp b/include/mbgl/platform/log.hpp index 86a8cdbef1..a2a9119905 100644 --- a/include/mbgl/platform/log.hpp +++ b/include/mbgl/platform/log.hpp @@ -72,6 +72,6 @@ private: static void platformRecord(EventSeverity severity, const std::string &msg); }; -} +} // namespace mbgl #endif diff --git a/include/mbgl/platform/platform.hpp b/include/mbgl/platform/platform.hpp index f828af37f4..f2550a3e13 100644 --- a/include/mbgl/platform/platform.hpp +++ b/include/mbgl/platform/platform.hpp @@ -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 diff --git a/include/mbgl/sprite/sprite_image.hpp b/include/mbgl/sprite/sprite_image.hpp index f36ec5e286..c5b063ff7f 100644 --- a/include/mbgl/sprite/sprite_image.hpp +++ b/include/mbgl/sprite/sprite_image.hpp @@ -35,6 +35,6 @@ public: const bool sdf; }; -} +} // namespace mbgl #endif diff --git a/include/mbgl/storage/default_file_source.hpp b/include/mbgl/storage/default_file_source.hpp index 8d2832b33b..e669cebf72 100644 --- a/include/mbgl/storage/default_file_source.hpp +++ b/include/mbgl/storage/default_file_source.hpp @@ -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 diff --git a/include/mbgl/storage/file_cache.hpp b/include/mbgl/storage/file_cache.hpp index b32bdf67e6..65d6dfbff0 100644 --- a/include/mbgl/storage/file_cache.hpp +++ b/include/mbgl/storage/file_cache.hpp @@ -23,6 +23,6 @@ public: virtual void put(const Resource &resource, std::shared_ptr<const Response> response, Hint hint) = 0; }; -} +} // namespace mbgl #endif diff --git a/include/mbgl/storage/file_source.hpp b/include/mbgl/storage/file_source.hpp index 0167eccc08..8d08315cd9 100644 --- a/include/mbgl/storage/file_source.hpp +++ b/include/mbgl/storage/file_source.hpp @@ -30,6 +30,6 @@ public: virtual std::unique_ptr<FileRequest> request(const Resource&, Callback) = 0; }; -} +} // namespace mbgl #endif diff --git a/include/mbgl/storage/network_status.hpp b/include/mbgl/storage/network_status.hpp index a1c417c4cf..2a0ab78edd 100644 --- a/include/mbgl/storage/network_status.hpp +++ b/include/mbgl/storage/network_status.hpp @@ -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 diff --git a/include/mbgl/storage/resource.hpp b/include/mbgl/storage/resource.hpp index 0c2a27e9d1..1bbd90ea37 100644 --- a/include/mbgl/storage/resource.hpp +++ b/include/mbgl/storage/resource.hpp @@ -32,6 +32,6 @@ struct Resource { }; -} +} // namespace mbgl #endif diff --git a/include/mbgl/storage/sqlite_cache.hpp b/include/mbgl/storage/sqlite_cache.hpp index 3054b6c73c..4b51d94920 100644 --- a/include/mbgl/storage/sqlite_cache.hpp +++ b/include/mbgl/storage/sqlite_cache.hpp @@ -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 diff --git a/include/mbgl/style/types.hpp b/include/mbgl/style/types.hpp index c3e8470886..be66aca485 100644 --- a/include/mbgl/style/types.hpp +++ b/include/mbgl/style/types.hpp @@ -212,7 +212,7 @@ MBGL_DEFINE_ENUM_CLASS(TextTransformTypeClass, TextTransformType, { { TextTransformType::Lowercase, "lowercase" }, }); -} +} // namespace mbgl #endif diff --git a/include/mbgl/util/chrono.hpp b/include/mbgl/util/chrono.hpp index 9c99c7bcdf..ce005485bc 100644 --- a/include/mbgl/util/chrono.hpp +++ b/include/mbgl/util/chrono.hpp @@ -42,6 +42,6 @@ Milliseconds toMilliseconds(std::chrono::time_point<_Clock, _Duration> time_poin return asMilliseconds(toDuration<_Clock, _Duration>(time_point)); } -} +} // namespace mbgl #endif diff --git a/include/mbgl/util/constants.hpp b/include/mbgl/util/constants.hpp index bb5aad2af3..113a368128 100644 --- a/include/mbgl/util/constants.hpp +++ b/include/mbgl/util/constants.hpp @@ -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 diff --git a/include/mbgl/util/enum.hpp b/include/mbgl/util/enum.hpp index 3c3e4a5c4e..5d64ed6718 100644 --- a/include/mbgl/util/enum.hpp +++ b/include/mbgl/util/enum.hpp @@ -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 diff --git a/include/mbgl/util/exception.hpp b/include/mbgl/util/exception.hpp index 31fa693f8d..06098840a8 100644 --- a/include/mbgl/util/exception.hpp +++ b/include/mbgl/util/exception.hpp @@ -46,7 +46,7 @@ struct TileLoadingException : Exception { inline TileLoadingException(const std::string &msg) : Exception(msg) {} }; -} -} +} // namespace util +} // namespace mbgl #endif diff --git a/include/mbgl/util/geo.hpp b/include/mbgl/util/geo.hpp index 4112b183b2..2f0e4f6fdc 100644 --- a/include/mbgl/util/geo.hpp +++ b/include/mbgl/util/geo.hpp @@ -100,6 +100,6 @@ struct MetersBounds { } }; -} +} // namespace mbgl #endif diff --git a/include/mbgl/util/gl_helper.hpp b/include/mbgl/util/gl_helper.hpp index 288fc2c681..7d104fb80e 100644 --- a/include/mbgl/util/gl_helper.hpp +++ b/include/mbgl/util/gl_helper.hpp @@ -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 diff --git a/include/mbgl/util/image.hpp b/include/mbgl/util/image.hpp index b8e018f696..6188f6a404 100644 --- a/include/mbgl/util/image.hpp +++ b/include/mbgl/util/image.hpp @@ -36,6 +36,6 @@ using PremultipliedImage = Image<ImageAlphaMode::Premultiplied>; PremultipliedImage decodeImage(const std::string&); std::string encodePNG(const PremultipliedImage&); -} +} // namespace mbgl #endif diff --git a/include/mbgl/util/mat4.hpp b/include/mbgl/util/mat4.hpp index 9c34332400..e5b508e547 100644 --- a/include/mbgl/util/mat4.hpp +++ b/include/mbgl/util/mat4.hpp @@ -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 diff --git a/include/mbgl/util/math.hpp b/include/mbgl/util/math.hpp index 37b1dd3431..9be0568e12 100644 --- a/include/mbgl/util/math.hpp +++ b/include/mbgl/util/math.hpp @@ -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 diff --git a/include/mbgl/util/noncopyable.hpp b/include/mbgl/util/noncopyable.hpp index ada701efc6..1789a36de9 100644 --- a/include/mbgl/util/noncopyable.hpp +++ b/include/mbgl/util/noncopyable.hpp @@ -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 diff --git a/include/mbgl/util/projection.hpp b/include/mbgl/util/projection.hpp index aff223826a..f067db2e1f 100644 --- a/include/mbgl/util/projection.hpp +++ b/include/mbgl/util/projection.hpp @@ -50,6 +50,6 @@ public: } }; -} +} // namespace mbgl #endif diff --git a/include/mbgl/util/ptr.hpp b/include/mbgl/util/ptr.hpp index 6e02f956f3..7e8f8ecc18 100644 --- a/include/mbgl/util/ptr.hpp +++ b/include/mbgl/util/ptr.hpp @@ -23,7 +23,7 @@ public: return ::std::shared_ptr<T>::operator*(); } }; -} -} +} // namespace util +} // namespace mbgl #endif
\ No newline at end of file diff --git a/include/mbgl/util/run_loop.hpp b/include/mbgl/util/run_loop.hpp index 85b8b8d665..3cf92f56d0 100644 --- a/include/mbgl/util/run_loop.hpp +++ b/include/mbgl/util/run_loop.hpp @@ -179,7 +179,7 @@ private: std::unique_ptr<Impl> impl; }; -} -} +} // namespace util +} // namespace mbgl #endif diff --git a/include/mbgl/util/std.hpp b/include/mbgl/util/std.hpp index 0e2d3346bf..bab5c1494d 100644 --- a/include/mbgl/util/std.hpp +++ b/include/mbgl/util/std.hpp @@ -24,7 +24,7 @@ void erase_if(Container &container, Predicate pred) { erase_if(container, container.begin(), container.end(), pred); } -} -} +} // namespace util +} // namespace mbgl #endif diff --git a/include/mbgl/util/string.hpp b/include/mbgl/util/string.hpp index 672ead2443..9e2b2d8819 100644 --- a/include/mbgl/util/string.hpp +++ b/include/mbgl/util/string.hpp @@ -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 diff --git a/include/mbgl/util/time.hpp b/include/mbgl/util/time.hpp index ec8dafa45e..181c961ab2 100644 --- a/include/mbgl/util/time.hpp +++ b/include/mbgl/util/time.hpp @@ -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 diff --git a/include/mbgl/util/unitbezier.hpp b/include/mbgl/util/unitbezier.hpp index 095e15f809..ce34534d5d 100644 --- a/include/mbgl/util/unitbezier.hpp +++ b/include/mbgl/util/unitbezier.hpp @@ -115,7 +115,7 @@ private: double cy; }; -} -} +} // namespace util +} // namespace mbgl #endif diff --git a/include/mbgl/util/utf.hpp b/include/mbgl/util/utf.hpp index d6ba2a1f2f..3d61609c0d 100644 --- a/include/mbgl/util/utf.hpp +++ b/include/mbgl/util/utf.hpp @@ -19,6 +19,7 @@ class utf8_to_utf32 { } }; -}} +} // namespace util +} // namespace mbgl #endif diff --git a/include/mbgl/util/vec.hpp b/include/mbgl/util/vec.hpp index 4d2d6f6a74..63fac9e032 100644 --- a/include/mbgl/util/vec.hpp +++ b/include/mbgl/util/vec.hpp @@ -122,6 +122,6 @@ struct vec4 { using Coordinate = vec2<int16_t>; -} +} // namespace mbgl #endif diff --git a/include/mbgl/util/work_request.hpp b/include/mbgl/util/work_request.hpp index f2aa2bbacc..bd1d97ee70 100644 --- a/include/mbgl/util/work_request.hpp +++ b/include/mbgl/util/work_request.hpp @@ -19,6 +19,6 @@ private: std::shared_ptr<WorkTask> task; }; -} +} // namespace mbgl #endif diff --git a/include/mbgl/util/work_task.hpp b/include/mbgl/util/work_task.hpp index 2224b211c4..a874625c81 100644 --- a/include/mbgl/util/work_task.hpp +++ b/include/mbgl/util/work_task.hpp @@ -16,6 +16,6 @@ public: virtual void cancel() = 0; }; -} +} // namespace mbgl #endif diff --git a/platform/default/asset_request_fs.cpp b/platform/default/asset_request_fs.cpp index d830851b0e..3ff0e62cfd 100644 --- a/platform/default/asset_request_fs.cpp +++ b/platform/default/asset_request_fs.cpp @@ -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 diff --git a/platform/default/async_task.cpp b/platform/default/async_task.cpp index 064e8dad06..c75cc3f1ca 100644 --- a/platform/default/async_task.cpp +++ b/platform/default/async_task.cpp @@ -76,5 +76,5 @@ void AsyncTask::unref() { impl->unref(); } -} -} +} // namespace util +} // namespace mbgl diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp index cf8349d823..302f108e2f 100644 --- a/platform/default/glfw_view.cpp +++ b/platform/default/glfw_view.cpp @@ -536,5 +536,5 @@ void showColorDebugImage(std::string name, const char *data, size_t logicalWidth } #endif -} -} +} // namespace platform +} // namespace mbgl diff --git a/platform/default/headless_display.cpp b/platform/default/headless_display.cpp index c4535fc1a6..0931057064 100644 --- a/platform/default/headless_display.cpp +++ b/platform/default/headless_display.cpp @@ -81,4 +81,4 @@ HeadlessDisplay::~HeadlessDisplay() { #endif } -} +} // namespace mbgl diff --git a/platform/default/headless_view.cpp b/platform/default/headless_view.cpp index 98d3a38ee7..3eaa4949b6 100644 --- a/platform/default/headless_view.cpp +++ b/platform/default/headless_view.cpp @@ -303,4 +303,4 @@ void HeadlessView::afterRender() { // no-op } -} +} // namespace mbgl diff --git a/platform/default/log_stderr.cpp b/platform/default/log_stderr.cpp index f7ef341845..536841617a 100644 --- a/platform/default/log_stderr.cpp +++ b/platform/default/log_stderr.cpp @@ -8,4 +8,4 @@ void Log::platformRecord(EventSeverity severity, const std::string &msg) { std::cerr << "[" << severity << "] " << msg << std::endl; } -} +} // namespace mbgl diff --git a/platform/default/run_loop.cpp b/platform/default/run_loop.cpp index a37fbbb67e..a5de305998 100644 --- a/platform/default/run_loop.cpp +++ b/platform/default/run_loop.cpp @@ -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 diff --git a/platform/default/sqlite3.cpp b/platform/default/sqlite3.cpp index 196839bea4..87aafa3929 100644 --- a/platform/default/sqlite3.cpp +++ b/platform/default/sqlite3.cpp @@ -184,5 +184,5 @@ void Statement::reset() { sqlite3_reset(stmt); } -} -} +} // namespace sqlite +} // namespace mapbox diff --git a/platform/default/sqlite_cache.cpp b/platform/default/sqlite_cache.cpp index 45fab70aa1..43b67cfd7f 100644 --- a/platform/default/sqlite_cache.cpp +++ b/platform/default/sqlite_cache.cpp @@ -246,4 +246,4 @@ std::shared_ptr<SQLiteCache> SharedSQLiteCache::get(const std::string &path) { std::weak_ptr<SQLiteCache> SharedSQLiteCache::masterPtr; -} +} // namespace mbgl diff --git a/platform/default/timer.cpp b/platform/default/timer.cpp index 4df1a28bf9..969f6e7890 100644 --- a/platform/default/timer.cpp +++ b/platform/default/timer.cpp @@ -83,5 +83,5 @@ void Timer::unref() { impl->unref(); } -} -} +} // namespace util +} // namespace mbgl diff --git a/src/mbgl/annotation/annotation_manager.cpp b/src/mbgl/annotation/annotation_manager.cpp index 7bff693fb2..dfdd2f713d 100644 --- a/src/mbgl/annotation/annotation_manager.cpp +++ b/src/mbgl/annotation/annotation_manager.cpp @@ -167,4 +167,4 @@ double AnnotationManager::getTopOffsetPixelsForIcon(const std::string& name) { return sprite ? -sprite->height / 2 : 0; } -} +} // namespace mbgl diff --git a/src/mbgl/annotation/annotation_manager.hpp b/src/mbgl/annotation/annotation_manager.hpp index 4b5742c6f7..eee4c0a0cc 100644 --- a/src/mbgl/annotation/annotation_manager.hpp +++ b/src/mbgl/annotation/annotation_manager.hpp @@ -59,6 +59,6 @@ private: SpriteAtlas spriteAtlas; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/annotation/annotation_tile.cpp b/src/mbgl/annotation/annotation_tile.cpp index f79d71cfde..4a342c7e10 100644 --- a/src/mbgl/annotation/annotation_tile.cpp +++ b/src/mbgl/annotation/annotation_tile.cpp @@ -46,4 +46,4 @@ void AnnotationTileMonitor::update(std::unique_ptr<GeometryTile> tile) { callback(nullptr, std::move(tile), Seconds::zero(), Seconds::zero()); } -} +} // namespace mbgl diff --git a/src/mbgl/annotation/annotation_tile.hpp b/src/mbgl/annotation/annotation_tile.hpp index e88d6d55cf..3903e1b79f 100644 --- a/src/mbgl/annotation/annotation_tile.hpp +++ b/src/mbgl/annotation/annotation_tile.hpp @@ -56,6 +56,6 @@ private: GeometryTileMonitor::Callback callback; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/annotation/point_annotation_impl.cpp b/src/mbgl/annotation/point_annotation_impl.cpp index d313dab93c..c84912750f 100644 --- a/src/mbgl/annotation/point_annotation_impl.cpp +++ b/src/mbgl/annotation/point_annotation_impl.cpp @@ -29,4 +29,4 @@ LatLngBounds PointAnnotationImpl::bounds() const { return LatLngBounds(point.position, point.position); } -} +} // namespace mbgl diff --git a/src/mbgl/annotation/point_annotation_impl.hpp b/src/mbgl/annotation/point_annotation_impl.hpp index 2977caf577..47c3bffea2 100644 --- a/src/mbgl/annotation/point_annotation_impl.hpp +++ b/src/mbgl/annotation/point_annotation_impl.hpp @@ -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 { diff --git a/src/mbgl/annotation/shape_annotation_impl.cpp b/src/mbgl/annotation/shape_annotation_impl.cpp index 62b55908f9..a3f5fd2d6a 100644 --- a/src/mbgl/annotation/shape_annotation_impl.cpp +++ b/src/mbgl/annotation/shape_annotation_impl.cpp @@ -158,4 +158,4 @@ LatLngBounds ShapeAnnotationImpl::bounds() const { return result; } -} +} // namespace mbgl diff --git a/src/mbgl/annotation/shape_annotation_impl.hpp b/src/mbgl/annotation/shape_annotation_impl.hpp index f312ec75df..6134e605c2 100644 --- a/src/mbgl/annotation/shape_annotation_impl.hpp +++ b/src/mbgl/annotation/shape_annotation_impl.hpp @@ -36,6 +36,6 @@ private: std::unique_ptr<mapbox::util::geojsonvt::GeoJSONVT> shapeTiler; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/geometry/anchor.hpp b/src/mbgl/geometry/anchor.hpp index 352f260752..49979cc15a 100644 --- a/src/mbgl/geometry/anchor.hpp +++ b/src/mbgl/geometry/anchor.hpp @@ -21,6 +21,6 @@ struct Anchor { typedef std::vector<Anchor> Anchors; -} +} // namespace mbgl #endif diff --git a/src/mbgl/geometry/binpack.hpp b/src/mbgl/geometry/binpack.hpp index 504417f452..706115a208 100644 --- a/src/mbgl/geometry/binpack.hpp +++ b/src/mbgl/geometry/binpack.hpp @@ -99,6 +99,6 @@ private: std::list<Rect<T>> free; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/geometry/buffer.hpp b/src/mbgl/geometry/buffer.hpp index d54ee18c7e..18bf05911a 100644 --- a/src/mbgl/geometry/buffer.hpp +++ b/src/mbgl/geometry/buffer.hpp @@ -122,6 +122,6 @@ private: GLuint buffer = 0; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/geometry/circle_buffer.hpp b/src/mbgl/geometry/circle_buffer.hpp index cab9122e5b..30e339bb61 100644 --- a/src/mbgl/geometry/circle_buffer.hpp +++ b/src/mbgl/geometry/circle_buffer.hpp @@ -22,6 +22,6 @@ public: void add(vertex_type x, vertex_type y, float ex, float ey); }; -} +} // namespace mbgl #endif // MBGL_GEOMETRY_CIRCLE_BUFFER diff --git a/src/mbgl/geometry/collision_box_buffer.cpp b/src/mbgl/geometry/collision_box_buffer.cpp index da9031c895..f4f8075e10 100644 --- a/src/mbgl/geometry/collision_box_buffer.cpp +++ b/src/mbgl/geometry/collision_box_buffer.cpp @@ -24,4 +24,4 @@ size_t CollisionBoxVertexBuffer::add(int16_t x, int16_t y, float ox, float oy, f return idx; } -} +} // namespace mbgl diff --git a/src/mbgl/geometry/collision_box_buffer.hpp b/src/mbgl/geometry/collision_box_buffer.hpp index 098eab13c6..44a0f164b8 100644 --- a/src/mbgl/geometry/collision_box_buffer.hpp +++ b/src/mbgl/geometry/collision_box_buffer.hpp @@ -18,6 +18,6 @@ public: }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/geometry/debug_font_buffer.hpp b/src/mbgl/geometry/debug_font_buffer.hpp index 802b5dbaac..904360ee84 100644 --- a/src/mbgl/geometry/debug_font_buffer.hpp +++ b/src/mbgl/geometry/debug_font_buffer.hpp @@ -12,6 +12,6 @@ public: void addText(const char *text, double left, double baseline, double scale = 1); }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/geometry/elements_buffer.hpp b/src/mbgl/geometry/elements_buffer.hpp index 5e642f06db..ce716dfaf4 100644 --- a/src/mbgl/geometry/elements_buffer.hpp +++ b/src/mbgl/geometry/elements_buffer.hpp @@ -44,6 +44,6 @@ public: void add(element_type a, element_type b); }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/geometry/fill_buffer.hpp b/src/mbgl/geometry/fill_buffer.hpp index 2cd1637fa1..531dcf82fc 100644 --- a/src/mbgl/geometry/fill_buffer.hpp +++ b/src/mbgl/geometry/fill_buffer.hpp @@ -16,6 +16,6 @@ public: void add(vertex_type x, vertex_type y); }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/geometry/glyph_atlas.hpp b/src/mbgl/geometry/glyph_atlas.hpp index 1205301835..5b4ae1fc6b 100644 --- a/src/mbgl/geometry/glyph_atlas.hpp +++ b/src/mbgl/geometry/glyph_atlas.hpp @@ -56,6 +56,6 @@ private: GLuint texture = 0; }; -}; +} // namespace mbgl #endif diff --git a/src/mbgl/geometry/icon_buffer.cpp b/src/mbgl/geometry/icon_buffer.cpp index 831ffc72ac..4e6a1c52e7 100644 --- a/src/mbgl/geometry/icon_buffer.cpp +++ b/src/mbgl/geometry/icon_buffer.cpp @@ -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 diff --git a/src/mbgl/geometry/icon_buffer.hpp b/src/mbgl/geometry/icon_buffer.hpp index 95469929cf..d3c3999ee9 100644 --- a/src/mbgl/geometry/icon_buffer.hpp +++ b/src/mbgl/geometry/icon_buffer.hpp @@ -15,6 +15,6 @@ namespace mbgl { }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/geometry/line_atlas.hpp b/src/mbgl/geometry/line_atlas.hpp index a8663cb820..e76a91b61d 100644 --- a/src/mbgl/geometry/line_atlas.hpp +++ b/src/mbgl/geometry/line_atlas.hpp @@ -41,6 +41,6 @@ private: std::map<size_t, LinePatternPos> positions; }; -}; +} // namespace mbgl #endif diff --git a/src/mbgl/geometry/line_buffer.hpp b/src/mbgl/geometry/line_buffer.hpp index 7174fa2910..0835c0298f 100644 --- a/src/mbgl/geometry/line_buffer.hpp +++ b/src/mbgl/geometry/line_buffer.hpp @@ -34,6 +34,6 @@ public: }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/geometry/static_vertex_buffer.cpp b/src/mbgl/geometry/static_vertex_buffer.cpp index c1e8caab9e..e8dad0ba9b 100644 --- a/src/mbgl/geometry/static_vertex_buffer.cpp +++ b/src/mbgl/geometry/static_vertex_buffer.cpp @@ -11,4 +11,4 @@ StaticVertexBuffer::StaticVertexBuffer(std::initializer_list<std::pair<int16_t, } } -} +} // namespace mbgl diff --git a/src/mbgl/geometry/static_vertex_buffer.hpp b/src/mbgl/geometry/static_vertex_buffer.hpp index ce932269f0..eaf05b44d3 100644 --- a/src/mbgl/geometry/static_vertex_buffer.hpp +++ b/src/mbgl/geometry/static_vertex_buffer.hpp @@ -21,6 +21,6 @@ public: StaticVertexBuffer(std::initializer_list<std::pair<int16_t, int16_t>> init); }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/geometry/text_buffer.cpp b/src/mbgl/geometry/text_buffer.cpp index 8f312c9faf..530048a6dd 100644 --- a/src/mbgl/geometry/text_buffer.cpp +++ b/src/mbgl/geometry/text_buffer.cpp @@ -29,4 +29,4 @@ size_t TextVertexBuffer::add(int16_t x, int16_t y, float ox, float oy, uint16_t return idx; } -} +} // namespace mbgl diff --git a/src/mbgl/geometry/text_buffer.hpp b/src/mbgl/geometry/text_buffer.hpp index 895d472376..5a20d463ba 100644 --- a/src/mbgl/geometry/text_buffer.hpp +++ b/src/mbgl/geometry/text_buffer.hpp @@ -18,6 +18,6 @@ public: }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/geometry/vao.cpp b/src/mbgl/geometry/vao.cpp index 1330a057f9..d3ad16e64f 100644 --- a/src/mbgl/geometry/vao.cpp +++ b/src/mbgl/geometry/vao.cpp @@ -92,4 +92,4 @@ void VertexArrayObject::storeBinding(Shader &shader, GLuint vertexBuffer, GLuint bound_elements_buffer = elementsBuffer; } -} +} // namespace mbgl diff --git a/src/mbgl/geometry/vao.hpp b/src/mbgl/geometry/vao.hpp index bd845b1e33..2dcc02c76b 100644 --- a/src/mbgl/geometry/vao.hpp +++ b/src/mbgl/geometry/vao.hpp @@ -66,6 +66,6 @@ private: GLbyte *bound_offset = 0; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/gl/debugging.cpp b/src/mbgl/gl/debugging.cpp index 0061127048..fb9e037714 100644 --- a/src/mbgl/gl/debugging.cpp +++ b/src/mbgl/gl/debugging.cpp @@ -185,6 +185,6 @@ group::~group() { } } -} -} -} +} // namespace debugging +} // namespace gl +} // namespace mbgl diff --git a/src/mbgl/gl/debugging.hpp b/src/mbgl/gl/debugging.hpp index 046f0169d9..5321858624 100644 --- a/src/mbgl/gl/debugging.hpp +++ b/src/mbgl/gl/debugging.hpp @@ -22,8 +22,8 @@ struct group { ~group(); }; -} -} -} +} // namespace debugging +} // namespace gl +} // namespace mbgl #endif diff --git a/src/mbgl/layer/background_layer.cpp b/src/mbgl/layer/background_layer.cpp index 51000e53ba..f3ea723b33 100644 --- a/src/mbgl/layer/background_layer.cpp +++ b/src/mbgl/layer/background_layer.cpp @@ -38,4 +38,4 @@ std::unique_ptr<Bucket> BackgroundLayer::createBucket(StyleBucketParameters&) co return nullptr; } -} +} // namespace mbgl diff --git a/src/mbgl/layer/background_layer.hpp b/src/mbgl/layer/background_layer.hpp index a65b9e0183..ee8d3fc88a 100644 --- a/src/mbgl/layer/background_layer.hpp +++ b/src/mbgl/layer/background_layer.hpp @@ -28,6 +28,6 @@ public: BackgroundPaintProperties paint; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/layer/circle_layer.cpp b/src/mbgl/layer/circle_layer.cpp index e33476a4a8..7559a03284 100644 --- a/src/mbgl/layer/circle_layer.cpp +++ b/src/mbgl/layer/circle_layer.cpp @@ -54,4 +54,4 @@ std::unique_ptr<Bucket> CircleLayer::createBucket(StyleBucketParameters& paramet return std::move(bucket); } -} +} // namespace mbgl diff --git a/src/mbgl/layer/circle_layer.hpp b/src/mbgl/layer/circle_layer.hpp index eac9a915cc..3e4581ef62 100644 --- a/src/mbgl/layer/circle_layer.hpp +++ b/src/mbgl/layer/circle_layer.hpp @@ -35,6 +35,6 @@ public: CirclePaintProperties paint; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/layer/fill_layer.cpp b/src/mbgl/layer/fill_layer.cpp index 52a6b8fe55..c2b9227558 100644 --- a/src/mbgl/layer/fill_layer.cpp +++ b/src/mbgl/layer/fill_layer.cpp @@ -67,4 +67,4 @@ std::unique_ptr<Bucket> FillLayer::createBucket(StyleBucketParameters& parameter return std::move(bucket); } -} +} // namespace mbgl diff --git a/src/mbgl/layer/fill_layer.hpp b/src/mbgl/layer/fill_layer.hpp index c0ed228d48..1132fbf4e8 100644 --- a/src/mbgl/layer/fill_layer.hpp +++ b/src/mbgl/layer/fill_layer.hpp @@ -32,6 +32,6 @@ public: FillPaintProperties paint; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/layer/line_layer.cpp b/src/mbgl/layer/line_layer.cpp index f4453f819d..a3073e3bc0 100644 --- a/src/mbgl/layer/line_layer.cpp +++ b/src/mbgl/layer/line_layer.cpp @@ -86,4 +86,4 @@ std::unique_ptr<Bucket> LineLayer::createBucket(StyleBucketParameters& parameter return std::move(bucket); } -} +} // namespace mbgl diff --git a/src/mbgl/layer/line_layer.hpp b/src/mbgl/layer/line_layer.hpp index 639ba34f57..91206a4ccc 100644 --- a/src/mbgl/layer/line_layer.hpp +++ b/src/mbgl/layer/line_layer.hpp @@ -51,6 +51,6 @@ public: LinePaintProperties paint; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/layer/raster_layer.cpp b/src/mbgl/layer/raster_layer.cpp index 5a7e686441..87199f24f7 100644 --- a/src/mbgl/layer/raster_layer.cpp +++ b/src/mbgl/layer/raster_layer.cpp @@ -50,4 +50,4 @@ std::unique_ptr<Bucket> RasterLayer::createBucket(StyleBucketParameters&) const return nullptr; } -} +} // namespace mbgl diff --git a/src/mbgl/layer/raster_layer.hpp b/src/mbgl/layer/raster_layer.hpp index 800236016d..43ffa48869 100644 --- a/src/mbgl/layer/raster_layer.hpp +++ b/src/mbgl/layer/raster_layer.hpp @@ -32,6 +32,6 @@ public: RasterPaintProperties paint; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/layer/symbol_layer.cpp b/src/mbgl/layer/symbol_layer.cpp index f954999614..c7b4824deb 100644 --- a/src/mbgl/layer/symbol_layer.cpp +++ b/src/mbgl/layer/symbol_layer.cpp @@ -188,4 +188,4 @@ std::unique_ptr<Bucket> SymbolLayer::createBucket(StyleBucketParameters& paramet return std::move(bucket); } -} +} // namespace mbgl diff --git a/src/mbgl/layer/symbol_layer.hpp b/src/mbgl/layer/symbol_layer.hpp index 1a9e4587bb..4b37d12055 100644 --- a/src/mbgl/layer/symbol_layer.hpp +++ b/src/mbgl/layer/symbol_layer.hpp @@ -100,6 +100,6 @@ public: SpriteAtlas* spriteAtlas; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/map/geometry_tile.cpp b/src/mbgl/map/geometry_tile.cpp index 785845b4db..1bb132f316 100644 --- a/src/mbgl/map/geometry_tile.cpp +++ b/src/mbgl/map/geometry_tile.cpp @@ -14,4 +14,4 @@ mapbox::util::optional<Value> GeometryTileFeatureExtractor::getValue(const std:: template bool evaluate(const FilterExpression&, const GeometryTileFeatureExtractor&); -} +} // namespace mbgl diff --git a/src/mbgl/map/geometry_tile.hpp b/src/mbgl/map/geometry_tile.hpp index f6a4d3a536..4ae08cc9d8 100644 --- a/src/mbgl/map/geometry_tile.hpp +++ b/src/mbgl/map/geometry_tile.hpp @@ -79,6 +79,6 @@ private: const GeometryTileFeature& feature; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 69994a8d86..6d03dfc2a9 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -500,4 +500,4 @@ void Map::dumpDebugLogs() const { context->invokeSync(&MapContext::dumpDebugLogs); } -} +} // namespace mbgl diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp index e6588f5b36..d14033c9c7 100644 --- a/src/mbgl/map/map_context.cpp +++ b/src/mbgl/map/map_context.cpp @@ -320,4 +320,4 @@ void MapContext::dumpDebugLogs() const { Log::Info(Event::General, "--------------------------------------------------------------------------------"); } -} +} // namespace mbgl diff --git a/src/mbgl/map/map_context.hpp b/src/mbgl/map/map_context.hpp index f32054a252..ec3d5aa58b 100644 --- a/src/mbgl/map/map_context.hpp +++ b/src/mbgl/map/map_context.hpp @@ -95,6 +95,6 @@ private: FrameData frameData; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/map/map_data.cpp b/src/mbgl/map/map_data.cpp index 993edb38e8..3a0de22d0d 100644 --- a/src/mbgl/map/map_data.cpp +++ b/src/mbgl/map/map_data.cpp @@ -41,4 +41,4 @@ std::vector<std::string> MapData::getClasses() const { return classes; } -} +} // namespace mbgl diff --git a/src/mbgl/map/map_data.hpp b/src/mbgl/map/map_data.hpp index cf6ad20475..97d16b1c21 100644 --- a/src/mbgl/map/map_data.hpp +++ b/src/mbgl/map/map_data.hpp @@ -152,6 +152,6 @@ public: bool loading = false; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/map/raster_tile_data.hpp b/src/mbgl/map/raster_tile_data.hpp index 6e7efa05f7..54330b73a8 100644 --- a/src/mbgl/map/raster_tile_data.hpp +++ b/src/mbgl/map/raster_tile_data.hpp @@ -37,6 +37,6 @@ private: std::unique_ptr<WorkRequest> workRequest; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/map/source.cpp b/src/mbgl/map/source.cpp index e1c2eb44f2..16e2630a94 100644 --- a/src/mbgl/map/source.cpp +++ b/src/mbgl/map/source.cpp @@ -600,4 +600,4 @@ void Source::dumpDebugLogs() const { } } -} +} // namespace mbgl diff --git a/src/mbgl/map/source.hpp b/src/mbgl/map/source.hpp index d7009f6615..4d985091f5 100644 --- a/src/mbgl/map/source.hpp +++ b/src/mbgl/map/source.hpp @@ -122,6 +122,6 @@ private: Observer* observer_ = nullptr; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/map/tile.hpp b/src/mbgl/map/tile.hpp index 996433b5d9..8b9030f1bd 100644 --- a/src/mbgl/map/tile.hpp +++ b/src/mbgl/map/tile.hpp @@ -23,6 +23,6 @@ public: util::ptr<TileData> data; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/map/tile_cache.cpp b/src/mbgl/map/tile_cache.cpp index 37acf628a0..2d1a0da96c 100644 --- a/src/mbgl/map/tile_cache.cpp +++ b/src/mbgl/map/tile_cache.cpp @@ -61,4 +61,4 @@ void TileCache::clear() { tiles.clear(); } -}; +} // namespace mbgl diff --git a/src/mbgl/map/tile_cache.hpp b/src/mbgl/map/tile_cache.hpp index 26d830c123..e39db0ffae 100644 --- a/src/mbgl/map/tile_cache.hpp +++ b/src/mbgl/map/tile_cache.hpp @@ -25,6 +25,6 @@ private: size_t size; }; -}; +} // namespace mbgl #endif diff --git a/src/mbgl/map/tile_id.cpp b/src/mbgl/map/tile_id.cpp index ad7ec2e0f6..3058125a20 100644 --- a/src/mbgl/map/tile_id.cpp +++ b/src/mbgl/map/tile_id.cpp @@ -63,4 +63,4 @@ TileID::operator std::string() const { return util::toString(z) + "/" + util::toString(x) + "/" + util::toString(y); } -} +} // namespace mbgl diff --git a/src/mbgl/map/tile_id.hpp b/src/mbgl/map/tile_id.hpp index f2e2171f1a..dddbce3bb7 100644 --- a/src/mbgl/map/tile_id.hpp +++ b/src/mbgl/map/tile_id.hpp @@ -54,6 +54,6 @@ public: }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/map/transform.hpp b/src/mbgl/map/transform.hpp index 7f424eba2b..914fa164da 100644 --- a/src/mbgl/map/transform.hpp +++ b/src/mbgl/map/transform.hpp @@ -88,6 +88,6 @@ private: std::function<void()> transitionFinishFn; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/map/vector_tile.cpp b/src/mbgl/map/vector_tile.cpp index 6271322bc4..f18c3f6821 100644 --- a/src/mbgl/map/vector_tile.cpp +++ b/src/mbgl/map/vector_tile.cpp @@ -205,4 +205,4 @@ std::unique_ptr<FileRequest> VectorTileMonitor::monitorTile(const GeometryTileMo }); } -} +} // namespace mbgl diff --git a/src/mbgl/map/vector_tile.hpp b/src/mbgl/map/vector_tile.hpp index e3290c27de..61b97bc9a5 100644 --- a/src/mbgl/map/vector_tile.hpp +++ b/src/mbgl/map/vector_tile.hpp @@ -70,6 +70,6 @@ private: std::shared_ptr<const std::string> data; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/map/vector_tile_data.cpp b/src/mbgl/map/vector_tile_data.cpp index fd27614488..bac13b3883 100644 --- a/src/mbgl/map/vector_tile_data.cpp +++ b/src/mbgl/map/vector_tile_data.cpp @@ -191,4 +191,4 @@ void VectorTileData::cancel() { workRequest.reset(); } -} +} // namespace mbgl diff --git a/src/mbgl/map/view.cpp b/src/mbgl/map/view.cpp index efbe0f1672..9e3352daa8 100644 --- a/src/mbgl/map/view.cpp +++ b/src/mbgl/map/view.cpp @@ -19,4 +19,4 @@ void View::notifyMapChange(MapChange) { } -} +} // namespace mbgl diff --git a/src/mbgl/platform/gl.cpp b/src/mbgl/platform/gl.cpp index abf3d59ee5..e5495c80dc 100644 --- a/src/mbgl/platform/gl.cpp +++ b/src/mbgl/platform/gl.cpp @@ -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 diff --git a/src/mbgl/platform/log.cpp b/src/mbgl/platform/log.cpp index 6daed40888..580c698699 100644 --- a/src/mbgl/platform/log.cpp +++ b/src/mbgl/platform/log.cpp @@ -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 diff --git a/src/mbgl/renderer/bucket.hpp b/src/mbgl/renderer/bucket.hpp index bfe715a157..f99f2a7a62 100644 --- a/src/mbgl/renderer/bucket.hpp +++ b/src/mbgl/renderer/bucket.hpp @@ -46,6 +46,6 @@ protected: }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/renderer/debug_bucket.hpp b/src/mbgl/renderer/debug_bucket.hpp index 7edee6beec..73af338c2c 100644 --- a/src/mbgl/renderer/debug_bucket.hpp +++ b/src/mbgl/renderer/debug_bucket.hpp @@ -28,6 +28,6 @@ private: VertexArrayObject array; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/renderer/fill_bucket.hpp b/src/mbgl/renderer/fill_bucket.hpp index 054194340b..674c41f7d1 100644 --- a/src/mbgl/renderer/fill_bucket.hpp +++ b/src/mbgl/renderer/fill_bucket.hpp @@ -63,6 +63,6 @@ private: static const int vertices_per_group = 3; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/renderer/frame_history.hpp b/src/mbgl/renderer/frame_history.hpp index 9193183f0d..8f6c06a697 100644 --- a/src/mbgl/renderer/frame_history.hpp +++ b/src/mbgl/renderer/frame_history.hpp @@ -35,6 +35,6 @@ public: std::deque<FrameSnapshot> history; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/renderer/gl_config.cpp b/src/mbgl/renderer/gl_config.cpp index 7c6eae0213..0485878297 100644 --- a/src/mbgl/renderer/gl_config.cpp +++ b/src/mbgl/renderer/gl_config.cpp @@ -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 diff --git a/src/mbgl/renderer/line_bucket.hpp b/src/mbgl/renderer/line_bucket.hpp index 9a38edbc31..7d662aac02 100644 --- a/src/mbgl/renderer/line_bucket.hpp +++ b/src/mbgl/renderer/line_bucket.hpp @@ -64,6 +64,6 @@ private: std::vector<std::unique_ptr<TriangleGroup>> triangleGroups; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp index 3e5ee06732..3a49b36183 100644 --- a/src/mbgl/renderer/painter.hpp +++ b/src/mbgl/renderer/painter.hpp @@ -236,6 +236,6 @@ public: VertexArrayObject tileBorderArray; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/renderer/raster_bucket.hpp b/src/mbgl/renderer/raster_bucket.hpp index e12257d864..0f4263ec95 100644 --- a/src/mbgl/renderer/raster_bucket.hpp +++ b/src/mbgl/renderer/raster_bucket.hpp @@ -25,6 +25,6 @@ public: Raster raster; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/renderer/render_pass.hpp b/src/mbgl/renderer/render_pass.hpp index a298b8b57e..a1e965d911 100644 --- a/src/mbgl/renderer/render_pass.hpp +++ b/src/mbgl/renderer/render_pass.hpp @@ -26,6 +26,6 @@ constexpr inline RenderPass operator&(RenderPass a, RenderPass b) { static_cast<std::underlying_type<RenderPass>::type>(b)); } -} +} // namespace mbgl #endif diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp index f5737d7430..92fdaaf571 100644 --- a/src/mbgl/renderer/symbol_bucket.cpp +++ b/src/mbgl/renderer/symbol_bucket.cpp @@ -616,4 +616,4 @@ void SymbolBucket::drawCollisionBoxes(CollisionBoxShader &shader) { MBGL_CHECK_ERROR(glDrawArrays(GL_LINES, 0, group->vertex_length)); } } -} +} // namespace mbgl diff --git a/src/mbgl/renderer/symbol_bucket.hpp b/src/mbgl/renderer/symbol_bucket.hpp index ff4bbf5dca..7150c9808c 100644 --- a/src/mbgl/renderer/symbol_bucket.hpp +++ b/src/mbgl/renderer/symbol_bucket.hpp @@ -147,6 +147,6 @@ private: std::unique_ptr<SymbolRenderData> renderDataInProgress; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/shader/circle_shader.hpp b/src/mbgl/shader/circle_shader.hpp index 84f4ef99a1..7c1212c275 100644 --- a/src/mbgl/shader/circle_shader.hpp +++ b/src/mbgl/shader/circle_shader.hpp @@ -19,6 +19,6 @@ public: Uniform<GLfloat> u_blur = {"u_blur", *this}; }; -} +} // namespace mbgl #endif // MBGL_SHADER_CIRCLE_SHADER diff --git a/src/mbgl/shader/dot_shader.hpp b/src/mbgl/shader/dot_shader.hpp index fe1541cf75..606764c2d6 100644 --- a/src/mbgl/shader/dot_shader.hpp +++ b/src/mbgl/shader/dot_shader.hpp @@ -18,6 +18,6 @@ public: Uniform<GLfloat> u_blur = {"u_blur", *this}; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/shader/icon_shader.hpp b/src/mbgl/shader/icon_shader.hpp index 437fd859bc..df6232cdcc 100644 --- a/src/mbgl/shader/icon_shader.hpp +++ b/src/mbgl/shader/icon_shader.hpp @@ -30,6 +30,6 @@ protected: GLint a_data2 = -1; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/shader/line_shader.hpp b/src/mbgl/shader/line_shader.hpp index 580035a07a..50c209ef24 100644 --- a/src/mbgl/shader/line_shader.hpp +++ b/src/mbgl/shader/line_shader.hpp @@ -26,6 +26,6 @@ private: }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/shader/linepattern_shader.hpp b/src/mbgl/shader/linepattern_shader.hpp index f2189d4710..aae550665c 100644 --- a/src/mbgl/shader/linepattern_shader.hpp +++ b/src/mbgl/shader/linepattern_shader.hpp @@ -32,6 +32,6 @@ public: private: GLint a_data = -1; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/shader/linesdf_shader.hpp b/src/mbgl/shader/linesdf_shader.hpp index 839494f79b..1fdae14069 100644 --- a/src/mbgl/shader/linesdf_shader.hpp +++ b/src/mbgl/shader/linesdf_shader.hpp @@ -33,6 +33,6 @@ private: }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/shader/outline_shader.hpp b/src/mbgl/shader/outline_shader.hpp index 2cd4b1dc31..3af9b8349f 100644 --- a/src/mbgl/shader/outline_shader.hpp +++ b/src/mbgl/shader/outline_shader.hpp @@ -17,6 +17,6 @@ public: Uniform<std::array<GLfloat, 2>> u_world = {"u_world", *this}; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/shader/pattern_shader.hpp b/src/mbgl/shader/pattern_shader.hpp index 3dd3daa461..d47cbfb182 100644 --- a/src/mbgl/shader/pattern_shader.hpp +++ b/src/mbgl/shader/pattern_shader.hpp @@ -24,6 +24,6 @@ public: UniformMatrix<3> u_patternmatrix_b = {"u_patternmatrix_b", *this}; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/shader/plain_shader.hpp b/src/mbgl/shader/plain_shader.hpp index ee0528e9e3..f9b8c41a63 100644 --- a/src/mbgl/shader/plain_shader.hpp +++ b/src/mbgl/shader/plain_shader.hpp @@ -16,6 +16,6 @@ public: Uniform<std::array<GLfloat, 4>> u_color = {"u_color", *this}; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/shader/raster_shader.hpp b/src/mbgl/shader/raster_shader.hpp index af51b4ba46..60b283fc2a 100644 --- a/src/mbgl/shader/raster_shader.hpp +++ b/src/mbgl/shader/raster_shader.hpp @@ -23,6 +23,6 @@ public: Uniform<std::array<GLfloat, 3>> u_spin_weights = {"u_spin_weights", *this}; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/shader/sdf_shader.hpp b/src/mbgl/shader/sdf_shader.hpp index fcb2e15d11..aa888d7d4b 100644 --- a/src/mbgl/shader/sdf_shader.hpp +++ b/src/mbgl/shader/sdf_shader.hpp @@ -40,6 +40,6 @@ public: void bind(GLbyte *offset) final; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/shader/shader.hpp b/src/mbgl/shader/shader.hpp index 1de56da87a..927fdf0b0b 100644 --- a/src/mbgl/shader/shader.hpp +++ b/src/mbgl/shader/shader.hpp @@ -34,6 +34,6 @@ private: GLuint fragShader = 0; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/shader/uniform.cpp b/src/mbgl/shader/uniform.cpp index eca1a99d17..d43dd20016 100644 --- a/src/mbgl/shader/uniform.cpp +++ b/src/mbgl/shader/uniform.cpp @@ -44,4 +44,4 @@ void UniformMatrix<4>::bind(const std::array<GLfloat, 16>& t) { // Add more as needed. -} +} // namespace mbgl diff --git a/src/mbgl/shader/uniform.hpp b/src/mbgl/shader/uniform.hpp index 55646f7d87..0b6d574d09 100644 --- a/src/mbgl/shader/uniform.hpp +++ b/src/mbgl/shader/uniform.hpp @@ -56,6 +56,6 @@ private: GLint location; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/sprite/sprite_atlas.hpp b/src/mbgl/sprite/sprite_atlas.hpp index 0d1e52cf81..167d012c6b 100644 --- a/src/mbgl/sprite/sprite_atlas.hpp +++ b/src/mbgl/sprite/sprite_atlas.hpp @@ -99,6 +99,6 @@ private: static const int buffer = 1; }; -}; +} // namespace mbgl #endif diff --git a/src/mbgl/storage/default_file_source_impl.hpp b/src/mbgl/storage/default_file_source_impl.hpp index e2136b49fd..9b5f97332a 100644 --- a/src/mbgl/storage/default_file_source_impl.hpp +++ b/src/mbgl/storage/default_file_source_impl.hpp @@ -110,6 +110,6 @@ private: util::AsyncTask reachability; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/storage/http_context_base.cpp b/src/mbgl/storage/http_context_base.cpp index a25f1b9185..c69e7a36ae 100644 --- a/src/mbgl/storage/http_context_base.cpp +++ b/src/mbgl/storage/http_context_base.cpp @@ -2,4 +2,4 @@ namespace mbgl { -} +} // namespace mbgl diff --git a/src/mbgl/storage/http_request_base.cpp b/src/mbgl/storage/http_request_base.cpp index a1bb71714d..8a4a81b291 100644 --- a/src/mbgl/storage/http_request_base.cpp +++ b/src/mbgl/storage/http_request_base.cpp @@ -16,4 +16,4 @@ Seconds HTTPRequestBase::parseCacheControl(const char *value) { return Seconds::zero(); } -} +} // namespace mbgl diff --git a/src/mbgl/storage/network_status.cpp b/src/mbgl/storage/network_status.cpp index 11f89f073f..796cc5d27f 100644 --- a/src/mbgl/storage/network_status.cpp +++ b/src/mbgl/storage/network_status.cpp @@ -29,4 +29,4 @@ void NetworkStatus::Reachable() { } } -} +} // namespace mbgl diff --git a/src/mbgl/style/class_dictionary.cpp b/src/mbgl/style/class_dictionary.cpp index 021f791adc..53ea5c1484 100644 --- a/src/mbgl/style/class_dictionary.cpp +++ b/src/mbgl/style/class_dictionary.cpp @@ -46,4 +46,4 @@ ClassID ClassDictionary::normalize(ClassID id) { } } -} +} // namespace mbgl diff --git a/src/mbgl/style/class_dictionary.hpp b/src/mbgl/style/class_dictionary.hpp index ecf80be3e3..8a06a77c7a 100644 --- a/src/mbgl/style/class_dictionary.hpp +++ b/src/mbgl/style/class_dictionary.hpp @@ -32,6 +32,6 @@ private: uint32_t offset = 0; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/style/filter_expression.cpp b/src/mbgl/style/filter_expression.cpp index bb755c5644..a93674410c 100644 --- a/src/mbgl/style/filter_expression.cpp +++ b/src/mbgl/style/filter_expression.cpp @@ -125,4 +125,4 @@ FilterExpression parseFilterExpression(const rapidjson::Value& value) { } } -} +} // namespace mbgl diff --git a/src/mbgl/style/filter_expression.hpp b/src/mbgl/style/filter_expression.hpp index 8c6f447770..7fe244632f 100644 --- a/src/mbgl/style/filter_expression.hpp +++ b/src/mbgl/style/filter_expression.hpp @@ -120,6 +120,6 @@ struct NoneExpression { bool evaluate(const Extractor&) const; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/style/filter_expression_private.hpp b/src/mbgl/style/filter_expression_private.hpp index ff6301b7c6..67a37c2d4c 100644 --- a/src/mbgl/style/filter_expression_private.hpp +++ b/src/mbgl/style/filter_expression_private.hpp @@ -116,4 +116,4 @@ bool NoneExpression::evaluate(const Extractor& extractor) const { return true; } -} +} // namespace mbgl diff --git a/src/mbgl/style/function.cpp b/src/mbgl/style/function.cpp index c656f86888..88fb1d6a9b 100644 --- a/src/mbgl/style/function.cpp +++ b/src/mbgl/style/function.cpp @@ -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 diff --git a/src/mbgl/style/function.hpp b/src/mbgl/style/function.hpp index 3f5c479512..00d4319e0b 100644 --- a/src/mbgl/style/function.hpp +++ b/src/mbgl/style/function.hpp @@ -53,6 +53,6 @@ private: std::vector<std::pair<float, T>> stops; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/style/layout_property.hpp b/src/mbgl/style/layout_property.hpp index 5634efd0a3..7feb931204 100644 --- a/src/mbgl/style/layout_property.hpp +++ b/src/mbgl/style/layout_property.hpp @@ -33,6 +33,6 @@ public: T value; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/style/paint_property.hpp b/src/mbgl/style/paint_property.hpp index a82bf028ba..88feb1307b 100644 --- a/src/mbgl/style/paint_property.hpp +++ b/src/mbgl/style/paint_property.hpp @@ -147,6 +147,6 @@ public: Result value; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/style/property_parsing.cpp b/src/mbgl/style/property_parsing.cpp index 9a67af8eb2..63e1fe57e9 100644 --- a/src/mbgl/style/property_parsing.cpp +++ b/src/mbgl/style/property_parsing.cpp @@ -404,4 +404,4 @@ optional<Function<Faded<std::string>>> parseProperty(const char* name, const JSV return Function<Faded<std::string>>(*constant); } -} +} // namespace mbgl diff --git a/src/mbgl/style/property_parsing.hpp b/src/mbgl/style/property_parsing.hpp index c4547a9e1e..d287468e79 100644 --- a/src/mbgl/style/property_parsing.hpp +++ b/src/mbgl/style/property_parsing.hpp @@ -18,6 +18,6 @@ using optional = mapbox::util::optional<T>; template <typename T> optional<T> parseProperty(const char* name, const JSVal&); -} +} // namespace mbgl #endif diff --git a/src/mbgl/style/property_transition.hpp b/src/mbgl/style/property_transition.hpp index 1cf1de0932..63bbf4607d 100644 --- a/src/mbgl/style/property_transition.hpp +++ b/src/mbgl/style/property_transition.hpp @@ -14,6 +14,6 @@ public: mapbox::util::optional<Duration> delay; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index eb4f5a05ae..bb447b9a9e 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -379,4 +379,4 @@ void Style::dumpDebugLogs() const { spriteStore->dumpDebugLogs(); } -} +} // namespace mbgl diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp index 26b94d18f7..f1e6145c3a 100644 --- a/src/mbgl/style/style.hpp +++ b/src/mbgl/style/style.hpp @@ -144,6 +144,6 @@ public: Worker workers; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/style/style_bucket_parameters.cpp b/src/mbgl/style/style_bucket_parameters.cpp index 1f9b5ab1c0..e8303e3d8f 100644 --- a/src/mbgl/style/style_bucket_parameters.cpp +++ b/src/mbgl/style/style_bucket_parameters.cpp @@ -16,4 +16,4 @@ void StyleBucketParameters::eachFilteredFeature(const FilterExpression& filter, } } -} +} // namespace mbgl diff --git a/src/mbgl/style/style_bucket_parameters.hpp b/src/mbgl/style/style_bucket_parameters.hpp index 1650ddab8a..5a84a33d48 100644 --- a/src/mbgl/style/style_bucket_parameters.hpp +++ b/src/mbgl/style/style_bucket_parameters.hpp @@ -54,6 +54,6 @@ public: CollisionTile& collisionTile; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/style/style_calculation_parameters.hpp b/src/mbgl/style/style_calculation_parameters.hpp index 0c42d8fbfc..00a578d4e7 100644 --- a/src/mbgl/style/style_calculation_parameters.hpp +++ b/src/mbgl/style/style_calculation_parameters.hpp @@ -26,6 +26,6 @@ public: Duration defaultFadeDuration; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/style/style_cascade_parameters.hpp b/src/mbgl/style/style_cascade_parameters.hpp index 154890fd97..f801aa52c9 100644 --- a/src/mbgl/style/style_cascade_parameters.hpp +++ b/src/mbgl/style/style_cascade_parameters.hpp @@ -24,6 +24,6 @@ public: PropertyTransition defaultTransition; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/style/style_layer.cpp b/src/mbgl/style/style_layer.cpp index 75209afcce..3220a018a7 100644 --- a/src/mbgl/style/style_layer.cpp +++ b/src/mbgl/style/style_layer.cpp @@ -47,4 +47,4 @@ void StyleLayer::copy(const StyleLayer& src) { visibility = src.visibility; } -} +} // namespace mbgl diff --git a/src/mbgl/style/style_layer.hpp b/src/mbgl/style/style_layer.hpp index a1a0389fbe..ec29cc6790 100644 --- a/src/mbgl/style/style_layer.hpp +++ b/src/mbgl/style/style_layer.hpp @@ -65,6 +65,6 @@ protected: void copy(const StyleLayer& source); }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/style/style_parser.cpp b/src/mbgl/style/style_parser.cpp index dd2f6e0f73..097f1af941 100644 --- a/src/mbgl/style/style_parser.cpp +++ b/src/mbgl/style/style_parser.cpp @@ -288,4 +288,4 @@ void StyleParser::parseVisibility(StyleLayer& layer, const JSVal& value) { layer.visibility = VisibilityTypeClass({ value["visibility"].GetString(), value["visibility"].GetStringLength() }); } -} +} // namespace mbgl diff --git a/src/mbgl/style/style_parser.hpp b/src/mbgl/style/style_parser.hpp index 5ee2415abd..2c5a43065d 100644 --- a/src/mbgl/style/style_parser.hpp +++ b/src/mbgl/style/style_parser.hpp @@ -44,6 +44,6 @@ private: std::forward_list<std::string> stack; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/style/value.hpp b/src/mbgl/style/value.hpp index 4649134b20..0f3127e4f9 100644 --- a/src/mbgl/style/value.hpp +++ b/src/mbgl/style/value.hpp @@ -23,7 +23,7 @@ inline bool parseNumericString(const std::string &str, double &result) { while (*end != '\0' && isspace(*end)) end++; // eat whitespace after the end return errno == 0 && end - begin == long(str.size()); } -} +} // namespace util template <typename T> T toNumber(const Value &value) { @@ -38,6 +38,6 @@ T toNumber(const Value &value) { else return 0; } -} +} // namespace mbgl #endif diff --git a/src/mbgl/style/value_comparison.hpp b/src/mbgl/style/value_comparison.hpp index 895c8a0869..9f6ae3a0de 100644 --- a/src/mbgl/style/value_comparison.hpp +++ b/src/mbgl/style/value_comparison.hpp @@ -102,8 +102,8 @@ inline bool relaxed_less_equal(Value const &lhs, Value const &rhs) { return apply_visitor(detail::relaxed_operator_visitor<detail::relaxed_less_equal_operator>(), lhs, rhs); } -} +} // namespace util -} +} // namespace mbgl #endif diff --git a/src/mbgl/style/zoom_history.hpp b/src/mbgl/style/zoom_history.hpp index 9eb76e5ec1..4e01af1fdd 100644 --- a/src/mbgl/style/zoom_history.hpp +++ b/src/mbgl/style/zoom_history.hpp @@ -34,6 +34,6 @@ struct ZoomHistory { lastZoom = z; } }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/text/check_max_angle.cpp b/src/mbgl/text/check_max_angle.cpp index 73e7dd26be..6e94c2ec17 100644 --- a/src/mbgl/text/check_max_angle.cpp +++ b/src/mbgl/text/check_max_angle.cpp @@ -75,4 +75,4 @@ bool checkMaxAngle(const std::vector<Coordinate> &line, Anchor &anchor, const fl } -} +} // namespace mbgl diff --git a/src/mbgl/text/check_max_angle.hpp b/src/mbgl/text/check_max_angle.hpp index 5a881ebbad..1354abe95e 100644 --- a/src/mbgl/text/check_max_angle.hpp +++ b/src/mbgl/text/check_max_angle.hpp @@ -9,6 +9,6 @@ namespace mbgl { bool checkMaxAngle(const std::vector<Coordinate> &line, Anchor &anchor, const float labelLength, const float windowSize, const float maxAngle); -} +} // namespace mbgl #endif diff --git a/src/mbgl/text/collision_feature.cpp b/src/mbgl/text/collision_feature.cpp index 2a61e0b10e..a84e75c85a 100644 --- a/src/mbgl/text/collision_feature.cpp +++ b/src/mbgl/text/collision_feature.cpp @@ -92,4 +92,4 @@ void CollisionFeature::bboxifyLabel(const std::vector<Coordinate> &line, } -} +} // namespace mbgl diff --git a/src/mbgl/text/collision_feature.hpp b/src/mbgl/text/collision_feature.hpp index 06056c2a20..f112e17d85 100644 --- a/src/mbgl/text/collision_feature.hpp +++ b/src/mbgl/text/collision_feature.hpp @@ -57,6 +57,6 @@ namespace mbgl { private: void bboxifyLabel(const std::vector<Coordinate> &line, const Anchor &anchor, const float length, const float height); }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/text/collision_tile.cpp b/src/mbgl/text/collision_tile.cpp index ecd615a520..dbd9a6cb10 100644 --- a/src/mbgl/text/collision_tile.cpp +++ b/src/mbgl/text/collision_tile.cpp @@ -101,4 +101,4 @@ Box CollisionTile::getTreeBox(const vec2<float> &anchor, const CollisionBox &box }; } -} +} // namespace mbgl diff --git a/src/mbgl/text/get_anchors.cpp b/src/mbgl/text/get_anchors.cpp index c19bc24958..2f991d8e87 100644 --- a/src/mbgl/text/get_anchors.cpp +++ b/src/mbgl/text/get_anchors.cpp @@ -93,4 +93,4 @@ Anchors getAnchors(const std::vector<Coordinate> &line, float spacing, return resample(line, offset, spacing, angleWindowSize, maxAngle, labelLength * boxScale, continuedLine, false); } -} +} // namespace mbgl diff --git a/src/mbgl/text/get_anchors.hpp b/src/mbgl/text/get_anchors.hpp index 3f737ee6c7..fcb0578d5b 100644 --- a/src/mbgl/text/get_anchors.hpp +++ b/src/mbgl/text/get_anchors.hpp @@ -10,6 +10,6 @@ Anchors getAnchors(const std::vector<Coordinate> &line, float spacing, const float maxAngle, const float textLeft, const float textRight, const float iconLeft, const float iconRight, const float glyphSize, const float boxScale, const float overscaling); -} +} // namespace mbgl #endif diff --git a/src/mbgl/text/glyph.cpp b/src/mbgl/text/glyph.cpp index 3dca03504c..a877d7a799 100644 --- a/src/mbgl/text/glyph.cpp +++ b/src/mbgl/text/glyph.cpp @@ -11,4 +11,4 @@ GlyphRange getGlyphRange(char32_t glyph) { return { start, end }; } -} +} // namespace mbgl diff --git a/src/mbgl/text/glyph_pbf.cpp b/src/mbgl/text/glyph_pbf.cpp index 9d7deb238d..c14f52de7a 100644 --- a/src/mbgl/text/glyph_pbf.cpp +++ b/src/mbgl/text/glyph_pbf.cpp @@ -59,7 +59,7 @@ void parseGlyphPBF(mbgl::FontStack& stack, const std::string& data) { } } -} +} // namespace namespace mbgl { @@ -138,4 +138,4 @@ void GlyphPBF::emitGlyphPBFLoadingFailed(const std::string& message) { observer->onGlyphPBFLoadingFailed(error); } -} +} // namespace mbgl diff --git a/src/mbgl/text/glyph_pbf.hpp b/src/mbgl/text/glyph_pbf.hpp index 69d7747471..d595298516 100644 --- a/src/mbgl/text/glyph_pbf.hpp +++ b/src/mbgl/text/glyph_pbf.hpp @@ -50,6 +50,6 @@ private: Observer* observer = nullptr; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/text/glyph_store.cpp b/src/mbgl/text/glyph_store.cpp index 4c9a74b7e9..047db17b7d 100644 --- a/src/mbgl/text/glyph_store.cpp +++ b/src/mbgl/text/glyph_store.cpp @@ -82,4 +82,4 @@ void GlyphStore::setObserver(Observer* observer_) { observer = observer_; } -} +} // namespace mbgl diff --git a/src/mbgl/text/glyph_store.hpp b/src/mbgl/text/glyph_store.hpp index 1f569664f2..4e665087ea 100644 --- a/src/mbgl/text/glyph_store.hpp +++ b/src/mbgl/text/glyph_store.hpp @@ -70,6 +70,6 @@ private: Observer* observer = nullptr; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/text/quads.cpp b/src/mbgl/text/quads.cpp index 379a6e71ee..20427924a4 100644 --- a/src/mbgl/text/quads.cpp +++ b/src/mbgl/text/quads.cpp @@ -208,4 +208,4 @@ SymbolQuads getGlyphQuads(Anchor& anchor, const Shaping& shapedText, return quads; } -} +} // namespace mbgl diff --git a/src/mbgl/text/quads.hpp b/src/mbgl/text/quads.hpp index 814452a72f..cdf7c23627 100644 --- a/src/mbgl/text/quads.hpp +++ b/src/mbgl/text/quads.hpp @@ -43,6 +43,6 @@ namespace mbgl { SymbolQuads getGlyphQuads(Anchor& anchor, const Shaping& shapedText, const float boxScale, const std::vector<Coordinate>& line, const SymbolLayoutProperties& layout, const bool alongLine, const GlyphPositions& face); -} +} // namespace mbgl #endif diff --git a/src/mbgl/text/shaping.cpp b/src/mbgl/text/shaping.cpp index 6709a49aa2..735841e8ca 100644 --- a/src/mbgl/text/shaping.cpp +++ b/src/mbgl/text/shaping.cpp @@ -14,4 +14,4 @@ PositionedIcon shapeIcon(const Rect<uint16_t>& image, const SymbolLayoutProperti return PositionedIcon(image, y1, y2, x1, x2); } -} +} // namespace mbgl diff --git a/src/mbgl/text/shaping.hpp b/src/mbgl/text/shaping.hpp index 32b34cf5be..acf8c470bf 100644 --- a/src/mbgl/text/shaping.hpp +++ b/src/mbgl/text/shaping.hpp @@ -26,6 +26,6 @@ namespace mbgl { PositionedIcon shapeIcon(const Rect<uint16_t>& image, const SymbolLayoutProperties&); -} +} // namespace mbgl #endif diff --git a/src/mbgl/util/async_task.hpp b/src/mbgl/util/async_task.hpp index 09bdab94d7..5159e6ce3c 100644 --- a/src/mbgl/util/async_task.hpp +++ b/src/mbgl/util/async_task.hpp @@ -22,7 +22,7 @@ private: std::unique_ptr<Impl> impl; }; -} -} +} // namespace util +} // namespace mbgl #endif diff --git a/src/mbgl/util/box.hpp b/src/mbgl/util/box.hpp index f03adc2e50..2806fb95fc 100644 --- a/src/mbgl/util/box.hpp +++ b/src/mbgl/util/box.hpp @@ -11,6 +11,6 @@ struct box { TileCoordinate tl, tr, br, bl; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/util/chrono.cpp b/src/mbgl/util/chrono.cpp index 4102092a90..ca8ebca953 100644 --- a/src/mbgl/util/chrono.cpp +++ b/src/mbgl/util/chrono.cpp @@ -17,4 +17,4 @@ template Milliseconds asMilliseconds<Seconds>(Seconds); template Milliseconds toMilliseconds<Clock, Duration>(TimePoint); template Milliseconds toMilliseconds<SystemClock, SystemDuration>(SystemTimePoint); -} +} // namespace mbgl diff --git a/src/mbgl/util/clip_id.cpp b/src/mbgl/util/clip_id.cpp index 901e978fbe..b89315d97b 100644 --- a/src/mbgl/util/clip_id.cpp +++ b/src/mbgl/util/clip_id.cpp @@ -94,4 +94,4 @@ void ClipIDGenerator::update(std::forward_list<Tile *> tiles) { } } -} +} // namespace mbgl diff --git a/src/mbgl/util/clip_id.hpp b/src/mbgl/util/clip_id.hpp index 3940e60524..71a07708c9 100644 --- a/src/mbgl/util/clip_id.hpp +++ b/src/mbgl/util/clip_id.hpp @@ -51,6 +51,6 @@ public: }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/util/compression.cpp b/src/mbgl/util/compression.cpp index 2ca11e3ad5..5dc3f1127c 100644 --- a/src/mbgl/util/compression.cpp +++ b/src/mbgl/util/compression.cpp @@ -96,5 +96,5 @@ std::string decompress(const std::string &raw) { return result; } -} -} +} // namespace util +} // namespace mbgl diff --git a/src/mbgl/util/compression.hpp b/src/mbgl/util/compression.hpp index a33b2476a7..2e7a8bbc0c 100644 --- a/src/mbgl/util/compression.hpp +++ b/src/mbgl/util/compression.hpp @@ -9,7 +9,7 @@ namespace util { std::string compress(const std::string &raw); std::string decompress(const std::string &raw); -} -} +} // namespace util +} // namespace mbgl #endif diff --git a/src/mbgl/util/default_styles.cpp b/src/mbgl/util/default_styles.cpp index d1fc199b64..d051fc60c3 100644 --- a/src/mbgl/util/default_styles.cpp +++ b/src/mbgl/util/default_styles.cpp @@ -11,6 +11,6 @@ const DefaultStyle dark = { "mapbox://styles/mapbox/dark-v8", " const DefaultStyle satellite = { "mapbox://styles/mapbox/satellite-v8", "Satellite" }; const DefaultStyle hybrid = { "mapbox://styles/mapbox/satellite-hybrid-v8", "Hybrid" }; -} +} // namespace default_styles } // end namespace util } // end namespace mbgl diff --git a/src/mbgl/util/gl_object_store.cpp b/src/mbgl/util/gl_object_store.cpp index b4c2582790..78d6700237 100644 --- a/src/mbgl/util/gl_object_store.cpp +++ b/src/mbgl/util/gl_object_store.cpp @@ -46,5 +46,5 @@ void GLObjectStore::performCleanup() { } } -} -} +} // namespace util +} // namespace mbgl diff --git a/src/mbgl/util/gl_object_store.hpp b/src/mbgl/util/gl_object_store.hpp index d2929b5182..775d4d1d01 100644 --- a/src/mbgl/util/gl_object_store.hpp +++ b/src/mbgl/util/gl_object_store.hpp @@ -29,7 +29,7 @@ private: std::vector<GLuint> abandonedTextures; }; -} -} +} // namespace util +} // namespace mbgl #endif diff --git a/src/mbgl/util/interpolate.hpp b/src/mbgl/util/interpolate.hpp index 28bbde8bf9..03d401c350 100644 --- a/src/mbgl/util/interpolate.hpp +++ b/src/mbgl/util/interpolate.hpp @@ -49,7 +49,7 @@ template<> inline RotationAlignmentType interpolate(const RotationAlignmentType template<> inline Faded<std::string> interpolate(const Faded<std::string>, const Faded<std::string> b, const double) { return b; } template<> inline Faded<std::vector<float>> interpolate(const Faded<std::vector<float>>, const Faded<std::vector<float>> b, const double) { return b; } -} -} +} // namespace util +} // namespace mbgl #endif diff --git a/src/mbgl/util/io.cpp b/src/mbgl/util/io.cpp index 0f7ce0e55d..f37ce09cff 100644 --- a/src/mbgl/util/io.cpp +++ b/src/mbgl/util/io.cpp @@ -39,5 +39,5 @@ void deleteFile(const std::string& filename) { } } -} -} +} // namespace util +} // namespace mbgl diff --git a/src/mbgl/util/io.hpp b/src/mbgl/util/io.hpp index bf15253ee4..1bcfe56af6 100644 --- a/src/mbgl/util/io.hpp +++ b/src/mbgl/util/io.hpp @@ -18,7 +18,7 @@ std::string read_file(const std::string &filename); void deleteFile(const std::string& filename); -} -} +} // namespace util +} // namespace mbgl #endif diff --git a/src/mbgl/util/mapbox.hpp b/src/mbgl/util/mapbox.hpp index 57f87e7959..29ee454894 100644 --- a/src/mbgl/util/mapbox.hpp +++ b/src/mbgl/util/mapbox.hpp @@ -20,8 +20,8 @@ std::string normalizeTileURL(const std::string& url, const std::string& sourceUR // sometimes have multiple valid URLs. std::string canonicalURL(const std::string &url); -} -} -} +} // namespace mapbox +} // namespace util +} // namespace mbgl #endif diff --git a/src/mbgl/util/mat2.hpp b/src/mbgl/util/mat2.hpp index b5cec821f9..c89088950d 100644 --- a/src/mbgl/util/mat2.hpp +++ b/src/mbgl/util/mat2.hpp @@ -35,7 +35,7 @@ void identity(mat2& out); void rotate(mat2& out, const mat2& a, double rad); void scale(mat2& out, const mat2& a, double v0, double v1); -} -} +} // namespace matrix +} // namespace mbgl #endif diff --git a/src/mbgl/util/mat3.hpp b/src/mbgl/util/mat3.hpp index 3a6aba5a11..b0ecb17467 100644 --- a/src/mbgl/util/mat3.hpp +++ b/src/mbgl/util/mat3.hpp @@ -36,7 +36,7 @@ void translate(mat3& out, const mat3& a, double x, double y); void rotate(mat3& out, const mat3& a, double rad); void scale(mat3& out, const mat3& a, double x, double y); -} -} +} // namespace matrix +} // namespace mbgl #endif diff --git a/src/mbgl/util/math.cpp b/src/mbgl/util/math.cpp index a7eab2d771..a524754109 100644 --- a/src/mbgl/util/math.cpp +++ b/src/mbgl/util/math.cpp @@ -21,5 +21,5 @@ uint32_t ceil_log2(uint64_t x) { return y; } -} -}
\ No newline at end of file +} // namespace util +} // namespace mbgl
\ No newline at end of file diff --git a/src/mbgl/util/premultiply.cpp b/src/mbgl/util/premultiply.cpp index c7be9a26cd..e0178fda33 100644 --- a/src/mbgl/util/premultiply.cpp +++ b/src/mbgl/util/premultiply.cpp @@ -49,5 +49,5 @@ UnassociatedImage unpremultiply(PremultipliedImage&& src) { return dst; } -} -} +} // namespace util +} // namespace mbgl diff --git a/src/mbgl/util/premultiply.hpp b/src/mbgl/util/premultiply.hpp index 8d87c157c8..f64f3f4555 100644 --- a/src/mbgl/util/premultiply.hpp +++ b/src/mbgl/util/premultiply.hpp @@ -9,7 +9,7 @@ namespace util { PremultipliedImage premultiply(UnassociatedImage&&); UnassociatedImage unpremultiply(PremultipliedImage&&); -} -} +} // namespace util +} // namespace mbgl #endif diff --git a/src/mbgl/util/raster.hpp b/src/mbgl/util/raster.hpp index 64244135d6..618c1a18a5 100644 --- a/src/mbgl/util/raster.hpp +++ b/src/mbgl/util/raster.hpp @@ -59,6 +59,6 @@ private: PremultipliedImage img; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/util/rect.hpp b/src/mbgl/util/rect.hpp index f4eb0679c4..71d8078447 100644 --- a/src/mbgl/util/rect.hpp +++ b/src/mbgl/util/rect.hpp @@ -23,6 +23,6 @@ struct Rect { inline bool hasArea() const { return w != 0 && h != 0; } }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/util/scaling.cpp b/src/mbgl/util/scaling.cpp index efc2709df3..9b32650511 100644 --- a/src/mbgl/util/scaling.cpp +++ b/src/mbgl/util/scaling.cpp @@ -42,7 +42,7 @@ vec2<uint32_t> getBounds(const vec2<uint32_t>& srcSize, const Rect<uint32_t>& sr std::min(uint32_t(double(srcSize.y - srcPos.y) / factor.y), std::min(dstSize.y - dstPos.y, dstPos.h)) }; } -} +} // namespace namespace mbgl { namespace util { @@ -108,5 +108,5 @@ void nearestNeighborScale(const uint32_t* srcData, const vec2<uint32_t>& srcSize } } -} -} +} // namespace util +} // namespace mbgl diff --git a/src/mbgl/util/scaling.hpp b/src/mbgl/util/scaling.hpp index 74a43eb621..a2d582de1c 100644 --- a/src/mbgl/util/scaling.hpp +++ b/src/mbgl/util/scaling.hpp @@ -17,7 +17,7 @@ void bilinearScale(const uint32_t* srcData, const vec2<uint32_t>& srcSize, void nearestNeighborScale(const uint32_t* srcData, const vec2<uint32_t>& srcSize, const Rect<uint32_t>& srcPos, uint32_t* dstData, const vec2<uint32_t>& dstSize, const Rect<uint32_t>& dstPos); -} -} +} // namespace util +} // namespace mbgl #endif diff --git a/src/mbgl/util/stopwatch.hpp b/src/mbgl/util/stopwatch.hpp index 57807afa76..a79ad92617 100644 --- a/src/mbgl/util/stopwatch.hpp +++ b/src/mbgl/util/stopwatch.hpp @@ -35,7 +35,7 @@ class stopwatch { inline ~stopwatch() {} }; #endif -} -} +} // namespace util +} // namespace mbgl #endif diff --git a/src/mbgl/util/texture_pool.hpp b/src/mbgl/util/texture_pool.hpp index 95d918c237..a980584c13 100644 --- a/src/mbgl/util/texture_pool.hpp +++ b/src/mbgl/util/texture_pool.hpp @@ -20,6 +20,6 @@ private: std::set<GLuint> texture_ids; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/util/thread.hpp b/src/mbgl/util/thread.hpp index e1ea89c392..a7a5e73782 100644 --- a/src/mbgl/util/thread.hpp +++ b/src/mbgl/util/thread.hpp @@ -138,7 +138,7 @@ Thread<Object>::~Thread() { thread.join(); } -} -} +} // namespace util +} // namespace mbgl #endif diff --git a/src/mbgl/util/thread_context.cpp b/src/mbgl/util/thread_context.cpp index 79c75528c5..fba5207390 100644 --- a/src/mbgl/util/thread_context.cpp +++ b/src/mbgl/util/thread_context.cpp @@ -9,7 +9,7 @@ namespace { using namespace mbgl::util; static ThreadLocal<ThreadContext>& current = *new ThreadLocal<ThreadContext>; -} +} // namespace namespace mbgl { namespace util { @@ -95,5 +95,5 @@ private: // ThreadContext::current object. MainThreadContextRegistrar registrar; -} -} +} // namespace util +} // namespace mbgl diff --git a/src/mbgl/util/thread_context.hpp b/src/mbgl/util/thread_context.hpp index 0c97611ebc..2b22b2faf4 100644 --- a/src/mbgl/util/thread_context.hpp +++ b/src/mbgl/util/thread_context.hpp @@ -48,7 +48,7 @@ public: GLObjectStore* glObjectStore = nullptr; }; -} -} +} // namespace util +} // namespace mbgl #endif diff --git a/src/mbgl/util/thread_local.hpp b/src/mbgl/util/thread_local.hpp index 1d580dc238..c805735cc4 100644 --- a/src/mbgl/util/thread_local.hpp +++ b/src/mbgl/util/thread_local.hpp @@ -53,7 +53,7 @@ private: pthread_key_t key; }; -} -} +} // namespace util +} // namespace mbgl #endif diff --git a/src/mbgl/util/tile_coordinate.hpp b/src/mbgl/util/tile_coordinate.hpp index 836539b5bb..4710e08d0a 100644 --- a/src/mbgl/util/tile_coordinate.hpp +++ b/src/mbgl/util/tile_coordinate.hpp @@ -24,6 +24,6 @@ struct TileCoordinate { }; }; -} +} // namespace mbgl #endif diff --git a/src/mbgl/util/tile_cover.cpp b/src/mbgl/util/tile_cover.cpp index b7937bf849..803aa53eee 100644 --- a/src/mbgl/util/tile_cover.cpp +++ b/src/mbgl/util/tile_cover.cpp @@ -97,4 +97,4 @@ std::forward_list<TileID> tileCover(int8_t z, const mbgl::box &bounds, int8_t ac return t; } -} +} // namespace mbgl diff --git a/src/mbgl/util/tile_cover.hpp b/src/mbgl/util/tile_cover.hpp index 99c19a3052..0514c36b62 100644 --- a/src/mbgl/util/tile_cover.hpp +++ b/src/mbgl/util/tile_cover.hpp @@ -10,6 +10,6 @@ namespace mbgl { std::forward_list<TileID> tileCover(int8_t z, const box& bounds, int8_t actualZ); -} +} // namespace mbgl #endif diff --git a/src/mbgl/util/time.cpp b/src/mbgl/util/time.cpp index 42d37b6f2c..575ed47e1a 100644 --- a/src/mbgl/util/time.cpp +++ b/src/mbgl/util/time.cpp @@ -26,5 +26,5 @@ std::string iso8601(std::time_t time) { return buffer; } -} -} +} // namespace util +} // namespace mbgl diff --git a/src/mbgl/util/timer.hpp b/src/mbgl/util/timer.hpp index 932bb47950..44a516d168 100644 --- a/src/mbgl/util/timer.hpp +++ b/src/mbgl/util/timer.hpp @@ -24,7 +24,7 @@ private: std::unique_ptr<Impl> impl; }; -} -} +} // namespace util +} // namespace mbgl #endif diff --git a/src/mbgl/util/transition.cpp b/src/mbgl/util/transition.cpp index bab5e12fdd..79611f5348 100644 --- a/src/mbgl/util/transition.cpp +++ b/src/mbgl/util/transition.cpp @@ -23,4 +23,5 @@ transition::state ease_transition<T>::update(const TimePoint& now) const { template class ease_transition<double>; -}} +} // namespace util +} // namespace mbgl diff --git a/src/mbgl/util/transition.hpp b/src/mbgl/util/transition.hpp index 5cfbc0a7ca..a947a9ad18 100644 --- a/src/mbgl/util/transition.hpp +++ b/src/mbgl/util/transition.hpp @@ -72,7 +72,7 @@ private: T& value; }; -} -} +} // namespace util +} // namespace mbgl #endif diff --git a/src/mbgl/util/url.cpp b/src/mbgl/util/url.cpp index e9b9672109..bf6fc70ff5 100644 --- a/src/mbgl/util/url.cpp +++ b/src/mbgl/util/url.cpp @@ -47,5 +47,5 @@ std::string percentDecode(const std::string& input) { return decoded; } -} -} +} // namespace util +} // namespace mbgl diff --git a/src/mbgl/util/url.hpp b/src/mbgl/util/url.hpp index a7e5291ec5..6257a171c0 100644 --- a/src/mbgl/util/url.hpp +++ b/src/mbgl/util/url.hpp @@ -9,7 +9,7 @@ namespace util { std::string percentEncode(const std::string&); std::string percentDecode(const std::string&); -} -} +} // namespace util +} // namespace mbgl #endif diff --git a/src/mbgl/util/vec4.hpp b/src/mbgl/util/vec4.hpp index c5b4ab1d9e..8f54f22261 100644 --- a/src/mbgl/util/vec4.hpp +++ b/src/mbgl/util/vec4.hpp @@ -34,7 +34,7 @@ typedef std::array<double, 4> vec4; void transformMat4(vec4& out, vec4& a, mat4& m); -} -} +} // namespace matrix +} // namespace mbgl #endif diff --git a/src/mbgl/util/version_info.cpp b/src/mbgl/util/version_info.cpp index 1d649d2b69..c545ddcc40 100644 --- a/src/mbgl/util/version_info.cpp +++ b/src/mbgl/util/version_info.cpp @@ -10,5 +10,5 @@ const char *revision = MBGL_VERSION_REV; const char *string = MBGL_VERSION_STRING; const unsigned int number = MBGL_VERSION; -} -}
\ No newline at end of file +} // namespace version +} // namespace mbgl
\ No newline at end of file diff --git a/src/mbgl/util/work_queue.cpp b/src/mbgl/util/work_queue.cpp index ee8e128829..80c4af8778 100644 --- a/src/mbgl/util/work_queue.cpp +++ b/src/mbgl/util/work_queue.cpp @@ -34,5 +34,5 @@ void WorkQueue::pop(const std::function<void()>& fn) { queue.pop(); } -} -} +} // namespace util +} // namespace mbgl diff --git a/src/mbgl/util/work_queue.hpp b/src/mbgl/util/work_queue.hpp index 55b687a468..6694352918 100644 --- a/src/mbgl/util/work_queue.hpp +++ b/src/mbgl/util/work_queue.hpp @@ -37,7 +37,7 @@ private: RunLoop* runLoop; }; -} -} +} // namespace util +} // namespace mbgl #endif diff --git a/src/mbgl/util/work_request.cpp b/src/mbgl/util/work_request.cpp index 69e9397288..819585ae56 100644 --- a/src/mbgl/util/work_request.cpp +++ b/src/mbgl/util/work_request.cpp @@ -13,4 +13,4 @@ WorkRequest::~WorkRequest() { task->cancel(); } -} +} // namespace mbgl diff --git a/src/mbgl/util/worker.hpp b/src/mbgl/util/worker.hpp index cd89f0e964..31e45f1240 100644 --- a/src/mbgl/util/worker.hpp +++ b/src/mbgl/util/worker.hpp @@ -59,6 +59,6 @@ private: std::vector<std::unique_ptr<util::Thread<Impl>>> threads; std::size_t current = 0; }; -} +} // namespace mbgl #endif diff --git a/test/api/annotations.cpp b/test/api/annotations.cpp index d944887f20..d3299443f8 100644 --- a/test/api/annotations.cpp +++ b/test/api/annotations.cpp @@ -24,7 +24,7 @@ std::string getFileSourceRoot() { #endif } -} +} // namespace std::shared_ptr<SpriteImage> defaultMarker() { PremultipliedImage image = decodeImage(util::read_file("test/fixtures/sprites/default_marker.png")); diff --git a/test/fixtures/mock_file_source.cpp b/test/fixtures/mock_file_source.cpp index 7b4ca82e04..b0d7018873 100644 --- a/test/fixtures/mock_file_source.cpp +++ b/test/fixtures/mock_file_source.cpp @@ -158,4 +158,4 @@ void MockFileSource::cancel(FileRequest* req) { thread_->invoke(&Impl::cancelRequest, req); } -} +} // namespace mbgl diff --git a/test/fixtures/util.cpp b/test/fixtures/util.cpp index ebd530eaac..c3ce1b7efb 100644 --- a/test/fixtures/util.cpp +++ b/test/fixtures/util.cpp @@ -113,5 +113,5 @@ void checkImage(const std::string& base, util::write_file(base + "/diff.png", encodePNG(diff)); } -} -} +} // namespace test +} // namespace mbgl diff --git a/test/miscellaneous/async_task.cpp b/test/miscellaneous/async_task.cpp index 4873ec5afc..c1a2bd82e0 100644 --- a/test/miscellaneous/async_task.cpp +++ b/test/miscellaneous/async_task.cpp @@ -33,7 +33,7 @@ private: AsyncTask *async; }; -} +} // namespace TEST(AsyncTask, RequestCoalescing) { RunLoop loop; diff --git a/test/miscellaneous/binpack.cpp b/test/miscellaneous/binpack.cpp index a597f0a299..54f410a0be 100644 --- a/test/miscellaneous/binpack.cpp +++ b/test/miscellaneous/binpack.cpp @@ -9,7 +9,7 @@ namespace mbgl { template <typename T> ::std::ostream& operator<<(::std::ostream& os, const Rect<T>& t) { return os << "Rect { " << t.x << ", " << t.y << ", " << t.w << ", " << t.h << " }"; } -} +} // namespace mbgl TEST(BinPack, Allocating) { mbgl::BinPack<uint16_t> bin(128, 128); diff --git a/test/miscellaneous/thread_local.cpp b/test/miscellaneous/thread_local.cpp index 6f9523f6ef..aeaf187540 100644 --- a/test/miscellaneous/thread_local.cpp +++ b/test/miscellaneous/thread_local.cpp @@ -28,7 +28,7 @@ private: ThreadLocal<int> TestThread::number; -} +} // namespace TEST(ThreadLocalStorage, Basic) { RunLoop loop; @@ -73,7 +73,7 @@ private: ThreadLocal<DtorCounter> TestThreadReclaim::counter; -} +} // namespace TEST(ThreadLocalStorage, AutoReclaim) { RunLoop loop; diff --git a/test/storage/file_reading.cpp b/test/storage/file_reading.cpp index 1b1b1b2888..7565ad3d66 100644 --- a/test/storage/file_reading.cpp +++ b/test/storage/file_reading.cpp @@ -52,7 +52,7 @@ private: std::function<void(mbgl::Response)> requestCallback; }; -} +} // namespace TEST_F(Storage, AssetStress) { SCOPED_TEST(AssetStress) diff --git a/test/style/resource_loading.cpp b/test/style/resource_loading.cpp index f5019cfd82..c646f0372a 100644 --- a/test/style/resource_loading.cpp +++ b/test/style/resource_loading.cpp @@ -141,7 +141,7 @@ void runTestCase(MockFileSource::Type type, } } -} +} // namespace class ResourceLoading : public ::testing::TestWithParam<std::pair<std::string, std::string>> { }; |