reverted core to std on vector usages

Author: Hazardu

include/nbl/system/CFileArchive.h

@@ -105,11 +105,10 @@ class CFileArchive : public IFileArchive
 		}
 
 	protected:
-		CFileArchive(path&& _defaultAbsolutePath, system::logger_opt_smart_ptr&& logger, core::vector<SFileList::SEntry> _items) :
+		CFileArchive(path&& _defaultAbsolutePath, system::logger_opt_smart_ptr&& logger, std::vector<SFileList::SEntry>* _items) :
 			IFileArchive(std::move(_defaultAbsolutePath),std::move(logger))
 		{
-			//should _items be rvalue reference?
-			auto itemsSharedPtr = std::make_shared<core::vector<IFileArchive::SFileList::SEntry>>(std::move(_items));
+			auto itemsSharedPtr = std::make_shared<std::vector<IFileArchive::SFileList::SEntry>>(std::move(_items));
 			std::sort(itemsSharedPtr->begin(), itemsSharedPtr->end());
 			m_items.store(itemsSharedPtr);
 

include/nbl/system/IFileArchive.h

@@ -65,7 +65,7 @@ class IFileArchive : public core::IReferenceCounted
 					return pathRelativeToArchive < other.pathRelativeToArchive;
 				}
 			};
-			using refctd_storage_t = std::shared_ptr<const core::vector<SEntry>>;
+			using refctd_storage_t = std::shared_ptr<const std::vector<SEntry>>;
 			using range_t = core::SRange<const SEntry>;
 
 			inline operator range_t() const { return m_range; }

src/nbl/system/CAPKResourcesArchive.cpp

@@ -12,7 +12,7 @@ CAPKResourcesArchive::CAPKResourcesArchive(const path& _path, system::logger_opt
 {
 }
 
-core::vector<IFileArchive::SFileList::SEntry> CAPKResourcesArchive::computeItems(const std::string& asset_path, ANativeActivity* activity, JNIEnv* jniEnv)
+std::vector<IFileArchive::SFileList::SEntry> CAPKResourcesArchive::computeItems(const std::string& asset_path, ANativeActivity* activity, JNIEnv* jniEnv)
 {
 	auto context_object = activity->clazz;
 	auto getAssets_method = jniEnv->GetMethodID(jniEnv->GetObjectClass(context_object), "getAssets", "()Landroid/content/res/AssetManager;");
@@ -27,7 +27,7 @@ core::vector<IFileArchive::SFileList::SEntry> CAPKResourcesArchive::computeItems
 
 	auto length = jniEnv->GetArrayLength(files_object);
 
-	core::vector<IFileArchive::SFileList::SEntry> result;
+	std::vector<IFileArchive::SFileList::SEntry> result;
 	for (decltype(length) i=0; i<length; i++)
 	{
 		jstring jstr = (jstring)jniEnv->GetObjectArrayElement(files_object,i);

src/nbl/system/CArchiveLoaderTar.cpp

@@ -98,7 +98,7 @@ core::smart_refctd_ptr<IFileArchive> CArchiveLoaderTar::createArchive_impl(core:
 	if (!file || !(file->getFlags()&IFileBase::ECF_MAPPABLE))
 		return nullptr;
 
-	core::vector<IFileArchive::SFileList::SEntry> items;
+	std::vector<IFileArchive::SFileList::SEntry> items;
 	for (size_t pos=0ull; true; )
 	{
 		STarHeader fHead;

src/nbl/system/CArchiveLoaderTar.h

@@ -14,7 +14,7 @@ class CArchiveLoaderTar final : public IArchiveLoader
 		class CArchive final : public CFileArchive
 		{
 			public:
-				CArchive(core::smart_refctd_ptr<IFile>&& _file, system::logger_opt_smart_ptr&& logger, core::vector<SFileList::SEntry>&& _items) :
+				CArchive(core::smart_refctd_ptr<IFile>&& _file, system::logger_opt_smart_ptr&& logger, std::vector<SFileList::SEntry>&& _items) :
 					CFileArchive(path(_file->getFileName()),std::move(logger),std::move(_items)), m_file(std::move(_file)) {}
 
 			protected:

src/nbl/system/CArchiveLoaderZip.cpp

@@ -106,7 +106,7 @@ core::smart_refctd_ptr<IFileArchive> CArchiveLoaderZip::createArchive_impl(core:
 			return nullptr;
 	}
 
-	core::vector<IFileArchive::SFileList::SEntry> items;
+	std::vector<IFileArchive::SFileList::SEntry> items;
 	core::vector<SZIPFileHeader> itemsMetadata;
 	// load file entries
 	{

src/nbl/system/CArchiveLoaderZip.h

@@ -39,7 +39,7 @@ class CArchiveLoaderZip final : public IArchiveLoader
 				CArchive(
 					core::smart_refctd_ptr<IFile>&& _file,
 					system::logger_opt_smart_ptr&& logger,
-					core::vector<SFileList::SEntry>&& _items,
+					std::vector<SFileList::SEntry>&& _items,
 					core::vector<SZIPFileHeader>&& _itemsMetadata
 				) : CFileArchive(path(_file->getFileName()),std::move(logger),std::move(_items)),
 					m_file(std::move(_file)), m_itemsMetadata(std::move(_itemsMetadata)), m_password("")

src/nbl/system/CMountDirectoryArchive.h

@@ -42,7 +42,7 @@ class CMountDirectoryArchive : public IFileArchive
 
     void populateItemList(const path& p) const {
         auto items = m_system->listItemsInDirectory(m_defaultAbsolutePath/p);
-        auto new_entries = std::make_shared<core::vector<SFileList::SEntry>>();
+        auto new_entries = std::make_shared<std::vector<SFileList::SEntry>>();
         for (auto item : items)
         {
             if (item.has_extension())