Skip to content

Please consider the following formatting changes to #12723 #268

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

Open
alibuild wants to merge 1 commit into
base: pr12723
Choose a base branch
from
Open

Please consider the following formatting changes to #12723 #268

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions DataFormats/Headers/include/Headers/DataHeader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,9 +372,9 @@ struct BaseHeader {
union {
uint32_t flags;
struct {
uint32_t flagsNextHeader : 1, // do we have a next header after this one?
flagsReserved : 15, // reserved for future use
flagsDerivedHeader : 16; // reserved for usage by the derived header
uint32_t flagsNextHeader : 1, // do we have a next header after this one?
flagsReserved : 15, // reserved for future use
flagsDerivedHeader : 16; // reserved for usage by the derived header
};
};

Expand Down
4 changes: 2 additions & 2 deletions Framework/Core/include/Framework/DeviceContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ struct DeviceContext {
int expectedRegionCallbacks = 0;
// The timeout for the data processing to stop on this device.
// After this is reached, incoming data not marked to be kept will
// be dropped and the data processing will be stopped. However the
// be dropped and the data processing will be stopped. However the
// calibrations will still be done and objects resulting from calibrations
// will be marked to be kept.
int dataProcessingTimeout = 0;
// The timeout for the whole processing to stop on this device.
// This includes the grace period for processing and the time
// This includes the grace period for processing and the time
// for the calibrations to be done.
int exitTransitionTimeout = 0;
};
Expand Down