From 214f99673f6f7480f9cc3bf9d6fa32ef8dd2ede5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Wed, 22 Oct 2014 18:06:11 +0200
Subject: fix variable shadowing

---
 src/shader/shader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/shader')

diff --git a/src/shader/shader.cpp b/src/shader/shader.cpp
index 91c9b58c89..d9f63cae12 100644
--- a/src/shader/shader.cpp
+++ b/src/shader/shader.cpp
@@ -8,8 +8,8 @@
 
 using namespace mbgl;
 
-Shader::Shader(const char *name, const GLchar *vertSource, const GLchar *fragSource)
-    : name(name),
+Shader::Shader(const char *name_, const GLchar *vertSource, const GLchar *fragSource)
+    : name(name_),
       valid(false),
       program(0) {
     util::timer timer("shader compilation", Event::Shader);
-- 
cgit v1.2.1