Skip to content
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

fix compilation on cygwin #2540

Merged
merged 1 commit into from Oct 4, 2022
Merged

fix compilation on cygwin #2540

merged 1 commit into from Oct 4, 2022

Conversation

rkaminsk
Copy link
Contributor

@rkaminsk rkaminsk commented Oct 3, 2022

Description

Use std::char_traits::find instead of strnlen for better portability.

GitHub Issues

extras/catch_amalgamated.cpp Outdated Show resolved Hide resolved
extras/catch_amalgamated.hpp Outdated Show resolved Hide resolved
src/catch2/catch_tostring.hpp Outdated Show resolved Hide resolved
src/catch2/catch_tostring.hpp Outdated Show resolved Hide resolved
src/catch2/catch_tostring.hpp Outdated Show resolved Hide resolved
Use std::char_traits<char>::find instead of strnlen for better
portability.
@codecov
Copy link

codecov bot commented Oct 3, 2022

Codecov Report

Merging #2540 (0b06a05) into devel (6a9bf2e) will increase coverage by 0.02%.
The diff coverage is 100.00%.

❗ Current head 0b06a05 differs from pull request most recent head f5d8a46. Consider uploading reports for the commit f5d8a46 to get more accurate results

@@            Coverage Diff             @@
##            devel    #2540      +/-   ##
==========================================
+ Coverage   91.56%   91.58%   +0.02%     
==========================================
  Files         183      183              
  Lines        7558     7564       +6     
==========================================
+ Hits         6920     6927       +7     
+ Misses        638      637       -1     

@rkaminsk
Copy link
Contributor Author

rkaminsk commented Oct 3, 2022

The build errors on mac don't look like they have anything to do with this PR. Looks more like a gcc problem on MacOS.

@horenmar
Copy link
Member

horenmar commented Oct 4, 2022

Yep, the Mac issue seems to be a known issue with new toolchain, and I guess the MacOS image got recently updated.

@horenmar horenmar merged commit 97313f9 into catchorg:devel Oct 4, 2022
@rkaminsk rkaminsk deleted the fix/strnlen-cygwin branch October 4, 2022 09:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build Error on Cygwin strnlen and Cygwin compatability - catch_tostring.hpp
3 participants