Merge branch 'develop' of github.com:cryfs/cryfs into develop

This commit is contained in:
Sebastian Messmer 2016-05-04 00:31:31 -07:00
commit 7070c8e948

View File

@ -78,8 +78,10 @@ void OnDiskBlockStore::remove(unique_ref<Block> block) {
uint64_t OnDiskBlockStore::numBlocks() const {
uint64_t count = 0;
for (auto entry = bf::directory_iterator(_rootdir); entry != bf::directory_iterator(); ++entry) {
if (bf::is_directory(entry->path())) {
count += std::distance(bf::directory_iterator(entry->path()), bf::directory_iterator());
}
}
return count;
}