Skip to content

Commit 806a43e

Browse files
committed
Switched all vectors from std to core
1 parent 4767028 commit 806a43e

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

include/nbl/system/CFileArchive.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,11 @@ class CFileArchive : public IFileArchive
105105
}
106106

107107
protected:
108-
CFileArchive(path&& _defaultAbsolutePath, system::logger_opt_smart_ptr&& logger, core::vector<IFileArchive::SFileList::SEntry>&& _items) :
108+
CFileArchive(path&& _defaultAbsolutePath, system::logger_opt_smart_ptr&& logger, core::vector<SFileList::SEntry> _items) :
109109
IFileArchive(std::move(_defaultAbsolutePath),std::move(logger))
110110
{
111-
auto itemsSharedPtr = std::make_shared<std::vector<IFileArchive::SFileList::SEntry>>(std::move(_items));
111+
//should _items be rvalue reference?
112+
auto itemsSharedPtr = std::make_shared<core::vector<IFileArchive::SFileList::SEntry>>(std::move(_items));
112113
std::sort(itemsSharedPtr->begin(), itemsSharedPtr->end());
113114
m_items.store(itemsSharedPtr);
114115

include/nbl/system/IFileArchive.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class IFileArchive : public core::IReferenceCounted
6565
return pathRelativeToArchive < other.pathRelativeToArchive;
6666
}
6767
};
68-
using refctd_storage_t = std::shared_ptr<const std::vector<SEntry>>;
68+
using refctd_storage_t = std::shared_ptr<const core::vector<SEntry>>;
6969
using range_t = core::SRange<const SEntry>;
7070

7171
inline operator range_t() const { return m_range; }

src/nbl/system/CMountDirectoryArchive.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class CMountDirectoryArchive : public IFileArchive
4242

4343
void populateItemList(const path& p) const {
4444
auto items = m_system->listItemsInDirectory(m_defaultAbsolutePath/p);
45-
auto new_entries = std::make_shared< std::vector<SFileList::SEntry>>();
45+
auto new_entries = std::make_shared<core::vector<SFileList::SEntry>>();
4646
for (auto item : items)
4747
{
4848
if (item.has_extension())

0 commit comments

Comments
 (0)