From a555985b2ccc9a9a1158aa38d2bba09976d94557 Mon Sep 17 00:00:00 2001
From: Sebastian Messmer <mail@smessmer.de>
Date: Thu, 16 Apr 2015 14:54:04 +0200
Subject: [PATCH] Adapt to renaming of CachingStore -> ParallelAccessStore

---
 biicode.conf                                                 | 2 +-
 implementations/parallelaccess/BlockRef.h                    | 5 ++---
 implementations/parallelaccess/ParallelAccessBlockStore.h    | 5 ++---
 .../parallelaccess/ParallelAccessBlockStoreAdapter.h         | 4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/biicode.conf b/biicode.conf
index 5bf44c79..89337881 100644
--- a/biicode.conf
+++ b/biicode.conf
@@ -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]
diff --git a/implementations/parallelaccess/BlockRef.h b/implementations/parallelaccess/BlockRef.h
index 685bfa1a..a379ef7f 100644
--- a/implementations/parallelaccess/BlockRef.h
+++ b/implementations/parallelaccess/BlockRef.h
@@ -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) {}
diff --git a/implementations/parallelaccess/ParallelAccessBlockStore.h b/implementations/parallelaccess/ParallelAccessBlockStore.h
index fee0475f..9426d47c 100644
--- a/implementations/parallelaccess/ParallelAccessBlockStore.h
+++ b/implementations/parallelaccess/ParallelAccessBlockStore.h
@@ -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);
 };
diff --git a/implementations/parallelaccess/ParallelAccessBlockStoreAdapter.h b/implementations/parallelaccess/ParallelAccessBlockStoreAdapter.h
index 2314180e..56c9d7de 100644
--- a/implementations/parallelaccess/ParallelAccessBlockStoreAdapter.h
+++ b/implementations/parallelaccess/ParallelAccessBlockStoreAdapter.h
@@ -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)) {