mirror of
https://github.com/Laupetin/OpenAssetTools.git
synced 2025-07-03 09:41:50 +00:00
Fix more gcc compilation issues
This commit is contained in:
@ -10,7 +10,7 @@ std::string BlockOverflowException::DetailedMessage()
|
||||
return "XBlock " + m_block->m_name + " overflowed while trying to load zone.";
|
||||
}
|
||||
|
||||
char const* BlockOverflowException::what() const
|
||||
char const* BlockOverflowException::what() const noexcept
|
||||
{
|
||||
return "Invalid Zone. XBlock overflowed.";
|
||||
}
|
@ -10,5 +10,5 @@ public:
|
||||
explicit BlockOverflowException(XBlock* block);
|
||||
|
||||
std::string DetailedMessage() override;
|
||||
char const* what() const override;
|
||||
char const* what() const noexcept override;
|
||||
};
|
||||
|
@ -24,7 +24,7 @@ std::string InvalidChunkSizeException::DetailedMessage()
|
||||
}
|
||||
}
|
||||
|
||||
char const* InvalidChunkSizeException::what() const
|
||||
char const* InvalidChunkSizeException::what() const noexcept
|
||||
{
|
||||
return "Zone has invalid chunk size";
|
||||
}
|
@ -11,5 +11,5 @@ public:
|
||||
InvalidChunkSizeException(size_t size, size_t max);
|
||||
|
||||
std::string DetailedMessage() override;
|
||||
char const* what() const override;
|
||||
char const* what() const noexcept override;
|
||||
};
|
||||
|
@ -5,7 +5,7 @@ std::string InvalidCompressionException::DetailedMessage()
|
||||
return "Zone has invalid or unsupported compression. Inflate failed";
|
||||
}
|
||||
|
||||
char const* InvalidCompressionException::what() const
|
||||
char const* InvalidCompressionException::what() const noexcept
|
||||
{
|
||||
return "Zone has invalid or unsupported compression. Inflate failed";
|
||||
}
|
||||
|
@ -5,5 +5,5 @@ class InvalidCompressionException final : public LoadingException
|
||||
{
|
||||
public:
|
||||
std::string DetailedMessage() override;
|
||||
char const* what() const override;
|
||||
char const* what() const noexcept override;
|
||||
};
|
||||
|
@ -11,7 +11,7 @@ std::string InvalidFileNameException::DetailedMessage()
|
||||
return "Name verification failed: The fastfile was created as '" + m_expected_file_name + "' but loaded as '" + m_actual_file_name + "'";
|
||||
}
|
||||
|
||||
char const* InvalidFileNameException::what() const
|
||||
char const* InvalidFileNameException::what() const noexcept
|
||||
{
|
||||
return "The filename when created and when loaded does not match";
|
||||
}
|
@ -10,5 +10,5 @@ public:
|
||||
InvalidFileNameException(std::string& actualFileName, std::string& expectedFileName);
|
||||
|
||||
std::string DetailedMessage() override;
|
||||
char const* what() const override;
|
||||
char const* what() const noexcept override;
|
||||
};
|
||||
|
@ -5,7 +5,7 @@ std::string InvalidHashException::DetailedMessage()
|
||||
return "Loaded fastfile has an invalid hash.";
|
||||
}
|
||||
|
||||
char const* InvalidHashException::what() const
|
||||
char const* InvalidHashException::what() const noexcept
|
||||
{
|
||||
return "Loaded fastfile has an invalid hash.";
|
||||
}
|
@ -5,5 +5,5 @@ class InvalidHashException final : public LoadingException
|
||||
{
|
||||
public:
|
||||
std::string DetailedMessage() override;
|
||||
char const* what() const override;
|
||||
char const* what() const noexcept override;
|
||||
};
|
||||
|
@ -10,7 +10,7 @@ std::string InvalidMagicException::DetailedMessage()
|
||||
return "Expected magic '" + std::string(m_expected_magic) + "'";
|
||||
}
|
||||
|
||||
char const* InvalidMagicException::what() const
|
||||
char const* InvalidMagicException::what() const noexcept
|
||||
{
|
||||
return "Encountered invalid magic when loading.";
|
||||
}
|
@ -9,5 +9,5 @@ public:
|
||||
explicit InvalidMagicException(const char* expectedMagic);
|
||||
|
||||
std::string DetailedMessage() override;
|
||||
char const* what() const override;
|
||||
char const* what() const noexcept override;
|
||||
};
|
||||
|
@ -10,7 +10,7 @@ std::string InvalidOffsetBlockException::DetailedMessage()
|
||||
return "Zone tried to reference invalid block " + std::to_string(m_referenced_block);
|
||||
}
|
||||
|
||||
char const* InvalidOffsetBlockException::what() const
|
||||
char const* InvalidOffsetBlockException::what() const noexcept
|
||||
{
|
||||
return "Zone referenced invalid block";
|
||||
}
|
@ -10,5 +10,5 @@ public:
|
||||
explicit InvalidOffsetBlockException(block_t referencedBlock);
|
||||
|
||||
std::string DetailedMessage() override;
|
||||
char const* what() const override;
|
||||
char const* what() const noexcept override;
|
||||
};
|
||||
|
@ -12,7 +12,7 @@ std::string InvalidOffsetBlockOffsetException::DetailedMessage()
|
||||
+ " which is larger than its size " + std::to_string(m_referenced_block->m_buffer_size);
|
||||
}
|
||||
|
||||
char const* InvalidOffsetBlockOffsetException::what() const
|
||||
char const* InvalidOffsetBlockOffsetException::what() const noexcept
|
||||
{
|
||||
return "Zone referenced offset of block that is out of bounds";
|
||||
}
|
@ -11,5 +11,5 @@ public:
|
||||
InvalidOffsetBlockOffsetException(XBlock* block, size_t referencedOffset);
|
||||
|
||||
std::string DetailedMessage() override;
|
||||
char const* what() const override;
|
||||
char const* what() const noexcept override;
|
||||
};
|
||||
|
@ -5,7 +5,7 @@ std::string InvalidSignatureException::DetailedMessage()
|
||||
return "Loaded fastfile has an invalid signature.";
|
||||
}
|
||||
|
||||
char const* InvalidSignatureException::what() const
|
||||
char const* InvalidSignatureException::what() const noexcept
|
||||
{
|
||||
return "Loaded fastfile has an invalid signature.";
|
||||
}
|
@ -5,5 +5,5 @@ class InvalidSignatureException final : public LoadingException
|
||||
{
|
||||
public:
|
||||
std::string DetailedMessage() override;
|
||||
char const* what() const override;
|
||||
char const* what() const noexcept override;
|
||||
};
|
||||
|
@ -11,7 +11,7 @@ std::string InvalidVersionException::DetailedMessage()
|
||||
return "Expected version " + std::to_string(m_expected_version) + " but encountered version " + std::to_string(m_actual_version);
|
||||
}
|
||||
|
||||
char const* InvalidVersionException::what() const
|
||||
char const* InvalidVersionException::what() const noexcept
|
||||
{
|
||||
return "Encountered invalid version when loading.";
|
||||
}
|
@ -10,5 +10,5 @@ public:
|
||||
InvalidVersionException(unsigned int expectedVersion, unsigned int actualVersion);
|
||||
|
||||
std::string DetailedMessage() override;
|
||||
char const* what() const override;
|
||||
char const* what() const noexcept override;
|
||||
};
|
||||
|
@ -11,7 +11,7 @@ std::string InvalidXBlockSizeException::DetailedMessage()
|
||||
return "Zone uses more XBlock memory than allowed: " + std::to_string(m_size) + " (max is " + std::to_string(m_max) + ")";
|
||||
}
|
||||
|
||||
char const* InvalidXBlockSizeException::what() const
|
||||
char const* InvalidXBlockSizeException::what() const noexcept
|
||||
{
|
||||
return "Zone has invalid block size";
|
||||
}
|
@ -10,5 +10,5 @@ public:
|
||||
InvalidXBlockSizeException(uint64_t size, uint64_t max);
|
||||
|
||||
std::string DetailedMessage() override;
|
||||
char const* what() const override;
|
||||
char const* what() const noexcept override;
|
||||
};
|
||||
|
@ -10,7 +10,7 @@ std::string OutOfBlockBoundsException::DetailedMessage()
|
||||
return "Tried to load to location out of bounds from current XBlock " + m_block->m_name + ".";
|
||||
}
|
||||
|
||||
char const* OutOfBlockBoundsException::what() const
|
||||
char const* OutOfBlockBoundsException::what() const noexcept
|
||||
{
|
||||
return "Invalid Zone. Out of XBlock bounds.";
|
||||
}
|
@ -10,5 +10,5 @@ public:
|
||||
explicit OutOfBlockBoundsException(XBlock* block);
|
||||
|
||||
std::string DetailedMessage() override;
|
||||
char const* what() const override;
|
||||
char const* what() const noexcept override;
|
||||
};
|
||||
|
@ -5,7 +5,7 @@ std::string TooManyAuthedGroupsException::DetailedMessage()
|
||||
return "Loaded fastfile has too many authed groups.";
|
||||
}
|
||||
|
||||
char const* TooManyAuthedGroupsException::what() const
|
||||
char const* TooManyAuthedGroupsException::what() const noexcept
|
||||
{
|
||||
return "Loaded fastfile has too many authed groups.";
|
||||
}
|
@ -5,5 +5,5 @@ class TooManyAuthedGroupsException final : public LoadingException
|
||||
{
|
||||
public:
|
||||
std::string DetailedMessage() override;
|
||||
char const* what() const override;
|
||||
char const* what() const noexcept override;
|
||||
};
|
||||
|
@ -7,7 +7,7 @@ std::string UnexpectedEndOfFileException::DetailedMessage()
|
||||
return "Unexpected end of file";
|
||||
}
|
||||
|
||||
char const* UnexpectedEndOfFileException::what() const
|
||||
char const* UnexpectedEndOfFileException::what() const noexcept
|
||||
{
|
||||
return "Unexpected end of file";
|
||||
}
|
@ -7,5 +7,5 @@ public:
|
||||
UnexpectedEndOfFileException();
|
||||
|
||||
std::string DetailedMessage() override;
|
||||
char const* what() const override;
|
||||
char const* what() const noexcept override;
|
||||
};
|
||||
|
@ -10,7 +10,7 @@ std::string UnsupportedAssetTypeException::DetailedMessage()
|
||||
return "Zone has an unsupported asset type " + std::to_string(m_asset_type) + " and therefore cannot be loaded.";
|
||||
}
|
||||
|
||||
char const* UnsupportedAssetTypeException::what() const
|
||||
char const* UnsupportedAssetTypeException::what() const noexcept
|
||||
{
|
||||
return "Zone has unsupported asset type.";
|
||||
}
|
@ -9,5 +9,5 @@ public:
|
||||
explicit UnsupportedAssetTypeException(int assetType);
|
||||
|
||||
std::string DetailedMessage() override;
|
||||
char const* what() const override;
|
||||
char const* what() const noexcept override;
|
||||
};
|
||||
|
Reference in New Issue
Block a user