JSON support base 3.15, and fix string comparison#50
Merged
ralphlange merged 6 commits intoepics-modules:masterfrom Dec 11, 2025
Merged
JSON support base 3.15, and fix string comparison#50ralphlange merged 6 commits intoepics-modules:masterfrom
ralphlange merged 6 commits intoepics-modules:masterfrom
Conversation
This reverts commit 477634c.
As of caPutLog R4.1, Base 3.14 is not supported (because caPutLog's use of epicsAtomic)
Support yajl_gen circa 3.15 remove vestiges of 3.14 support
mdavidsaver
added
bug
Contributor
|
This LGTM, but why is this supersedind the existing MRs instead of merging those in? |
Contributor
Author
I picked some commits from Ralph's PRs, but the ordering is different. |
Member
|
@simon-ess: Can I merge? |
Contributor
|
Go for it. |
This was referenced Dec 11, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Supersedes #45 and #48.
caPutLogApp/CONFIG_CAPUTLOG(from Use epicsTypes.h for conditions related to Base version #48)