Skip to content

Commit fac2ff7

Browse files
bryan-lipinskiBillyONeal
authored andcommitted
Gate stdext::checked_array_iterator usage on _ITERATOR_DEBUG_LEVEL (#1072)
1 parent 0387cb9 commit fac2ff7

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Release/include/cpprest/containerstream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ class basic_container_buffer : public streams::details::streambuf_state_manager<
399399
auto readBegin = std::begin(m_data) + m_current_position;
400400
auto readEnd = std::begin(m_data) + newPos;
401401

402-
#ifdef _WIN32
402+
#if defined(_ITERATOR_DEBUG_LEVEL) && _ITERATOR_DEBUG_LEVEL != 0
403403
// Avoid warning C4996: Use checked iterators under SECURE_SCL
404404
std::copy(readBegin, readEnd, stdext::checked_array_iterator<_CharType*>(ptr, count));
405405
#else

Release/include/cpprest/producerconsumerstream.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ class basic_producer_consumer_buffer : public streams::details::streambuf_state_
438438
_CharType* beg = rbegin();
439439
_CharType* end = rbegin() + countRead;
440440

441-
#ifdef _WIN32
441+
#if defined(_ITERATOR_DEBUG_LEVEL) && _ITERATOR_DEBUG_LEVEL != 0
442442
// Avoid warning C4996: Use checked iterators under SECURE_SCL
443443
std::copy(beg, end, stdext::checked_array_iterator<_CharType*>(dest, count));
444444
#else
@@ -461,7 +461,7 @@ class basic_producer_consumer_buffer : public streams::details::streambuf_state_
461461

462462
const _CharType* srcEnd = src + countWritten;
463463

464-
#ifdef _WIN32
464+
#if defined(_ITERATOR_DEBUG_LEVEL) && _ITERATOR_DEBUG_LEVEL != 0
465465
// Avoid warning C4996: Use checked iterators under SECURE_SCL
466466
std::copy(src, srcEnd, stdext::checked_array_iterator<_CharType*>(wbegin(), static_cast<size_t>(avail)));
467467
#else

Release/include/cpprest/rawptrstream.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ class basic_rawptr_buffer : public streams::details::streambuf_state_manager<_Ch
439439
auto readBegin = m_data + m_current_position;
440440
auto readEnd = m_data + newPos;
441441

442-
#ifdef _WIN32
442+
#if defined(_ITERATOR_DEBUG_LEVEL) && _ITERATOR_DEBUG_LEVEL != 0
443443
// Avoid warning C4996: Use checked iterators under SECURE_SCL
444444
std::copy(readBegin, readEnd, stdext::checked_array_iterator<_CharType*>(ptr, count));
445445
#else
@@ -466,7 +466,7 @@ class basic_rawptr_buffer : public streams::details::streambuf_state_manager<_Ch
466466
if (newSize > m_size) throw std::runtime_error("Writing past the end of the buffer");
467467

468468
// Copy the data
469-
#ifdef _WIN32
469+
#if defined(_ITERATOR_DEBUG_LEVEL) && _ITERATOR_DEBUG_LEVEL != 0
470470
// Avoid warning C4996: Use checked iterators under SECURE_SCL
471471
std::copy(ptr, ptr + count, stdext::checked_array_iterator<_CharType*>(m_data, m_size, m_current_position));
472472
#else

0 commit comments

Comments
 (0)