Sync with hdt-cpp fixes + cleanup #12
Closed
Conversation
This file contains 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
|
BTW, the comment with kamahen@0b584c2 has "ack" instead of "pack" ... I didn't fix it with rebase -i because any time I use rebase, it seems to cause bogus merge conflicts. |
|
Awaiting merge of https://github.com/JanWielemaker/hdt-cpp/tree/develop-buffer2 into https://github.com/JanWielemaker/hdt-cpp/tree/develop, plus a commit to sync. (#12 (comment) has been edited) |
|
Merged. This removes all warnings from the interface. Thanks. |
|
My apologies for mistakenly doing a "git commit -a", which picked up the
(wrong?) submodule hash. (I wish that github had a way of showing the merge
conflicts -- that would have made me realize my mistake and I could have
redone the PR)
…On Fri, 12 Jul 2024 at 07:55, Jan Wielemaker ***@***.***> wrote:
Merged. This removes all warnings from the interface. Thanks.
—
Reply to this email directly, view it on GitHub
<#12 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AIIGNNK2KYU3O4XSOY7SYLTZL7U5PAVCNFSM6AAAAABKCMJXDWVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDEMRVG43DOOBQGE>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I seem to have messed things up with hdt-cpp, by doing a rebase that removed one commit -- this has created a number of merge conflicts. The changes are in JanWielemaker/hdt-cpp, branch "develop-buffer", which should be merged into branch "develop".
This is the same as rdfhdt/hdt-cpp#275 , but that repo appears to not being maintained any more.
After hdt-cpp is fixed, this PR can be merged.
EDIT: rdfhdt/hdt-cpp#275 has been replaced by rdfhdt/hdt-cpp#283 ... once the latter has been merged into https://github.com/JanWielemaker/hdt-cpp/tree/develop, there remains one more commit to be done to this repo to sync to this fork of hdt-cpp.