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

Fixed mismatched framework directives for vectorized memory move #635

Merged
merged 4 commits into from Aug 12, 2021

Conversation

modio-jackson
Copy link
Contributor

I certify that I own, and have sufficient rights to contribute, all source code and related material intended to be compiled or integrated with the source code for the SharpZipLib open source product (the "Contribution"). My Contribution is licensed under the MIT License.

@codecov
Copy link

codecov bot commented May 13, 2021

Codecov Report

Merging #635 (d1bfdba) into master (8c0a169) will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #635      +/-   ##
==========================================
- Coverage   73.30%   73.28%   -0.02%     
==========================================
  Files          68       68              
  Lines        8309     8304       -5     
==========================================
- Hits         6091     6086       -5     
  Misses       2218     2218              
Impacted Files Coverage Δ
.../ICSharpCode.SharpZipLib/BZip2/BZip2InputStream.cs 74.39% <ø> (-0.31%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8c0a169...d1bfdba. Read the comment docs.

@piksel
Copy link
Member

piksel commented May 13, 2021

This came up code review, #611 (comment)
Do you disagree?

Also @konrad-kruczynski, your reply to my comment about the later directive being exclusive doesn't answer why the top one is inclusive. I forgot to follow up on that. Care to clarify?

Co-authored-by: nils måsén <nils@piksel.se>
@modio-jackson
Copy link
Contributor Author

Unity's build engine defines NET_STANDARD_2_0 rather than NETSTANDARD2_0 which causes the library to fail to compile. (https://docs.unity3d.com/Manual/PlatformDependentCompilation.html)
!NETSTANDARD2_0 && !NETFRAMEWORK resolves to true, and contains code requiring the definition of VectorSize.
NETSTANDARD2_1 resolves to false, causing VectorSize to remain undefined.

@modio-jackson
Copy link
Contributor Author

Unity's build engine defines NET_STANDARD_2_0 rather than NETSTANDARD2_0 which causes the library to fail to compile. (https://docs.unity3d.com/Manual/PlatformDependentCompilation.html)
!NETSTANDARD2_0 && !NETFRAMEWORK resolves to true, and contains code requiring the definition of VectorSize.
NETSTANDARD2_1 resolves to false, causing VectorSize to remain undefined.

@konrad-kruczynski
Copy link
Contributor

Frankly speaking I didn't know that _OR_GREATER were available. In that case I agree that this is much better. Moreover, this will also work for .NET 5.

@piksel piksel added this to the v1.4 milestone Jun 8, 2021
@piksel piksel merged commit cd5310f into icsharpcode:master Aug 12, 2021
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.

None yet

3 participants