hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Adapt to renaming of CachingStore -> ParallelAccessStore

Browse Source
This commit is contained in:
Sebastian Messmer 2015-04-16 14:54:04 +02:00
parent 9fa6b041eb
commit a555985b2c
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
biicode.conf
View File

@ -4,9 +4,9 @@
cryptopp/cryptopp: 8
google/gmock: 2
google/gtest: 10
messmer/cachingstore: 0
messmer/cmake: 3
messmer/cpp-utils: 2
messmer/parallelaccessstore: 0
messmer/tempfile: 4
[parent]

5
implementations/parallelaccess/BlockRef.h
View File

@ -2,9 +2,8 @@
#ifndef BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHEDBLOCKREF_H_
#define BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHEDBLOCKREF_H_
#include <messmer/parallelaccessstore/ParallelAccessStore.h>
#include "../../interface/Block.h"
#include <messmer/cachingstore/CachingStore.h>
#include "messmer/cpp-utils/macros.h"
#include <memory>
@ -12,7 +11,7 @@ namespace blockstore {
namespace parallelaccess {
class ParallelAccessBlockStore;
class BlockRef: public Block, public cachingstore::CachingStore<Block, BlockRef, Key>::CachedResource {
class BlockRef: public Block, public parallelaccessstore::ParallelAccessStore<Block, BlockRef, Key>::ResourceRefBase {
public:
//TODO Unneccessarily storing Key twice here (in parent class and in _baseBlock).
BlockRef(Block *baseBlock): Block(baseBlock->key()), _baseBlock(baseBlock) {}

5
implementations/parallelaccess/ParallelAccessBlockStore.h
View File

@ -2,9 +2,8 @@
#ifndef BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHINGBLOCKSTORE_H_
#define BLOCKSTORE_IMPLEMENTATIONS_CACHING_CACHINGBLOCKSTORE_H_
#include <messmer/parallelaccessstore/ParallelAccessStore.h>
#include "BlockRef.h"
#include <messmer/cachingstore/CachingStore.h>
#include "../../interface/BlockStore.h"
namespace blockstore {
@ -22,7 +21,7 @@ public:
private:
std::unique_ptr<BlockStore> _baseBlockStore;
cachingstore::CachingStore<Block, BlockRef, Key> _cachingStore;
parallelaccessstore::ParallelAccessStore<Block, BlockRef, Key> _cachingStore;
DISALLOW_COPY_AND_ASSIGN(ParallelAccessBlockStore);
};

4
implementations/parallelaccess/ParallelAccessBlockStoreAdapter.h
View File

@ -2,13 +2,13 @@
#define MESSMER_BLOCKSTORE_IMPLEMENTATIONS_PARALLELACCESS_PARALLELACCESSBLOCKSTOREADAPTER_H_
#include <messmer/cpp-utils/macros.h>
#include <messmer/cachingstore/CachingStore.h>
#include <messmer/parallelaccessstore/ParallelAccessStore.h>
#include "../../interface/BlockStore.h"
namespace blockstore {
namespace parallelaccess {
class ParallelAccessBlockStoreAdapter: public cachingstore::CachingBaseStore<Block, Key> {
class ParallelAccessBlockStoreAdapter: public parallelaccessstore::ParallelAccessBaseStore<Block, Key> {
public:
ParallelAccessBlockStoreAdapter(BlockStore *baseBlockStore)
:_baseBlockStore(std::move(baseBlockStore)) {