From 3a2cda71b9230d8eec834edcedfab0da3f67fc0e Mon Sep 17 00:00:00 2001
From: Richard Powell <rmpowell77@me.com>
Date: Wed, 25 Nov 2015 10:11:41 -0800
Subject: [PATCH] Better fix.  Avoiding underscores.

---
 include/span.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/span.h b/include/span.h
index f694df5..22b6796 100644
--- a/include/span.h
+++ b/include/span.h
@@ -507,7 +507,7 @@ namespace details
     struct TypeListIndexer
     {
         const TypeChain & obj;
-        TypeListIndexer(const TypeChain & obj_) :obj(obj_){}
+        TypeListIndexer(const TypeChain & object) :obj(object){}
         template<size_t N>
         const TypeChain & getObj(std::true_type)
         {
@@ -814,8 +814,8 @@ public:
     using index_type = value_type;
     using index_size_type = typename IndexType::value_type;
     template <typename Bounds>
-    explicit bounds_iterator(const Bounds& bnd, value_type curr_) noexcept
-        : boundary(bnd.index_bounds()), curr(std::move(curr_))
+    explicit bounds_iterator(const Bounds& bnd, value_type current) noexcept
+        : boundary(bnd.index_bounds()), curr(std::move(current))
     {
         static_assert(is_bounds<Bounds>::value, "Bounds type must be provided");
     }