diff options
author | Andreas Kling <kling@serenityos.org> | 2023-03-06 17:16:25 +0100 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2023-03-06 23:46:35 +0100 |
commit | 359d6e7b0b0ef7add9eb2015d0dd664a82cf73d7 (patch) | |
tree | be51963e0f0dc7e1eeeb670188c8fe1fa5eea37f /Userland/DevTools/UserspaceEmulator | |
parent | 689ca370d4eca80eb5c3856a69c3eed4ed848a29 (diff) | |
download | serenity-359d6e7b0b0ef7add9eb2015d0dd664a82cf73d7.zip |
Everywhere: Stop using NonnullOwnPtrVector
Same as NonnullRefPtrVector: weird semantics, questionable benefits.
Diffstat (limited to 'Userland/DevTools/UserspaceEmulator')
-rw-r--r-- | Userland/DevTools/UserspaceEmulator/Emulator.h | 6 | ||||
-rw-r--r-- | Userland/DevTools/UserspaceEmulator/SoftMMU.h | 2 | ||||
-rw-r--r-- | Userland/DevTools/UserspaceEmulator/main.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Userland/DevTools/UserspaceEmulator/Emulator.h b/Userland/DevTools/UserspaceEmulator/Emulator.h index 6a911466db..307015578f 100644 --- a/Userland/DevTools/UserspaceEmulator/Emulator.h +++ b/Userland/DevTools/UserspaceEmulator/Emulator.h @@ -32,7 +32,7 @@ public: Emulator(DeprecatedString const& executable_path, Vector<StringView> const& arguments, Vector<DeprecatedString> const& environment); - void set_profiling_details(bool should_dump_profile, size_t instruction_interval, Stream* profile_stream, NonnullOwnPtrVector<DeprecatedString>* profiler_strings, Vector<int>* profiler_string_id_map) + void set_profiling_details(bool should_dump_profile, size_t instruction_interval, Stream* profile_stream, Vector<NonnullOwnPtr<DeprecatedString>>* profiler_strings, Vector<int>* profiler_string_id_map) { m_is_profiling = should_dump_profile; m_profile_instruction_interval = instruction_interval; @@ -47,7 +47,7 @@ public: } Stream& profile_stream() { return *m_profile_stream; } - NonnullOwnPtrVector<DeprecatedString>& profiler_strings() { return *m_profiler_strings; } + Vector<NonnullOwnPtr<DeprecatedString>>& profiler_strings() { return *m_profiler_strings; } Vector<int>& profiler_string_id_map() { return *m_profiler_string_id_map; } bool is_profiling() const { return m_is_profiling; } @@ -296,7 +296,7 @@ private: Stream* m_profile_stream { nullptr }; Vector<int>* m_profiler_string_id_map { nullptr }; - NonnullOwnPtrVector<DeprecatedString>* m_profiler_strings { nullptr }; + Vector<NonnullOwnPtr<DeprecatedString>>* m_profiler_strings { nullptr }; bool m_is_profiling { false }; size_t m_profile_instruction_interval { 0 }; diff --git a/Userland/DevTools/UserspaceEmulator/SoftMMU.h b/Userland/DevTools/UserspaceEmulator/SoftMMU.h index 781aa4a181..ba379d1a0e 100644 --- a/Userland/DevTools/UserspaceEmulator/SoftMMU.h +++ b/Userland/DevTools/UserspaceEmulator/SoftMMU.h @@ -144,7 +144,7 @@ private: Region* m_page_to_region_map[786432] = { nullptr }; OwnPtr<Region> m_tls_region; - NonnullOwnPtrVector<Region> m_regions; + Vector<NonnullOwnPtr<Region>> m_regions; }; } diff --git a/Userland/DevTools/UserspaceEmulator/main.cpp b/Userland/DevTools/UserspaceEmulator/main.cpp index 097128e798..83498e66e9 100644 --- a/Userland/DevTools/UserspaceEmulator/main.cpp +++ b/Userland/DevTools/UserspaceEmulator/main.cpp @@ -57,7 +57,7 @@ int main(int argc, char** argv, char** env) profile_dump_path = DeprecatedString::formatted("{}.{}.profile", LexicalPath(executable_path).basename(), getpid()); OwnPtr<Stream> profile_stream; - OwnPtr<NonnullOwnPtrVector<DeprecatedString>> profile_strings; + OwnPtr<Vector<NonnullOwnPtr<DeprecatedString>>> profile_strings; OwnPtr<Vector<int>> profile_string_id_map; if (dump_profile) { @@ -67,7 +67,7 @@ int main(int argc, char** argv, char** env) return 1; } profile_stream = profile_stream_or_error.release_value(); - profile_strings = make<NonnullOwnPtrVector<DeprecatedString>>(); + profile_strings = make<Vector<NonnullOwnPtr<DeprecatedString>>>(); profile_string_id_map = make<Vector<int>>(); profile_stream->write_entire_buffer(R"({"events":[)"sv.bytes()).release_value_but_fixme_should_propagate_errors(); |