From aa88ca4757f182dcab5b66172144701185ec28ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Mon, 6 Jun 2016 18:20:50 +0200
Subject: [PATCH] [core] remove unused code

---
 src/mbgl/geometry/buffer.hpp     | 13 ------------
 src/mbgl/renderer/renderable.hpp | 11 ----------
 src/mbgl/style/source.hpp        |  1 -
 src/mbgl/util/assert.hpp         | 10 ---------
 src/mbgl/util/channel.hpp        | 36 --------------------------------
 test/test.gypi                   |  1 -
 test/util/assert.cpp             |  9 --------
 7 files changed, 81 deletions(-)
 delete mode 100644 src/mbgl/renderer/renderable.hpp
 delete mode 100644 src/mbgl/util/assert.hpp
 delete mode 100644 src/mbgl/util/channel.hpp
 delete mode 100644 test/util/assert.cpp

diff --git a/src/mbgl/geometry/buffer.hpp b/src/mbgl/geometry/buffer.hpp
index 1712ca988..6465b6f8e 100644
--- a/src/mbgl/geometry/buffer.hpp
+++ b/src/mbgl/geometry/buffer.hpp
@@ -88,19 +88,6 @@ protected:
         return reinterpret_cast<char *>(array) + (pos - itemSize);
     }
 
-    // Get a pointer to the item at a given index.
-    inline void *getElement(size_t i) {
-        if (array == nullptr) {
-            throw std::runtime_error("Buffer was already deleted or doesn't contain elements");
-        }
-
-        if (i * itemSize >= pos) {
-            throw std::runtime_error("Can't get element after array bounds");
-        } else {
-            return reinterpret_cast<char *>(array) + (i * itemSize);
-        }
-    }
-
 public:
     static const size_t itemSize = item_size;
 
diff --git a/src/mbgl/renderer/renderable.hpp b/src/mbgl/renderer/renderable.hpp
deleted file mode 100644
index 27acfc4d0..000000000
--- a/src/mbgl/renderer/renderable.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include <mbgl/util/clip_id.hpp>
-
-namespace mbgl {
-
-struct Renderable {
-    ClipID& clip;
-};
-
-} // namespace mbgl
diff --git a/src/mbgl/style/source.hpp b/src/mbgl/style/source.hpp
index cadc45c25..07e1aeaf5 100644
--- a/src/mbgl/style/source.hpp
+++ b/src/mbgl/style/source.hpp
@@ -4,7 +4,6 @@
 #include <mbgl/tile/tile_data.hpp>
 #include <mbgl/tile/tile_cache.hpp>
 #include <mbgl/style/types.hpp>
-#include <mbgl/renderer/renderable.hpp>
 
 #include <mbgl/util/mat4.hpp>
 #include <mbgl/util/rapidjson.hpp>
diff --git a/src/mbgl/util/assert.hpp b/src/mbgl/util/assert.hpp
deleted file mode 100644
index 47fc13f94..000000000
--- a/src/mbgl/util/assert.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include <cassert>
-
-// Based on FreeBSD's src/include/assert.h
-// Licensed under the original BSD license
-#define assert_always(expr)                                                                        \
-    ((void)((expr) ? ((void)0) : ((void)fprintf(stderr, "%s:%u: failed assertion `%s'\n",          \
-                                                __FILE__, __LINE__, #expr),                        \
-                                  abort())))
diff --git a/src/mbgl/util/channel.hpp b/src/mbgl/util/channel.hpp
deleted file mode 100644
index 319205b44..000000000
--- a/src/mbgl/util/channel.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-
-#include <mutex>
-#include <condition_variable>
-#include <queue>
-
-namespace mbgl {
-
-template <class T>
-class Channel : public mbgl::util::noncopyable {
-public:
-    void send(const T& t) {
-        std::unique_lock<std::mutex> lock(mutex);
-        queue.push(t);
-        condition.notify_one();
-    }
-
-    T receive() {
-        std::unique_lock<std::mutex> lock(mutex);
-        condition.wait(lock, [&](){ return !queue.empty(); });
-
-        T t = queue.front();
-        queue.pop();
-
-        return t;
-    }
-
-private:
-    std::mutex mutex;
-    std::condition_variable condition;
-    std::queue<T> queue;
-};
-
-}
diff --git a/test/test.gypi b/test/test.gypi
index f9a25e4e8..b7e7b5c32 100644
--- a/test/test.gypi
+++ b/test/test.gypi
@@ -18,7 +18,6 @@
       ],
 
       'sources': [
-        'util/assert.cpp',
         'util/async_task.cpp',
         'util/geo.cpp',
         'util/image.cpp',
diff --git a/test/util/assert.cpp b/test/util/assert.cpp
deleted file mode 100644
index cf7baf8ca..000000000
--- a/test/util/assert.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <mbgl/test/util.hpp>
-
-#include <mbgl/util/assert.hpp>
-
-using namespace mbgl;
-
-TEST(Assert, Always) {
-    EXPECT_DEATH_IF_SUPPORTED(assert_always(true == false), "failed assertion `true == false'");
-}