mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: remove membufferpp

Browse source 
This the C++ version of membuffer. Since everything is C++, it can
just be made the default.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-05 06:47:28 +02:00 • committed by bstoeger
parent db4b972897
commit ead58cd039
13 changed files with 40 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/git-access.cpp
View file

@ -346,7 +346,7 @@ static int try_to_git_merge(struct git_info *info, git_reference **local_p, git_
git_commit *local_commit, *remote_commit, *base_commit;
git_index *merged_index;
git_merge_options merge_options;
struct membufferpp msg;
membuffer msg;
if (verbose) {
char outlocal[41], outremote[41];