From ff0e54f35a52bf2a4ddfce6e72c11418bd7b88ce Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <brunoabinader@gmail.com>
Date: Thu, 18 Jun 2015 09:48:34 +0300
Subject: [PATCH] Cleaned up #defines for BUFFER_OFFSET

---
 src/mbgl/renderer/bucket.hpp           | 2 ++
 src/mbgl/renderer/debug_bucket.cpp     | 4 ----
 src/mbgl/renderer/fill_bucket.cpp      | 4 ----
 src/mbgl/renderer/line_bucket.cpp      | 4 ----
 src/mbgl/renderer/painter.cpp          | 2 --
 src/mbgl/renderer/painter_clipping.cpp | 4 ----
 src/mbgl/renderer/painter_debug.cpp    | 4 ----
 src/mbgl/renderer/raster_bucket.cpp    | 4 ----
 src/mbgl/renderer/symbol_bucket.cpp    | 4 ----
 9 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/src/mbgl/renderer/bucket.hpp b/src/mbgl/renderer/bucket.hpp
index 147895a09..4bdb766a7 100644
--- a/src/mbgl/renderer/bucket.hpp
+++ b/src/mbgl/renderer/bucket.hpp
@@ -5,6 +5,8 @@
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/mat4.hpp>
 
+#define BUFFER_OFFSET(i) ((char*)nullptr + (i))
+
 namespace mbgl {
 
 class Painter;
diff --git a/src/mbgl/renderer/debug_bucket.cpp b/src/mbgl/renderer/debug_bucket.cpp
index a315d089e..1d9b9fb6d 100644
--- a/src/mbgl/renderer/debug_bucket.cpp
+++ b/src/mbgl/renderer/debug_bucket.cpp
@@ -6,10 +6,6 @@
 
 #include <cassert>
 
-#ifndef BUFFER_OFFSET
-#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
-#endif
-
 using namespace mbgl;
 
 DebugBucket::DebugBucket(DebugFontBuffer& fontBuffer_)
diff --git a/src/mbgl/renderer/fill_bucket.cpp b/src/mbgl/renderer/fill_bucket.cpp
index a98a8b7cd..0efe1b437 100644
--- a/src/mbgl/renderer/fill_bucket.cpp
+++ b/src/mbgl/renderer/fill_bucket.cpp
@@ -12,10 +12,6 @@
 
 #include <cassert>
 
-#ifndef BUFFER_OFFSET
-#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
-#endif
-
 struct geometry_too_long_exception : std::exception {};
 
 using namespace mbgl;
diff --git a/src/mbgl/renderer/line_bucket.cpp b/src/mbgl/renderer/line_bucket.cpp
index 02db89cd4..a0ad5ac3c 100644
--- a/src/mbgl/renderer/line_bucket.cpp
+++ b/src/mbgl/renderer/line_bucket.cpp
@@ -10,10 +10,6 @@
 #include <mbgl/util/math.hpp>
 #include <mbgl/platform/gl.hpp>
 
-#ifndef BUFFER_OFFSET
-#define BUFFER_OFFSET(i) ((char*)nullptr + (i))
-#endif
-
 #include <cassert>
 
 using namespace mbgl;
diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp
index 43d06b69d..4b50496a2 100644
--- a/src/mbgl/renderer/painter.cpp
+++ b/src/mbgl/renderer/painter.cpp
@@ -40,8 +40,6 @@
 
 using namespace mbgl;
 
-#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
-
 Painter::Painter() {
 }
 
diff --git a/src/mbgl/renderer/painter_clipping.cpp b/src/mbgl/renderer/painter_clipping.cpp
index c2a8e6f50..8ae51bc3e 100644
--- a/src/mbgl/renderer/painter_clipping.cpp
+++ b/src/mbgl/renderer/painter_clipping.cpp
@@ -4,10 +4,6 @@
 #include <mbgl/util/clip_id.hpp>
 #include <mbgl/gl/debugging.hpp>
 
-#ifndef BUFFER_OFFSET
-#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
-#endif
-
 using namespace mbgl;
 
 void Painter::drawClippingMasks(const std::set<Source*>& sources) {
diff --git a/src/mbgl/renderer/painter_debug.cpp b/src/mbgl/renderer/painter_debug.cpp
index 4466ad250..bd145085d 100644
--- a/src/mbgl/renderer/painter_debug.cpp
+++ b/src/mbgl/renderer/painter_debug.cpp
@@ -6,10 +6,6 @@
 #include <mbgl/util/string.hpp>
 #include <mbgl/gl/debugging.hpp>
 
-#ifndef BUFFER_OFFSET
-#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
-#endif
-
 using namespace mbgl;
 
 void Painter::renderTileDebug(const Tile& tile) {
diff --git a/src/mbgl/renderer/raster_bucket.cpp b/src/mbgl/renderer/raster_bucket.cpp
index 7ee64baaf..c8a42f46a 100644
--- a/src/mbgl/renderer/raster_bucket.cpp
+++ b/src/mbgl/renderer/raster_bucket.cpp
@@ -2,10 +2,6 @@
 #include <mbgl/shader/raster_shader.hpp>
 #include <mbgl/renderer/painter.hpp>
 
-#ifndef BUFFER_OFFSET
-#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
-#endif
-
 using namespace mbgl;
 
 RasterBucket::RasterBucket(TexturePool& texturePool, const StyleLayoutRaster& layout_)
diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp
index 8521bbbf4..526539474 100644
--- a/src/mbgl/renderer/symbol_bucket.cpp
+++ b/src/mbgl/renderer/symbol_bucket.cpp
@@ -24,10 +24,6 @@
 #include <mbgl/util/clip_lines.hpp>
 #include <mbgl/util/std.hpp>
 
-#ifndef BUFFER_OFFSET
-#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
-#endif
-
 namespace mbgl {
 
 SymbolInstance::SymbolInstance(Anchor &anchor, const std::vector<Coordinate> &line,