Skip to content

Pull out separate functions for reading files in SetupModel.cpp#426

Open
ZedThree wants to merge 3 commits into
mrc-ide:masterfrom
ZedThree:separate_file_read_functions
Open

Pull out separate functions for reading files in SetupModel.cpp#426
ZedThree wants to merge 3 commits into
mrc-ide:masterfrom
ZedThree:separate_file_read_functions

Conversation

@ZedThree

Copy link
Copy Markdown

Minimal changes besides pulling out the bits of the code for reading the data files into separate functions. Reduced scope of some local variables, added constexpr auto binary_density_file_magic_number as it's used in a couple of places.

I did also apply clang-format to the new functions using the config file in #397

@matt-gretton-dann matt-gretton-dann left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A couple of small changes (which I acknowledge include things that increase the scope but I believe are important).

A future PR should change the types in the BinFile format to be fixed type sizes.

Comment thread src/SetupModel.cpp Outdated
Comment thread src/SetupModel.cpp
Comment thread src/SetupModel.cpp Outdated
@ZedThree ZedThree force-pushed the separate_file_read_functions branch from 0a80255 to 20bfa4f Compare June 25, 2020 17:04
@ZedThree

Copy link
Copy Markdown
Author

Rebased to resolve conflicts

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants