summaryrefslogtreecommitdiff
path: root/include/mbgl
diff options
context:
space:
mode:
Diffstat (limited to 'include/mbgl')
-rw-r--r--include/mbgl/annotation/annotation.hpp2
-rw-r--r--include/mbgl/annotation/point_annotation.hpp2
-rw-r--r--include/mbgl/annotation/shape_annotation.hpp2
-rw-r--r--include/mbgl/map/camera.hpp2
-rw-r--r--include/mbgl/map/map.hpp4
-rw-r--r--include/mbgl/map/view.hpp2
-rw-r--r--include/mbgl/platform/default/headless_display.hpp2
-rw-r--r--include/mbgl/platform/default/headless_view.hpp2
-rw-r--r--include/mbgl/platform/default/settings_json.hpp2
-rw-r--r--include/mbgl/platform/event.hpp2
-rw-r--r--include/mbgl/platform/gl.hpp4
-rw-r--r--include/mbgl/platform/log.hpp2
-rw-r--r--include/mbgl/platform/platform.hpp4
-rw-r--r--include/mbgl/sprite/sprite_image.hpp2
-rw-r--r--include/mbgl/storage/default_file_source.hpp4
-rw-r--r--include/mbgl/storage/file_cache.hpp2
-rw-r--r--include/mbgl/storage/file_source.hpp2
-rw-r--r--include/mbgl/storage/network_status.hpp4
-rw-r--r--include/mbgl/storage/resource.hpp2
-rw-r--r--include/mbgl/storage/sqlite_cache.hpp4
-rw-r--r--include/mbgl/style/types.hpp2
-rw-r--r--include/mbgl/util/chrono.hpp2
-rw-r--r--include/mbgl/util/constants.hpp6
-rw-r--r--include/mbgl/util/enum.hpp2
-rw-r--r--include/mbgl/util/exception.hpp4
-rw-r--r--include/mbgl/util/geo.hpp2
-rw-r--r--include/mbgl/util/gl_helper.hpp4
-rw-r--r--include/mbgl/util/image.hpp2
-rw-r--r--include/mbgl/util/mat4.hpp4
-rw-r--r--include/mbgl/util/math.hpp4
-rw-r--r--include/mbgl/util/noncopyable.hpp5
-rw-r--r--include/mbgl/util/projection.hpp2
-rw-r--r--include/mbgl/util/ptr.hpp4
-rw-r--r--include/mbgl/util/run_loop.hpp4
-rw-r--r--include/mbgl/util/std.hpp4
-rw-r--r--include/mbgl/util/string.hpp4
-rw-r--r--include/mbgl/util/time.hpp4
-rw-r--r--include/mbgl/util/unitbezier.hpp4
-rw-r--r--include/mbgl/util/utf.hpp3
-rw-r--r--include/mbgl/util/vec.hpp2
-rw-r--r--include/mbgl/util/work_request.hpp2
-rw-r--r--include/mbgl/util/work_task.hpp2
42 files changed, 63 insertions, 61 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