Skip to content

Pass the master struct in MasterMerge #520

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

Merged
tueda merged 1 commit into from
May 20, 2024
Merged

Pass the master struct in MasterMerge #520

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions sources/threads.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3736,10 +3736,7 @@ int MasterMerge(VOID)
*/
while ( i >>= 1 ) {
if ( S->tree[i] > 0 ) {
/*
In the old setup we had here B0 for the first argument
*/
if ( ( c = CompareTerms(BHEAD poin[S->tree[i]],poin[k],(WORD)0) ) > 0 ) {
if ( ( c = CompareTerms(B0, poin[S->tree[i]],poin[k],(WORD)0) ) > 0 ) {
/*
S->tree[i] is the smaller. Exchange and go on.
*/
Expand Down Expand Up @@ -3818,7 +3815,7 @@ int MasterMerge(VOID)
WORD *term1, *term2;
term1 = poin[S->tree[i]];
term2 = poin[k];
if ( MergeWithFloat(BHEAD &term1,&term2) == 0 )
if ( MergeWithFloat(B0, &term1,&term2) == 0 )
goto cancelled;
poin[S->tree[i]] = term1;
}
Expand Down