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.

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

Jump to bottom

Compilation fixes #1502

Merged
merged 2 commits into from
Dec 3, 2019
Merged

Compilation fixes #1502

merged 2 commits into from
Dec 3, 2019

Conversation

ylavic
Copy link
Contributor

@ylavic ylavic commented Apr 28, 2019

Commits from PR #1485 that should probably be merged independendly/before.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.001%) to 99.922% when pulling fd4c007 on ylavic:compilation_fixes into 01950eb on Tencent:master.

@coveralls
Copy link

coveralls commented Apr 28, 2019 •
edited
Loading

Coverage Status

Coverage remained the same at 99.921% when pulling 92f99bc on ylavic:compilation_fixes into 01950eb on Tencent:master.

ylavic added 2 commits May 9, 2019 13:37
@ylavic
Fix compilation of sortkeys.cpp with MSVC 2013 (hopefully).
b4538b5
@ylavic
RAPIDJSON_NOEXCEPT_ASSERT() should never throw.
92f99bc 
clang warns about throwing from RAPIDJSON_NOEXCEPT_ASSERT() in a nothrow
context.

If RAPIDJSON_ASSERT() throws it can never be used for _NOEXCEPT_ASSERT(),
so use C assert() instead.

Finally (and originally), since RAPIDJSON_ASSERT() in "unittest.h" throws,
make it define RAPIDJSON_ASSERT_THROWS for RAPIDJSON_NOEXCEPT_ASSERT() to
now do the right thing.
@miloyip miloyip merged commit dfbe1db into Tencent:master Dec 3, 2019
@ylavic ylavic deleted the compilation_fixes branch March 4, 2021 00:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@ylavic @coveralls @miloyip