From 9c1a12c0639f4cb779e747229a57a9bd2cf61954 Mon Sep 17 00:00:00 2001
From: Sebastian Messmer <messmer@cryfs.org>
Date: Thu, 23 Jun 2016 12:32:28 -0700
Subject: [PATCH] Fix merge

---
 src/blockstore/implementations/inmemory/InMemoryBlockStore.cpp | 2 +-
 src/blockstore/implementations/testfake/FakeBlockStore.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/blockstore/implementations/inmemory/InMemoryBlockStore.cpp b/src/blockstore/implementations/inmemory/InMemoryBlockStore.cpp
index ff2a0a2e..b3907acb 100644
--- a/src/blockstore/implementations/inmemory/InMemoryBlockStore.cpp
+++ b/src/blockstore/implementations/inmemory/InMemoryBlockStore.cpp
@@ -63,7 +63,7 @@ uint64_t InMemoryBlockStore::blockSizeFromPhysicalBlockSize(uint64_t blockSize)
 
 void InMemoryBlockStore::forEachBlock(std::function<void (const Key &)> callback) const {
   for (const auto &entry : _blocks) {
-    callback(Key::FromString(entry.first));
+    callback(entry.first);
   }
 }
 
diff --git a/src/blockstore/implementations/testfake/FakeBlockStore.cpp b/src/blockstore/implementations/testfake/FakeBlockStore.cpp
index 81601da6..ec94cf52 100644
--- a/src/blockstore/implementations/testfake/FakeBlockStore.cpp
+++ b/src/blockstore/implementations/testfake/FakeBlockStore.cpp
@@ -86,7 +86,7 @@ uint64_t FakeBlockStore::blockSizeFromPhysicalBlockSize(uint64_t blockSize) cons
 
 void FakeBlockStore::forEachBlock(std::function<void (const Key &)> callback) const {
   for (const auto &entry : _blocks) {
-    callback(Key::FromString(entry.first));
+    callback(entry.first);
   }
 }