diff options
author | Lenny Maiorani <lenny@colorado.edu> | 2021-01-10 16:29:28 -0700 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-01-12 09:11:45 +0100 |
commit | e6f907a1556757c623fe660df0a43faf1b3d0eae (patch) | |
tree | a3a07081ec2ebdac050d776c61d2c908459bf343 /Kernel/Storage/StorageManagement.cpp | |
parent | 9dc44bf8c427160bafd87205c42201cf9b11c0b4 (diff) | |
download | serenity-e6f907a1556757c623fe660df0a43faf1b3d0eae.zip |
AK: Simplify constructors and conversions from nullptr_t
Problem:
- Many constructors are defined as `{}` rather than using the ` =
default` compiler-provided constructor.
- Some types provide an implicit conversion operator from `nullptr_t`
instead of requiring the caller to default construct. This violates
the C++ Core Guidelines suggestion to declare single-argument
constructors explicit
(https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#c46-by-default-declare-single-argument-constructors-explicit).
Solution:
- Change default constructors to use the compiler-provided default
constructor.
- Remove implicit conversion operators from `nullptr_t` and change
usage to enforce type consistency without conversion.
Diffstat (limited to 'Kernel/Storage/StorageManagement.cpp')
-rw-r--r-- | Kernel/Storage/StorageManagement.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Kernel/Storage/StorageManagement.cpp b/Kernel/Storage/StorageManagement.cpp index 539bd2e311..0718278ab0 100644 --- a/Kernel/Storage/StorageManagement.cpp +++ b/Kernel/Storage/StorageManagement.cpp @@ -90,16 +90,16 @@ OwnPtr<PartitionTable> StorageManagement::try_to_initialize_partition_table(cons if (mbr_table_or_result.error() == PartitionTable::Error::MBRProtective) { auto gpt_table_or_result = GUIDPartitionTable::try_to_initialize(device); if (gpt_table_or_result.is_error()) - return nullptr; + return {}; return move(gpt_table_or_result.value()); } if (mbr_table_or_result.error() == PartitionTable::Error::ConatinsEBR) { auto ebr_table_or_result = EBRPartitionTable::try_to_initialize(device); if (ebr_table_or_result.is_error()) - return nullptr; + return {}; return move(ebr_table_or_result.value()); } - return nullptr; + return {}; } NonnullRefPtrVector<DiskPartition> StorageManagement::enumerate_disk_partitions() const |