sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bunch of warnings

Browse Source
This commit is contained in:
SirLynix
2022-11-19 11:02:16 +01:00
parent 5fb974f24c
commit 5ca2cf9320
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Core/EmptyStream.hpp
View File

@@ -16,7 +16,7 @@ namespace Nz
{
public:
inline EmptyStream();
EmptyStream(const EmptyStream&) = default;
EmptyStream(const EmptyStream&) = delete;
EmptyStream(EmptyStream&&) noexcept = default;
~EmptyStream() = default;
@@ -24,7 +24,7 @@ namespace Nz
UInt64 GetSize() const override;
EmptyStream& operator=(const EmptyStream&) = default;
EmptyStream& operator=(const EmptyStream&) = delete;
EmptyStream& operator=(EmptyStream&&) noexcept = default;
private:

4
include/Nazara/Core/MemoryStream.hpp
View File

@@ -20,7 +20,7 @@ namespace Nz
public:
inline MemoryStream();
inline MemoryStream(ByteArray* byteArray, OpenModeFlags openMode = OpenMode_ReadWrite);
MemoryStream(const MemoryStream&) = default;
MemoryStream(const MemoryStream&) = delete;
MemoryStream(MemoryStream&&) noexcept = default;
~MemoryStream() = default;
@@ -32,7 +32,7 @@ namespace Nz
void SetBuffer(ByteArray* byteArray, OpenModeFlags openMode = OpenMode_ReadWrite);
MemoryStream& operator=(const MemoryStream&) = default;
MemoryStream& operator=(const MemoryStream&) = delete;
MemoryStream& operator=(MemoryStream&&) noexcept = default;
private:

14
include/Nazara/Core/VirtualDirectory.inl
View File

@@ -43,7 +43,7 @@ namespace Nz
callback(std::string_view("."), ourselves);
if (VirtualDirectoryPtr parent = m_parent.lock())
{
Entry parentEntry = VirtualDirectoryEntry{ parent };
Entry parentEntry = VirtualDirectoryEntry{ { parent } };
if (!CallbackReturn(callback, std::string_view(".."), parentEntry))
return;
}
@@ -79,7 +79,7 @@ namespace Nz
else if (std::filesystem::is_directory(status))
{
VirtualDirectoryPtr virtualDir = std::make_shared<VirtualDirectory>(physicalEntry.path(), weak_from_this());
entry = PhysicalDirectoryEntry{ std::move(virtualDir), physicalEntry.path() };
entry = PhysicalDirectoryEntry{ { std::move(virtualDir) }, physicalEntry.path() };
}
else
continue;
@@ -179,7 +179,7 @@ namespace Nz
else if (std::filesystem::is_directory(status))
{
VirtualDirectoryPtr virtualDir = std::make_shared<VirtualDirectory>(filePath, weak_from_this());
entry = PhysicalDirectoryEntry{ std::move(virtualDir), std::move(filePath) };
entry = PhysicalDirectoryEntry{ { std::move(virtualDir) }, std::move(filePath) };
}
else
return false; //< either not known or of a special type
@@ -247,7 +247,7 @@ namespace Nz
if (entryName == "." || entryName == "..")
throw std::runtime_error("invalid entry name");
return dir->StoreInternal(std::string(entryName), VirtualDirectoryEntry{ std::move(directory) });
return dir->StoreInternal(std::string(entryName), VirtualDirectoryEntry{ { std::move(directory) } });
}
inline auto VirtualDirectory::StoreDirectory(std::string_view path, std::filesystem::path directoryPath) -> PhysicalDirectoryEntry&
@@ -318,7 +318,7 @@ namespace Nz
{
if (name == ".")
{
Entry entry{ VirtualDirectoryEntry{ shared_from_this() } };
Entry entry{ VirtualDirectoryEntry{ { shared_from_this() } } };
return CallbackReturn(callback, entry);
}
@@ -332,7 +332,7 @@ namespace Nz
if (parentEntry)
{
Entry entry = VirtualDirectoryEntry{ std::move(parentEntry) };
Entry entry = VirtualDirectoryEntry{ { std::move(parentEntry) } };
return CallbackReturn(callback, entry);
}
}
@@ -355,7 +355,7 @@ namespace Nz
else if (std::filesystem::is_directory(status))
{
VirtualDirectoryPtr virtualDir = std::make_shared<VirtualDirectory>(filePath, weak_from_this());
entry = PhysicalDirectoryEntry{ std::move(virtualDir), std::move(filePath) };
entry = PhysicalDirectoryEntry{ { std::move(virtualDir) }, std::move(filePath) };
}
else
return false; //< either not known or of a special type