Merge tag 'v0.20.9'

release v0.20.9
This commit is contained in:
Max Kellermann
2017-06-04 12:57:05 +02:00
69 changed files with 240 additions and 232 deletions

View File

@@ -139,7 +139,7 @@ CompositeStorage::Directory::Make(const char *uri)
}
bool
CompositeStorage::Directory::Unmount()
CompositeStorage::Directory::Unmount() noexcept
{
if (storage == nullptr)
return false;
@@ -150,7 +150,7 @@ CompositeStorage::Directory::Unmount()
}
bool
CompositeStorage::Directory::Unmount(const char *uri)
CompositeStorage::Directory::Unmount(const char *uri) noexcept
{
if (StringIsEmpty(uri))
return Unmount();

View File

@@ -55,7 +55,7 @@ class CompositeStorage final : public Storage {
~Directory();
gcc_pure
bool IsEmpty() const {
bool IsEmpty() const noexcept {
return storage == nullptr && children.empty();
}
@@ -64,8 +64,8 @@ class CompositeStorage final : public Storage {
Directory &Make(const char *uri);
bool Unmount();
bool Unmount(const char *uri);
bool Unmount() noexcept;
bool Unmount(const char *uri) noexcept;
gcc_pure
bool MapToRelativeUTF8(std::string &buffer,

View File

@@ -39,7 +39,6 @@ public:
/**
* Throws #std::runtime_error on error.
*/
gcc_pure
virtual StorageFileInfo GetInfo(bool follow) = 0;
};
@@ -52,7 +51,6 @@ public:
/**
* Throws #std::runtime_error on error.
*/
gcc_pure
virtual StorageFileInfo GetInfo(const char *uri_utf8, bool follow) = 0;
/**

View File

@@ -471,7 +471,7 @@ private:
* to the base file name.
*/
gcc_pure
StringView HrefToEscapedName(const char *href) const {
StringView HrefToEscapedName(const char *href) const noexcept {
const char *path = uri_get_path(href);
if (path == nullptr)
return nullptr;