summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJesse Bounds <jesse@rebounds.net>2016-07-07 15:40:07 -0700
committerJesse Bounds <jesse@rebounds.net>2016-07-07 15:40:07 -0700
commit23caa9f7aa9a128896afc0743482e015d2c60373 (patch)
tree0d927ad1f66351c52ad53fe295fe4bed855963a3 /src
parent2e10c0a8660af9cdf6ff897aaa39e15fe62c6582 (diff)
parentbb057409c728968cf37c9faca2c1eb4c589c5716 (diff)
downloadqtlocation-mapboxgl-23caa9f7aa9a128896afc0743482e015d2c60373.tar.gz
Merge branch 'release-ios-v3.3.0' into master
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/util/compression.cpp2
-rw-r--r--src/mbgl/util/compression.hpp12
2 files changed, 1 insertions, 13 deletions
diff --git a/src/mbgl/util/compression.cpp b/src/mbgl/util/compression.cpp
index e189991b55..18cb189d02 100644
--- a/src/mbgl/util/compression.cpp
+++ b/src/mbgl/util/compression.cpp
@@ -1,4 +1,4 @@
-#include "compression.hpp"
+#include <mbgl/util/compression.hpp>
#include <zlib.h>
diff --git a/src/mbgl/util/compression.hpp b/src/mbgl/util/compression.hpp
deleted file mode 100644
index 8f89a3ac03..0000000000
--- a/src/mbgl/util/compression.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include <string>
-
-namespace mbgl {
-namespace util {
-
-std::string compress(const std::string &raw);
-std::string decompress(const std::string &raw);
-
-} // namespace util
-} // namespace mbgl