diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-07-28 10:44:41 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-07-28 19:27:13 +0300 |
commit | 785b34df2e064b54006617322464a634bb5cd124 (patch) | |
tree | 5e0345815201270f6bea33f689e116056f5d9674 /platform | |
parent | c1cd961093004997b55b1610b41b3be91bec5b28 (diff) | |
download | qtlocation-mapboxgl-785b34df2e064b54006617322464a634bb5cd124.tar.gz |
Moved ResponseStatus to its own header
Diffstat (limited to 'platform')
-rw-r--r-- | platform/darwin/http_request_nsurl.mm | 31 | ||||
-rw-r--r-- | platform/default/http_request_curl.cpp | 21 |
2 files changed, 2 insertions, 50 deletions
diff --git a/platform/darwin/http_request_nsurl.mm b/platform/darwin/http_request_nsurl.mm index 207c33b23c..10774587c5 100644 --- a/platform/darwin/http_request_nsurl.mm +++ b/platform/darwin/http_request_nsurl.mm @@ -1,4 +1,5 @@ #include <mbgl/storage/http_context.hpp> +#include <mbgl/storage/http_request_base.hpp> #include <mbgl/storage/resource.hpp> #include <mbgl/storage/response.hpp> @@ -12,36 +13,6 @@ namespace mbgl { -enum class ResponseStatus : uint8_t { - // This error probably won't be resolved by retrying anytime soon. We are giving up. - PermanentError, - - // This error might be resolved by waiting some time (e.g. server issues). - // We are going to do an exponential back-off and will try again in a few seconds. - TemporaryError, - - // This error was caused by a temporary error and it is likely that it will be resolved - // immediately. We are going to try again right away. This is like the TemporaryError, except - // that we will not perform exponential back-off. - SingularError, - - // This error might be resolved once the network reachability status changes. - // We are going to watch the network status for changes and will retry as soon as the - // operating system notifies us of a network status change. - ConnectionError, - - // The request was canceled mid-way. - Canceled, - - // The request returned data successfully. We retrieved and decoded the data successfully. - Successful, - - // The request confirmed that the data wasn't changed. We already have the data. - NotModified, -}; - -// ------------------------------------------------------------------------------------------------- - class HTTPNSURLContext; class HTTPRequest : public RequestBase { diff --git a/platform/default/http_request_curl.cpp b/platform/default/http_request_curl.cpp index b3d6418c08..cdd1de9dd6 100644 --- a/platform/default/http_request_curl.cpp +++ b/platform/default/http_request_curl.cpp @@ -1,4 +1,5 @@ #include <mbgl/storage/http_context.hpp> +#include <mbgl/storage/http_request_base.hpp> #include <mbgl/storage/resource.hpp> #include <mbgl/storage/response.hpp> #include <mbgl/util/chrono.hpp> @@ -34,26 +35,6 @@ void handleError(CURLcode code) { namespace mbgl { -enum class ResponseStatus : int8_t { - // This error probably won't be resolved by retrying anytime soon. We are giving up. - PermanentError, - - // This error might be resolved by waiting some time (e.g. server issues). - // We are going to do an exponential back-off and will try again in a few seconds. - TemporaryError, - - // This error might be resolved once the network reachability status changes. - // We are going to watch the network status for changes and will retry as soon as the - // operating system notifies us of a network status change. - ConnectionError, - - // The request returned data successfully. We retrieved and decoded the data successfully. - Successful, - - // The request confirmed that the data wasn't changed. We already have the data. - NotModified, -}; - class HTTPRequest; class HTTPCURLContext : public HTTPContext { |