summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <thiago@mapbox.com>2016-07-08 20:40:14 +0300
committerThiago Marcos P. Santos <thiago@mapbox.com>2016-07-11 17:01:31 +0300
commit843fff99b524dd9c9a29a94c83d3fccc4c6d4bb2 (patch)
tree4831d534a130cbcb159c8f32c11f7cbb22ef34f4
parent65868b28cc98fa89af4251f489741bcd6fe8a9e3 (diff)
downloadqtlocation-mapboxgl-843fff99b524dd9c9a29a94c83d3fccc4c6d4bb2.tar.gz
[Qt] Fix build on Linux with clang-3.8
clang finds this construction ambiguous, go figure.
-rw-r--r--platform/qt/src/http_request.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/qt/src/http_request.cpp b/platform/qt/src/http_request.cpp
index 7290f5a974..b1ea9d8976 100644
--- a/platform/qt/src/http_request.cpp
+++ b/platform/qt/src/http_request.cpp
@@ -39,7 +39,8 @@ QNetworkRequest HTTPRequest::networkRequest() const
req.setRawHeader("User-Agent", "MapboxGL/1.0 [Qt]");
if (m_resource.priorEtag) {
- req.setRawHeader("If-None-Match", QByteArray(m_resource.priorEtag->data(), m_resource.priorEtag->size()));
+ const auto etag = m_resource.priorEtag;
+ req.setRawHeader("If-None-Match", QByteArray(etag->data(), etag->size()));
} else if (m_resource.priorModified) {
req.setRawHeader("If-Modified-Since", util::rfc1123(*m_resource.priorModified).c_str());
}