diff options
| author | Jesse Bounds <jesse@rebounds.net> | 2016-07-08 09:30:22 -0700 |
|---|---|---|
| committer | Jesse Bounds <jesse@rebounds.net> | 2016-07-08 09:30:22 -0700 |
| commit | 626cf54be23865b044092164510d2d51cb3bc32b (patch) | |
| tree | f237cbb79fb54ebb180fe777be76c9492f1a4cdf /src | |
| parent | 01f5b6e58d01207328f58ed8c659378945761bd1 (diff) | |
| parent | 23caa9f7aa9a128896afc0743482e015d2c60373 (diff) | |
| download | qtlocation-mapboxgl-626cf54be23865b044092164510d2d51cb3bc32b.tar.gz | |
Merge branch 'boundsj-merge-3.3.0.rc.1'
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/util/compression.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/util/compression.hpp | 12 |
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 |