Gate stdext::checked_array_iterator usage on _ITERATOR_DEBUG_LEVEL (#…

…1072)
microsoft · Mar 20, 2019 · fac2ff7 · fac2ff7
1 parent 0387cb9
commit fac2ff7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Release/include/cpprest/containerstream.h b/Release/include/cpprest/containerstream.h
@@ -399,7 +399,7 @@ class basic_container_buffer : public streams::details::streambuf_state_manager<
         auto readBegin = std::begin(m_data) + m_current_position;
         auto readEnd = std::begin(m_data) + newPos;
 
-#ifdef _WIN32
+#if defined(_ITERATOR_DEBUG_LEVEL) && _ITERATOR_DEBUG_LEVEL != 0
         // Avoid warning C4996: Use checked iterators under SECURE_SCL
         std::copy(readBegin, readEnd, stdext::checked_array_iterator<_CharType*>(ptr, count));
 #else

diff --git a/Release/include/cpprest/producerconsumerstream.h b/Release/include/cpprest/producerconsumerstream.h
@@ -438,7 +438,7 @@ class basic_producer_consumer_buffer : public streams::details::streambuf_state_
             _CharType* beg = rbegin();
             _CharType* end = rbegin() + countRead;
 
-#ifdef _WIN32
+#if defined(_ITERATOR_DEBUG_LEVEL) && _ITERATOR_DEBUG_LEVEL != 0
             // Avoid warning C4996: Use checked iterators under SECURE_SCL
             std::copy(beg, end, stdext::checked_array_iterator<_CharType*>(dest, count));
 #else
@@ -461,7 +461,7 @@ class basic_producer_consumer_buffer : public streams::details::streambuf_state_
 
             const _CharType* srcEnd = src + countWritten;
 
-#ifdef _WIN32
+#if defined(_ITERATOR_DEBUG_LEVEL) && _ITERATOR_DEBUG_LEVEL != 0
             // Avoid warning C4996: Use checked iterators under SECURE_SCL
             std::copy(src, srcEnd, stdext::checked_array_iterator<_CharType*>(wbegin(), static_cast<size_t>(avail)));
 #else

diff --git a/Release/include/cpprest/rawptrstream.h b/Release/include/cpprest/rawptrstream.h
@@ -439,7 +439,7 @@ class basic_rawptr_buffer : public streams::details::streambuf_state_manager<_Ch
         auto readBegin = m_data + m_current_position;
         auto readEnd = m_data + newPos;
 
-#ifdef _WIN32
+#if defined(_ITERATOR_DEBUG_LEVEL) && _ITERATOR_DEBUG_LEVEL != 0
         // Avoid warning C4996: Use checked iterators under SECURE_SCL
         std::copy(readBegin, readEnd, stdext::checked_array_iterator<_CharType*>(ptr, count));
 #else
@@ -466,7 +466,7 @@ class basic_rawptr_buffer : public streams::details::streambuf_state_manager<_Ch
         if (newSize > m_size) throw std::runtime_error("Writing past the end of the buffer");
 
             // Copy the data
-#ifdef _WIN32
+#if defined(_ITERATOR_DEBUG_LEVEL) && _ITERATOR_DEBUG_LEVEL != 0
         // Avoid warning C4996: Use checked iterators under SECURE_SCL
         std::copy(ptr, ptr + count, stdext::checked_array_iterator<_CharType*>(m_data, m_size, m_current_position));
 #else