Skip to content

Cleanups: Very minor logic changes #3531

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
Stephan T. Lavavej (StephanTLavavej) merged 3 commits into from
Mar 7, 2023
Merged

Cleanups: Very minor logic changes #3531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fc78b5
Drop `break;` after `return true;` in ppltasks.cpp.
StephanTLavavej Feb 27, 2023
ccb2564
In gcd(), fuse break followed by return.
StephanTLavavej Mar 2, 2023
418e12a
fiopen.cpp: Change `ios_base::openmode atendflag` to `const bool at_e…
StephanTLavavej Mar 2, 2023
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
3 changes: 1 addition & 2 deletions stl/inc/numeric
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,12 +623,11 @@ _NODISCARD constexpr common_type_t<_Mt, _Nt> gcd(const _Mt _Mx, const _Nt _Nx) n

_Nx_magnitude -= _Mx_magnitude;
if (_Nx_magnitude == 0U) {
break;
return static_cast<_Common>(_Mx_magnitude << _Common_factors_of_2);
}

_Nx_trailing_zeroes = static_cast<unsigned long>(_Countr_zero_impl(_Nx_magnitude));
}
return static_cast<_Common>(_Mx_magnitude << _Common_factors_of_2);
});
}

Expand Down
6 changes: 3 additions & 3 deletions stl/src/fiopen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ namespace {
ios_base::out | ios_base::in | ios_base::trunc | ios_base::binary | ios_base::_Noreplace,
};

FILE* fp = nullptr;
ios_base::openmode atendflag = mode & ios_base::ate;
FILE* fp = nullptr;
const bool at_end = (mode & ios_base::ate) != 0;

if (mode & ios_base::_Nocreate) {
mode |= ios_base::in; // file must exist
Expand All @@ -75,7 +75,7 @@ namespace {
return nullptr; // open failed
}

if (atendflag && fseek(fp, 0, SEEK_END) != 0) {
if (at_end && fseek(fp, 0, SEEK_END) != 0) {
fclose(fp); // can't position at end
return nullptr;
}
Expand Down
2 changes: 0 additions & 2 deletions stl/src/ppltasks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,6 @@ namespace Concurrency {
case APTTYPE_STA:
case APTTYPE_MAINSTA:
return true;
break;
case APTTYPE_NA:
switch (_AptTypeQualifier) {
// A thread executing in a neutral apartment is either STA or MTA. To find out if this thread is
Expand All @@ -316,7 +315,6 @@ namespace Concurrency {
case APTTYPEQUALIFIER_NA_ON_STA:
case APTTYPEQUALIFIER_NA_ON_MAINSTA:
return true;
break;
}
break;
}
Expand Down