From ca4cdd80deabb7145969dcbca67e44ea00b2bd27 Mon Sep 17 00:00:00 2001
From: Neil MacIntosh <neilmac@microsoft.com>
Date: Wed, 20 Jul 2016 12:47:21 -0700
Subject: [PATCH] 64-bit clean fixes.

---
 tests/span_tests.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/span_tests.cpp b/tests/span_tests.cpp
index 7652ff9..77b799a 100644
--- a/tests/span_tests.cpp
+++ b/tests/span_tests.cpp
@@ -131,23 +131,23 @@ SUITE(span_tests)
     TEST(from_nullptr_length_constructor)
     {
         {
-            span<int> s{nullptr, 0};
+            span<int> s{nullptr, static_cast<span<int>::index_type>(0)};
             CHECK(s.length() == 0 && s.data() == nullptr);
 
-            span<const int> cs{nullptr, 0};
+            span<const int> cs{nullptr, static_cast<span<int>::index_type>(0)};
             CHECK(cs.length() == 0 && cs.data() == nullptr);
         }
 
         {
-            span<int, 0> s{nullptr, 0};
+            span<int, 0> s{nullptr, static_cast<span<int>::index_type>(0)};
             CHECK(s.length() == 0 && s.data() == nullptr);
 
-            span<const int, 0> cs{nullptr, 0};
+            span<const int, 0> cs{nullptr, static_cast<span<int>::index_type>(0)};
             CHECK(cs.length() == 0 && cs.data() == nullptr);
         }
 
         {
-            auto workaround_macro = []() { span<int, 1> s{ nullptr, 0 }; };
+            auto workaround_macro = []() { span<int, 1> s{ nullptr, static_cast<span<int>::index_type>(0) }; };
             CHECK_THROW(workaround_macro(), fail_fast); 
         }
 
@@ -168,10 +168,10 @@ SUITE(span_tests)
         }
 
         {
-            span<int*> s{nullptr, 0};
+            span<int*> s{nullptr, static_cast<span<int>::index_type>(0)};
             CHECK(s.length() == 0 && s.data() == nullptr);
 
-            span<const int*> cs{nullptr, 0};
+            span<const int*> cs{nullptr, static_cast<span<int>::index_type>(0)};
             CHECK(cs.length() == 0 && cs.data() == nullptr);
         }
     }
@@ -194,7 +194,7 @@ SUITE(span_tests)
 
         {
             int* p = nullptr;
-            span<int> s{p, 0};
+            span<int> s{p, static_cast<span<int>::index_type>(0)};
             CHECK(s.length() == 0 && s.data() == nullptr);
         }