From 0072bf0c5944b275542a5517d9da3dc94d867556 Mon Sep 17 00:00:00 2001
From: Patrick Niklaus <patrick.niklaus@student.kit.edu>
Date: Tue, 4 Apr 2017 23:54:30 +0000
Subject: [PATCH] Move to forward declare header

---
 include/extractor/segment_data_container.hpp | 10 +---------
 include/extractor/turn_data_container.hpp    | 12 ++----------
 include/partition/cell_storage.hpp           | 11 +----------
 include/partition/multi_level_graph.hpp      |  9 +--------
 include/partition/multi_level_partition.hpp  | 10 +---------
 include/storage/io_fwd.hpp                   | 18 ++++++++++++++++++
 include/util/dynamic_graph.hpp               | 11 ++---------
 include/util/packed_vector.hpp               |  2 +-
 include/util/static_graph.hpp                | 11 +----------
 9 files changed, 28 insertions(+), 66 deletions(-)
 create mode 100644 include/storage/io_fwd.hpp

diff --git a/include/extractor/segment_data_container.hpp b/include/extractor/segment_data_container.hpp
index 0d27202e2..00474c20d 100644
--- a/include/extractor/segment_data_container.hpp
+++ b/include/extractor/segment_data_container.hpp
@@ -4,6 +4,7 @@
 #include "util/typedefs.hpp"
 #include "util/vector_view.hpp"
 
+#include "storage/io_fwd.hpp"
 #include "storage/shared_memory_ownership.hpp"
 
 #include <boost/filesystem/path.hpp>
@@ -17,15 +18,6 @@
 
 namespace osrm
 {
-namespace storage
-{
-namespace io
-{
-class FileReader;
-class FileWriter;
-}
-}
-
 namespace extractor
 {
 
diff --git a/include/extractor/turn_data_container.hpp b/include/extractor/turn_data_container.hpp
index 5dbb3bf4c..669db0f56 100644
--- a/include/extractor/turn_data_container.hpp
+++ b/include/extractor/turn_data_container.hpp
@@ -4,7 +4,9 @@
 #include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/travel_mode.hpp"
 
+#include "storage/io_fwd.hpp"
 #include "storage/shared_memory_ownership.hpp"
+
 #include "util/guidance/turn_bearing.hpp"
 #include "util/vector_view.hpp"
 
@@ -12,16 +14,6 @@
 
 namespace osrm
 {
-
-namespace storage
-{
-namespace io
-{
-class FileReader;
-class FileWriter;
-}
-}
-
 namespace extractor
 {
 namespace detail
diff --git a/include/partition/cell_storage.hpp b/include/partition/cell_storage.hpp
index 157434aec..02a2baaaa 100644
--- a/include/partition/cell_storage.hpp
+++ b/include/partition/cell_storage.hpp
@@ -9,7 +9,7 @@
 #include "util/typedefs.hpp"
 #include "util/vector_view.hpp"
 
-#include "storage/io.hpp"
+#include "storage/io_fwd.hpp"
 #include "storage/shared_memory_ownership.hpp"
 
 #include <boost/iterator/iterator_facade.hpp>
@@ -23,15 +23,6 @@
 
 namespace osrm
 {
-namespace storage
-{
-namespace io
-{
-class FileReader;
-class FileWriter;
-}
-}
-
 namespace partition
 {
 namespace detail
diff --git a/include/partition/multi_level_graph.hpp b/include/partition/multi_level_graph.hpp
index 3e6146f0f..a4b130742 100644
--- a/include/partition/multi_level_graph.hpp
+++ b/include/partition/multi_level_graph.hpp
@@ -4,6 +4,7 @@
 #include "partition/multi_level_partition.hpp"
 
 #include "storage/shared_memory_ownership.hpp"
+#include "storage/io_fwd.hpp"
 
 #include "util/static_graph.hpp"
 #include "util/vector_view.hpp"
@@ -15,14 +16,6 @@
 
 namespace osrm
 {
-namespace storage
-{
-namespace io
-{
-class FileReader;
-class FileWriter;
-}
-}
 
 namespace partition
 {
diff --git a/include/partition/multi_level_partition.hpp b/include/partition/multi_level_partition.hpp
index 414fa312e..4ee94ccdc 100644
--- a/include/partition/multi_level_partition.hpp
+++ b/include/partition/multi_level_partition.hpp
@@ -7,7 +7,7 @@
 #include "util/typedefs.hpp"
 #include "util/vector_view.hpp"
 
-#include "storage/io.hpp"
+#include "storage/io_fwd.hpp"
 #include "storage/shared_memory_ownership.hpp"
 
 #include <algorithm>
@@ -22,14 +22,6 @@
 
 namespace osrm
 {
-namespace storage
-{
-namespace io
-{
-class FileReader;
-class FileWriter;
-}
-}
 namespace partition
 {
 namespace detail
diff --git a/include/storage/io_fwd.hpp b/include/storage/io_fwd.hpp
new file mode 100644
index 000000000..d88af1347
--- /dev/null
+++ b/include/storage/io_fwd.hpp
@@ -0,0 +1,18 @@
+#ifndef OSRM_STORAGE_IO_FWD_HPP_
+#define OSRM_STORAGE_IO_FWD_HPP_
+
+namespace osrm
+{
+namespace storage
+{
+namespace io
+{
+
+class FileReader;
+class FileWriter;
+
+} // ns io
+} // ns storage
+} // ns osrm
+
+#endif
diff --git a/include/util/dynamic_graph.hpp b/include/util/dynamic_graph.hpp
index 793bd25f0..3588ac518 100644
--- a/include/util/dynamic_graph.hpp
+++ b/include/util/dynamic_graph.hpp
@@ -5,6 +5,8 @@
 #include "util/integer_range.hpp"
 #include "util/typedefs.hpp"
 
+#include "storage/io_fwd.hpp"
+
 #include <boost/assert.hpp>
 
 #include <cstdint>
@@ -17,15 +19,6 @@
 
 namespace osrm
 {
-namespace storage
-{
-namespace io
-{
-class FileReader;
-class FileWriter;
-}
-}
-
 namespace util
 {
 template <typename EdgeDataT> class DynamicGraph;
diff --git a/include/util/packed_vector.hpp b/include/util/packed_vector.hpp
index c484bec92..bb8472cfc 100644
--- a/include/util/packed_vector.hpp
+++ b/include/util/packed_vector.hpp
@@ -4,7 +4,7 @@
 #include "util/typedefs.hpp"
 #include "util/vector_view.hpp"
 
-#include "storage/io.hpp"
+#include "storage/io_fwd.hpp"
 #include "storage/shared_memory_ownership.hpp"
 
 #include <cmath>
diff --git a/include/util/static_graph.hpp b/include/util/static_graph.hpp
index 02dd649e2..876da6359 100644
--- a/include/util/static_graph.hpp
+++ b/include/util/static_graph.hpp
@@ -7,6 +7,7 @@
 #include "util/typedefs.hpp"
 #include "util/vector_view.hpp"
 
+#include "storage/io_fwd.hpp"
 #include "storage/shared_memory_ownership.hpp"
 
 #include <boost/assert.hpp>
@@ -19,16 +20,6 @@
 
 namespace osrm
 {
-
-namespace storage
-{
-namespace io
-{
-class FileReader;
-class FileWriter;
-}
-}
-
 namespace util
 {
 template <typename EdgeDataT, storage::Ownership Ownership> class StaticGraph;