-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Fix cpprest checked iterator build error #6301
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.
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
Open
Trenly
wants to merge
2
commits into
microsoft:master
Choose a base branch
from
Trenly:CppRestSDKFix
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+61
−0
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
src/VcpkgPortOverlay/patches/cpprestsdk/fix-msvc-checked-array-iterator.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| diff --git a/Release/include/cpprest/containerstream.h b/Release/include/cpprest/containerstream.h | ||
| index b3028e84b..f59fcb65d 100644 | ||
| --- a/Release/include/cpprest/containerstream.h | ||
| +++ b/Release/include/cpprest/containerstream.h | ||
| @@ -401,7 +401,7 @@ class basic_container_buffer : public basic_streambuf<_CharType> | ||
|
|
||
| #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)); | ||
| + std::copy(readBegin, readEnd, ptr); | ||
| #else | ||
| std::copy(readBegin, readEnd, ptr); | ||
| #endif // _WIN32 | ||
| diff --git a/Release/include/cpprest/producerconsumerstream.h b/Release/include/cpprest/producerconsumerstream.h | ||
| index c733651af..95fceea9a 100644 | ||
| --- a/Release/include/cpprest/producerconsumerstream.h | ||
| +++ b/Release/include/cpprest/producerconsumerstream.h | ||
| @@ -441,7 +441,7 @@ class basic_producer_consumer_buffer : public basic_streambuf<_CharType> | ||
|
|
||
| #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)); | ||
| + std::copy(beg, end, dest); | ||
| #else | ||
| std::copy(beg, end, dest); | ||
| #endif // _WIN32 | ||
| @@ -464,7 +464,7 @@ class basic_producer_consumer_buffer : public basic_streambuf<_CharType> | ||
|
|
||
| #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))); | ||
| + std::copy(src, srcEnd, wbegin()); | ||
| #else | ||
| std::copy(src, srcEnd, wbegin()); | ||
| #endif // _WIN32 | ||
| diff --git a/Release/include/cpprest/rawptrstream.h b/Release/include/cpprest/rawptrstream.h | ||
| index 14c0fd538..6af8fd17e 100644 | ||
| --- a/Release/include/cpprest/rawptrstream.h | ||
| +++ b/Release/include/cpprest/rawptrstream.h | ||
| @@ -441,7 +441,7 @@ class basic_rawptr_buffer : public basic_streambuf<_CharType> | ||
|
|
||
| #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)); | ||
| + std::copy(readBegin, readEnd, ptr); | ||
| #else | ||
| std::copy(readBegin, readEnd, ptr); | ||
| #endif // _WIN32 | ||
| @@ -468,7 +468,7 @@ class basic_rawptr_buffer : public basic_streambuf<_CharType> | ||
| // Copy the data | ||
| #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)); | ||
| + std::copy(ptr, ptr + count, m_data + m_current_position); | ||
| #else | ||
| std::copy(ptr, ptr + count, m_data + m_current_position); | ||
| #endif // _WIN32 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like there is already a fix in the official port: microsoft/vcpkg#51750
Instead of applying our own patch, we could just update the version we use.
While looking this up, I learned that cpprestsdk is now delisted from vcpkg (microsoft/vcpkg#52130) because the repo was archived. So maybe we'll have to figure out something else to use at some point.