From e42a903bba2ab5b4a7225a0674dd00115d93bc7c Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Tue, 28 Jul 2015 12:28:32 +0300
Subject: [PATCH] Replaced 'override' with 'final' for non-public interfaces

---
 platform/darwin/http_request_nsurl.mm  | 2 +-
 platform/default/asset_request_fs.cpp  | 4 ++--
 platform/default/asset_request_zip.cpp | 4 ++--
 platform/default/http_request_curl.cpp | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform/darwin/http_request_nsurl.mm b/platform/darwin/http_request_nsurl.mm
index a1282cf45..119cc6caa 100644
--- a/platform/darwin/http_request_nsurl.mm
+++ b/platform/darwin/http_request_nsurl.mm
@@ -57,7 +57,7 @@ public:
     HTTPRequestBase* createRequest(const Resource&,
                                RequestBase::Callback,
                                uv_loop_t*,
-                               std::shared_ptr<const Response>) override;
+                               std::shared_ptr<const Response>) final;
 
     NSURLSession *session = nil;
     NSString *userAgent = nil;
diff --git a/platform/default/asset_request_fs.cpp b/platform/default/asset_request_fs.cpp
index 04f85fbc3..f5f0b2a0d 100644
--- a/platform/default/asset_request_fs.cpp
+++ b/platform/default/asset_request_fs.cpp
@@ -19,7 +19,7 @@ public:
     AssetRequest(const Resource&, Callback, uv_loop_t*, const std::string& assetRoot);
     ~AssetRequest();
 
-    void cancel() override;
+    void cancel() final;
 
     static void fileOpened(uv_fs_t *req);
     static void fileStated(uv_fs_t *req);
@@ -40,7 +40,7 @@ class AssetFSContext : public AssetContext {
     RequestBase* createRequest(const Resource& resource,
                                RequestBase::Callback callback,
                                uv_loop_t* loop,
-                               const std::string& assetRoot) override {
+                               const std::string& assetRoot) final {
         return new AssetRequest(resource, callback, loop, assetRoot);
     }
 };
diff --git a/platform/default/asset_request_zip.cpp b/platform/default/asset_request_zip.cpp
index 4c380bdd8..aa22ca18d 100644
--- a/platform/default/asset_request_zip.cpp
+++ b/platform/default/asset_request_zip.cpp
@@ -23,7 +23,7 @@ public:
     RequestBase* createRequest(const Resource& resource,
                                RequestBase::Callback callback,
                                uv_loop_t* loop,
-                               const std::string& assetRoot) override;
+                               const std::string& assetRoot) final;
 
     uv_zip_t *getHandle(const std::string &path);
     void returnHandle(const std::string &path, uv_zip_t *zip);
@@ -71,7 +71,7 @@ public:
     AssetRequest(AssetZipContext&, const Resource&, Callback, const std::string& assetRoot);
     ~AssetRequest();
 
-    void cancel() override;
+    void cancel() final;
 
 private:
     AssetZipContext &context;
diff --git a/platform/default/http_request_curl.cpp b/platform/default/http_request_curl.cpp
index 62bf263ba..2c4b60652 100644
--- a/platform/default/http_request_curl.cpp
+++ b/platform/default/http_request_curl.cpp
@@ -47,7 +47,7 @@ public:
     HTTPRequestBase* createRequest(const Resource&,
                                RequestBase::Callback,
                                uv_loop_t*,
-                               std::shared_ptr<const Response>) override;
+                               std::shared_ptr<const Response>) final;
 
     static int handleSocket(CURL *handle, curl_socket_t s, int action, void *userp, void *socketp);
     static void perform(uv_poll_t *req, int status, int events);