From 7b3edb61098586eab9a8cfed10d7d59d9693c434 Mon Sep 17 00:00:00 2001
From: Molly Lloyd <molly@mapbox.com>
Date: Mon, 27 Aug 2018 15:52:28 -0700
Subject: [core] remove redundant Uniform::Type alias

---
 src/mbgl/gl/uniform.hpp                     | 7 ++-----
 src/mbgl/renderer/paint_property_binder.hpp | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/mbgl')

diff --git a/src/mbgl/gl/uniform.hpp b/src/mbgl/gl/uniform.hpp
index f8eaf369a2..d055ecfd1d 100644
--- a/src/mbgl/gl/uniform.hpp
+++ b/src/mbgl/gl/uniform.hpp
@@ -35,16 +35,13 @@ ActiveUniforms activeUniforms(ProgramID);
 template <class Tag, class T>
 class Uniform {
 public:
-    // TODO should maybe remove this altogether bc it is now redundant?
     using Value = T;
 
-    using Type = T;
-
     class State {
     public:
         State(UniformLocation location_) : location(std::move(location_)) {}
 
-        void operator=(const Type& value) {
+        void operator=(const Value& value) {
             if (location >= 0 && (!current || *current != value)) {
                 current = value;
                 bindUniform(location, value);
@@ -93,7 +90,7 @@ public:
             { // Some shader programs have uniforms declared, but not used, so they're not active.
               // Therefore, we'll only verify them when they are indeed active.
               (active.find(Us::name()) != active.end()
-                   ? verifyUniform<typename Us::Type>(active.at(Us::name()))
+                   ? verifyUniform<typename Us::Value>(active.at(Us::name()))
                    : false)... });
 #endif
 
diff --git a/src/mbgl/renderer/paint_property_binder.hpp b/src/mbgl/renderer/paint_property_binder.hpp
index dd204743b3..391ecbb174 100644
--- a/src/mbgl/renderer/paint_property_binder.hpp
+++ b/src/mbgl/renderer/paint_property_binder.hpp
@@ -434,7 +434,7 @@ private:
     };
 
     template <class P>
-    using Property = Detail<typename P::Type, typename P::Uniform::Type, typename P::PossiblyEvaluatedType, typename P::Attributes>;
+    using Property = Detail<typename P::Type, typename P::Uniform::Value, typename P::PossiblyEvaluatedType, typename P::Attributes>;
 
 public:
     template <class P>
-- 
cgit v1.2.1