summaryrefslogtreecommitdiff
path: root/src/mbgl/util
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2015-12-01 17:30:44 +0100
committerKonstantin Käfer <mail@kkaefer.com>2015-12-03 15:38:36 +0100
commitd5fb535058d4d97567b08064e0203f45c2c8370f (patch)
treef10e6d116f86405f1a432a6dc2fbc0122749169d /src/mbgl/util
parent6feb89cbbc50d31557c3d74d3a7ca97b474a7507 (diff)
downloadqtlocation-mapboxgl-d5fb535058d4d97567b08064e0203f45c2c8370f.tar.gz
[core] add namespace comment to closing brace
Diffstat (limited to 'src/mbgl/util')
-rw-r--r--src/mbgl/util/async_task.hpp4
-rw-r--r--src/mbgl/util/box.hpp2
-rw-r--r--src/mbgl/util/chrono.cpp2
-rw-r--r--src/mbgl/util/clip_id.cpp2
-rw-r--r--src/mbgl/util/clip_id.hpp2
-rw-r--r--src/mbgl/util/compression.cpp4
-rw-r--r--src/mbgl/util/compression.hpp4
-rw-r--r--src/mbgl/util/default_styles.cpp2
-rw-r--r--src/mbgl/util/gl_object_store.cpp4
-rw-r--r--src/mbgl/util/gl_object_store.hpp4
-rw-r--r--src/mbgl/util/interpolate.hpp4
-rw-r--r--src/mbgl/util/io.cpp4
-rw-r--r--src/mbgl/util/io.hpp4
-rw-r--r--src/mbgl/util/mapbox.hpp6
-rw-r--r--src/mbgl/util/mat2.hpp4
-rw-r--r--src/mbgl/util/mat3.hpp4
-rw-r--r--src/mbgl/util/math.cpp4
-rw-r--r--src/mbgl/util/premultiply.cpp4
-rw-r--r--src/mbgl/util/premultiply.hpp4
-rw-r--r--src/mbgl/util/raster.hpp2
-rw-r--r--src/mbgl/util/rect.hpp2
-rw-r--r--src/mbgl/util/scaling.cpp6
-rw-r--r--src/mbgl/util/scaling.hpp4
-rw-r--r--src/mbgl/util/stopwatch.hpp4
-rw-r--r--src/mbgl/util/texture_pool.hpp2
-rw-r--r--src/mbgl/util/thread.hpp4
-rw-r--r--src/mbgl/util/thread_context.cpp6
-rw-r--r--src/mbgl/util/thread_context.hpp4
-rw-r--r--src/mbgl/util/thread_local.hpp4
-rw-r--r--src/mbgl/util/tile_coordinate.hpp2
-rw-r--r--src/mbgl/util/tile_cover.cpp2
-rw-r--r--src/mbgl/util/tile_cover.hpp2
-rw-r--r--src/mbgl/util/time.cpp4
-rw-r--r--src/mbgl/util/timer.hpp4
-rw-r--r--src/mbgl/util/transition.cpp3
-rw-r--r--src/mbgl/util/transition.hpp4
-rw-r--r--src/mbgl/util/url.cpp4
-rw-r--r--src/mbgl/util/url.hpp4
-rw-r--r--src/mbgl/util/vec4.hpp4
-rw-r--r--src/mbgl/util/version_info.cpp4
-rw-r--r--src/mbgl/util/work_queue.cpp4
-rw-r--r--src/mbgl/util/work_queue.hpp4
-rw-r--r--src/mbgl/util/work_request.cpp2
-rw-r--r--src/mbgl/util/worker.hpp2
44 files changed, 78 insertions, 77 deletions
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