From 75f31dabe99e9df5b5c450de0fd72f03406b6f77 Mon Sep 17 00:00:00 2001
From: Neil MacIntosh <neilmac@microsoft.com>
Date: Thu, 27 Aug 2015 22:15:44 -0700
Subject: [PATCH] Removed Debug build warnings from MSVC STL.

---
 include/array_view.h | 4 ++--
 tests/CMakeLists.txt | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/array_view.h b/include/array_view.h
index 483485f..bce3691 100644
--- a/include/array_view.h
+++ b/include/array_view.h
@@ -1422,8 +1422,8 @@ public:
 	template <typename OtherValueType, typename OtherBoundsType, typename Dummy = std::enable_if_t<std::is_same<std::remove_cv_t<value_type>, std::remove_cv_t<OtherValueType>>::value>>
 	_CONSTEXPR bool operator== (const basic_array_view<OtherValueType, OtherBoundsType> & other) const _NOEXCEPT
 	{
-		return m_bounds.size() == other.m_bounds.size() &&
-            (m_pdata == other.m_pdata || std::equal(this->begin(), this->end(), other.begin(), other.end()));
+        return m_bounds.size() == other.m_bounds.size() &&
+            (m_pdata == other.m_pdata || std::equal(this->begin(), this->end(), other.begin()));
 	}
 
     template <typename OtherValueType, typename OtherBoundsType, typename Dummy = std::enable_if_t<std::is_same<std::remove_cv_t<value_type>, std::remove_cv_t<OtherValueType>>::value>>
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4e057c2..dee4e28 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -11,8 +11,9 @@ include_directories(
 
 add_definitions(-DSAFER_CPP_TESTING)
 
-if(MSVC14 OR MSVC12)
-    # has the support we need
+if(MSVC14 OR MSVC12) # has the support we need
+    # remove unnecessary warnings about unchecked iterators
+    add_definitions(-D_SCL_SECURE_NO_WARNINGS)
 else()
     include(CheckCXXCompilerFlag)
     CHECK_CXX_COMPILER_FLAG("-std=c++14" COMPILER_SUPPORTS_CXX14)