Skip to content

Gate stdext::checked_array_iterator usage on _ITERATOR_DEBUG_LEVEL #1072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 2 commits into from
Mar 20, 2019
Merged

Gate stdext::checked_array_iterator usage on _ITERATOR_DEBUG_LEVEL #1072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdcd79a
Gate stdext::checked_array_iterator usage on _ITERATOR_DEBUG_LEVEL
bryan-lipinski Mar 19, 2019
bb423e2
PR Feedback
bryan-lipinski Mar 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Release/include/cpprest/containerstream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Release/include/cpprest/producerconsumerstream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Release/include/cpprest/rawptrstream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down