summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Muesch <muesch@fb.com>2019-05-23 13:02:55 -0400
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2019-06-10 15:13:38 +0300
commit774d32038f60b672ba37daf9ce71e73009a2eed9 (patch)
treef5e9311f2b59c312ba7d0b4ecfce8d0d3a7438a0
parentfc802daa629d11174cd868820f584399501a33c7 (diff)
downloadqtlocation-mapboxgl-774d32038f60b672ba37daf9ce71e73009a2eed9.tar.gz
Fix namespace issue with OSMesa
HeadlessBackend seems to be part of the mbgl::gl namespace. Since OSMesaBackendImpl is only in the mbgl namespace this code does not compile. Since this file is in the mbgl/gl folder I think it makes sense to just put the whole thing in the mbgl::gl namespace.
-rw-r--r--platform/default/src/mbgl/gl/headless_backend_osmesa.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/platform/default/src/mbgl/gl/headless_backend_osmesa.cpp b/platform/default/src/mbgl/gl/headless_backend_osmesa.cpp
index 0da1caf9af..75e5dc8ab2 100644
--- a/platform/default/src/mbgl/gl/headless_backend_osmesa.cpp
+++ b/platform/default/src/mbgl/gl/headless_backend_osmesa.cpp
@@ -6,6 +6,7 @@
#include <cassert>
namespace mbgl {
+namespace gl {
class OSMesaBackendImpl : public HeadlessBackend::Impl {
public:
@@ -44,4 +45,5 @@ void HeadlessBackend::createImpl() {
impl = std::make_unique<OSMesaBackendImpl>();
}
+} // namespace gl
} // namespace mbgl