Skip to content

Use std containers and std::make_unique/shared#2764

Merged
jdtournier merged 4 commits intodevfrom
usestdtypes
Jan 16, 2024
Merged

Use std containers and std::make_unique/shared#2764
jdtournier merged 4 commits intodevfrom
usestdtypes

Conversation

@daljit46
Copy link
Member

@daljit46 daljit46 commented Nov 30, 2023

This PR supersedes #2650 and #2651. It replaces the use of custom MR::vector and MR::deque with std::vector and std::deque. It also replaces MR::make_shared and MR::make_unique with std::make_shared and std::make_unique.

@daljit46 daljit46 self-assigned this Nov 30, 2023
@daljit46 daljit46 force-pushed the usestdtypes branch 3 times, most recently from 767c352 to b28af8f Compare November 30, 2023 12:48
@daljit46
Copy link
Member Author

daljit46 commented Jan 16, 2024 •
edited
Loading

Additionally to changes outlined above, this branch now also contains ca36d7b which was necessary for the CI tests to pass with GCC 13.2. The compiler issued a warning (likely a false positive) on using std::vector causing a potential Wstringop-overflow. I replaced this with a std::array<bool, 3> as that's the most appropriate type to use there regardless.

@jdtournier jdtournier merged commit 651aed0 into dev Jan 16, 2024
@jdtournier jdtournier deleted the usestdtypes branch January 16, 2024 15:46
Lestropie added a commit that referenced this pull request Jan 23, 2024
@Lestropie
Merge remote-tracking branch 'origin/dev' into mrmath_memleak_fix
e467385 
Conflicts:
	core/misc/voxel2vector.h

Resolves #2781 with #2764.
Lestropie added a commit that referenced this pull request Jan 23, 2024
@Lestropie
mrmath: Fix conflict resolution
b1767b7 
Merge commit e467385 failed to address fact that modifications made in dae868c utilised MR::vector whereas 7d81f13 merged in #2764 reverts to use of std::vector.
Lestropie added a commit that referenced this pull request Jan 23, 2024
@Lestropie
Merge remote-tracking branch 'origin/dev' into tckgen_tensorprob_fix
fe7505f 
Conflicts:
	src/dwi/bootstrap.h

Resolves #2779 with #2764.
@Lestropie Lestropie mentioned this pull request Jan 23, 2024
Merged
@Lestropie Lestropie mentioned this pull request Feb 20, 2024
Closed
Lestropie added a commit that referenced this pull request Feb 21, 2024
@Lestropie
Fix mrview compilation through conflict resolution
72e03bb 
- Remove code within cmd/mrview.cpp that originates from 6417a52 as part of #2689, which was erroneously added in 39240ad.
- Fix compilation of src/gui/mrview/file_open.cpp to coincide with changes in #2764; these were omitted from cherry-picks 39240ad and 0afe37b due to that file having already been removed during the course of #2689.
Lestropie added a commit that referenced this pull request Feb 21, 2024
@Lestropie
core/misc/voxel2vector.h: Fix compilation
4a51096 
Resolves changes made to fix unfreed memory in mrmath in #2784 against removal of MR::vector in #2764.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@daljit46 daljit46

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@daljit46 @jdtournier @MRtrixBot