From ca8b26bbf669905ef73aa0b27c753e5f18dd26e6 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 6 Jun 2016 23:43:07 -0700
Subject: [core] Inline TileSource::isRequired, remove unused isOptional

---
 src/mbgl/tile/tile_source.hpp      | 8 --------
 src/mbgl/tile/tile_source_impl.hpp | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/mbgl/tile/tile_source.hpp b/src/mbgl/tile/tile_source.hpp
index 69688241fd..f1a0a1c922 100644
--- a/src/mbgl/tile/tile_source.hpp
+++ b/src/mbgl/tile/tile_source.hpp
@@ -44,14 +44,6 @@ public:
     }
 
 private:
-    bool isOptional() const {
-        return necessity == Necessity::Optional;
-    }
-
-    bool isRequired() const {
-        return necessity == Necessity::Required;
-    }
-
     // called when the tile is one of the ideal tiles that we want to show definitely. the tile source
     // should try to make every effort (e.g. fetch from internet, or revalidate existing resources).
     void makeRequired();
diff --git a/src/mbgl/tile/tile_source_impl.hpp b/src/mbgl/tile/tile_source_impl.hpp
index 8d5caeb829..b5a48a97bb 100644
--- a/src/mbgl/tile/tile_source_impl.hpp
+++ b/src/mbgl/tile/tile_source_impl.hpp
@@ -34,7 +34,7 @@ TileSource<T>::TileSource(T& tileData_,
     } else {
         // When the FileSource doesn't support optional requests, we do nothing until the
         // data is definitely required.
-        if (isRequired()) {
+        if (necessity == Necessity::Required) {
             loadRequired();
         } else {
             // We're using this field to check whether the pending request is optional or required.
@@ -62,7 +62,7 @@ void TileSource<T>::loadOptional() {
             loadedData(res);
         }
 
-        if (isRequired()) {
+        if (necessity == Necessity::Required) {
             loadRequired();
         }
     });
-- 
cgit v1.2.1