From f4a7878e37409ccca5f38c37da47b67f3a32bcc6 Mon Sep 17 00:00:00 2001
From: Sebastian Messmer <messmer@cryfs.org>
Date: Sun, 26 Jun 2016 21:26:08 -0700
Subject: [PATCH] Compatibility with GCC 6

---
 ChangeLog.txt                                                | 1 +
 src/blockstore/implementations/inmemory/InMemoryBlockStore.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 13b2d3d2..9fd6af22 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -8,6 +8,7 @@ Fixed Bugs:
 Improvements:
 * When mounting an old file system, CryFS will ask before migrating it to the newest version.
 * Operating system tools like the mount command or /proc/self/mountinfo report correct file system type and also report the base directory.
+* Compatibility with GCC 6
 
 Version 0.9.4
 ---------------
diff --git a/src/blockstore/implementations/inmemory/InMemoryBlockStore.h b/src/blockstore/implementations/inmemory/InMemoryBlockStore.h
index cbd6371b..a3334e52 100644
--- a/src/blockstore/implementations/inmemory/InMemoryBlockStore.h
+++ b/src/blockstore/implementations/inmemory/InMemoryBlockStore.h
@@ -7,10 +7,10 @@
 
 #include <mutex>
 #include <unordered_map>
+#include "InMemoryBlock.h"
 
 namespace blockstore {
 namespace inmemory {
-class InMemoryBlock;
 
 class InMemoryBlockStore final: public BlockStoreWithRandomKeys {
 public: